diff --git a/GameSettings.cpp b/GameSettings.cpp index 98e18c3d..dfba5a1d 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -24,7 +24,7 @@ #include "Text.h" -#define GAME_SETTINGS_FILE "..\\Ja2.set" +#define GAME_SETTINGS_FILE "Ja2.set" #define GAME_INI_FILE "..\\Ja2.ini" @@ -60,10 +60,12 @@ BOOLEAN LoadGameSettings() { HWFILE hFile; UINT32 uiNumBytesRead; + char gameSettingsFilePath[MAX_PATH]; + sprintf(gameSettingsFilePath, "%s\\%s", gCustomDataCat.GetRootDir().c_str(), GAME_SETTINGS_FILE); //if the game settings file does NOT exist, or if it is smaller then what it should be - if( !FileExists( GAME_SETTINGS_FILE ) || FileSize( GAME_SETTINGS_FILE ) != sizeof( GAME_SETTINGS ) ) + if( !FileExists( gameSettingsFilePath ) || FileSize( gameSettingsFilePath ) != sizeof( GAME_SETTINGS ) ) { //Initialize the settings InitGameSettings(); @@ -73,7 +75,7 @@ BOOLEAN LoadGameSettings() } else { - hFile = FileOpen( GAME_SETTINGS_FILE, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); + hFile = FileOpen( gameSettingsFilePath, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE ); if( !hFile ) { FileClose( hFile ); @@ -161,11 +163,13 @@ BOOLEAN SaveGameSettings() { HWFILE hFile; UINT32 uiNumBytesWritten; + char gameSettingsFilePath[MAX_PATH]; + sprintf(gameSettingsFilePath, "%s\\%s", gCustomDataCat.GetRootDir().c_str(), GAME_SETTINGS_FILE); //create the file - hFile = FileOpen( GAME_SETTINGS_FILE, FILE_ACCESS_WRITE | FILE_CREATE_ALWAYS, FALSE ); + hFile = FileOpen( gameSettingsFilePath, FILE_ACCESS_WRITE | FILE_CREATE_ALWAYS, FALSE ); if( !hFile ) { FileClose( hFile ); diff --git a/GameVersion.cpp b/GameVersion.cpp index f0eb8843..feee7821 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.736" }; + INT16 zVersionLabel[256] = { L"Release v1.13.748" }; #endif -INT8 czVersionNumber[16] = { "Build 07.02.24" }; //YY.MM.DD +INT8 czVersionNumber[16] = { "Build 07.03.01" }; //YY.MM.DD INT16 zTrackingNumber[16] = { L"Z" }; diff --git a/JA2.vcproj b/JA2.vcproj index d1cc2a01..600364fd 100644 --- a/JA2.vcproj +++ b/JA2.vcproj @@ -546,7 +546,7 @@