SunRed
/
SpaceCadetPinball
mirror of https://github.com/k4zmu2a/SpaceCadetPinball.git
1
0
Fork 0
Code Issues Releases Activity

Added game data loading from user folder (SDL_GetPrefPath). 

Ref issue #80.
This commit is contained in:
Muzychenko Andrey 2021-11-05 10:16:27 +03:00
parent dc00dbde0d
commit ecdf802d68
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SpaceCadetPinball/pb.cpp
View File

@ -39,6 +39,8 @@ int pb::init()
{ {
float projMat[12], zMin = 0, zScaler = 0; float projMat[12], zMin = 0, zScaler = 0;
if (winmain::DatFileName.empty())
return 1;
auto dataFilePath = pinball::make_path_name(winmain::DatFileName); auto dataFilePath = pinball::make_path_name(winmain::DatFileName);
record_table = partman::load_records(dataFilePath.c_str(), FullTiltMode); record_table = partman::load_records(dataFilePath.c_str(), FullTiltMode);

45
SpaceCadetPinball/winmain.cpp
View File

@ -36,7 +36,7 @@ bool winmain::ShowSpriteViewer = false;
bool winmain::LaunchBallEnabled = true; bool winmain::LaunchBallEnabled = true;
bool winmain::HighScoresEnabled = true; bool winmain::HighScoresEnabled = true;
bool winmain::DemoActive = false; bool winmain::DemoActive = false;
char* winmain::BasePath; std::string winmain::BasePath;
int winmain::MainMenuHeight = 0; int winmain::MainMenuHeight = 0;
std::string winmain::FpsDetails; std::string winmain::FpsDetails;
double winmain::UpdateToFrameRatio; double winmain::UpdateToFrameRatio;
@ -58,19 +58,44 @@ int winmain::WinMain(LPCSTR lpCmdLine)
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Could not initialize SDL2", SDL_GetError(), nullptr); SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Could not initialize SDL2", SDL_GetError(), nullptr);
return 1; return 1;
} }
BasePath = SDL_GetBasePath();
pinball::quickFlag = strstr(lpCmdLine, "-quick") != nullptr; pinball::quickFlag = strstr(lpCmdLine, "-quick") != nullptr;
DatFileName = options::get_string("Pinball Data", pinball::get_rc_string(168, 0));
/*Check for full tilt .dat file and switch to it automatically*/ // Search for game data in: game folder, user folder
auto cadetFilePath = pinball::make_path_name("CADET.DAT"); // Game data test order: CADET.DAT, PINBALL.DAT
auto cadetDat = fopen(cadetFilePath.c_str(), "r"); char* dataSearchPaths[2]
if (cadetDat)
{ {
fclose(cadetDat); SDL_GetBasePath(),
DatFileName = "CADET.DAT"; SDL_GetPrefPath(nullptr, "SpaceCadetPinball")
pb::FullTiltMode = true; };
std::string datFileNames[2]
{
"CADET.DAT",
options::get_string("Pinball Data", pinball::get_rc_string(168, 0))
};
for (auto path : dataSearchPaths)
{
if (DatFileName.empty() && path)
{
BasePath = path;
for (int i = 0; i < 2; i++)
{
auto datFileName = datFileNames[i];
auto datFilePath = pinball::make_path_name(datFileName);
auto datFile = fopen(datFilePath.c_str(), "r");
if (datFile)
{
fclose(datFile);
DatFileName = datFileName;
if (i == 0)
pb::FullTiltMode = true;
printf("Loading game from: %s\n", datFilePath.c_str());
break;
}
}
}
SDL_free(path);
} }
// SDL window // SDL window

2
SpaceCadetPinball/winmain.h
View File

@ -48,7 +48,7 @@ public:
static bool LaunchBallEnabled; static bool LaunchBallEnabled;
static bool HighScoresEnabled; static bool HighScoresEnabled;
static bool DemoActive; static bool DemoActive;
static char* BasePath; static std::string BasePath;
static int MainMenuHeight; static int MainMenuHeight;
static int WinMain(LPCSTR lpCmdLine); static int WinMain(LPCSTR lpCmdLine);