diff --git a/GameSettings.cpp b/GameSettings.cpp index 32a0731ed..63c474ed4 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -366,7 +366,7 @@ void LoadGameExternalOptions() gGameExternalOptions.ubBreathGainReductionPerRainIntensity = iniReader.ReadFloat("JA2 Rain Settings","BREATH_GAIN_REDUCTION_PER_RAIN_INTENSITY",25); // Thunder settings - gGameExternalOptions.gfAllowLightning = iniReader.ReadBoolean("JA2 Thunder Settings","ALLOW_LIGHTNING",0); + gGameExternalOptions.gfAllowLightning = iniReader.ReadBoolean("JA2 Thunder Settings","ALLOW_LIGHTNING",TRUE); gGameExternalOptions.guiMinLightningInterval = iniReader.ReadInteger("JA2 Thunder Settings","MIN_INTERVAL_BETWEEN_LIGHTNINGS_IN_REAL_TIME_SECONDS",5); gGameExternalOptions.guiMaxLightningInterval = iniReader.ReadInteger("JA2 Thunder Settings","MAX_INTERVAL_BETWEEN_LIGHTNINGS_IN_REAL_TIME_SECONDS",15); gGameExternalOptions.guiMinDLInterval = iniReader.ReadInteger("JA2 Thunder Settings","MIN_INTERVAL_BETWEEN_LIGHTNING_AND_THUNDERCLAPS_IN_SECONDS",1); @@ -472,11 +472,9 @@ void LoadGameExternalOptions() // WANNE: Drop Items gGameExternalOptions.ubEnemiesItemDrop = iniReader.ReadInteger("JA2 Gameplay Settings","ENEMIES_ITEM_DROP", 0); - // WANNE: Auto save: I did not set USE_AUTO_SAVE in the ja2_options.ini, because - // the game always crashes after a "normal" savegame is loaded after loading an autosave + // WANNE: Auto save: Attention: The game always crashes after a "normal" savegame is loaded after loading an autosave // So for now USE_AUTO_SAVE is always false. // The game crashes when removing mouse region that are not set - // After we fix that bug, we can make the entry USE_AUTO_SAVE in the ja2_options.ini gGameExternalOptions.gfUseAutoSave = iniReader.ReadBoolean("JA2 Gameplay Settings","USE_AUTO_SAVE",FALSE); // Militia settings diff --git a/GameVersion.cpp b/GameVersion.cpp index 9be15a91b..c8442896a 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.568" }; + INT16 zVersionLabel[256] = { L"Release v1.13.575" }; #endif -INT8 czVersionNumber[16] = { "Build 06.09.26" }; +INT8 czVersionNumber[16] = { "Build 06.09.28" }; INT16 zTrackingNumber[16] = { L"Z" }; diff --git a/JA2.suo b/JA2.suo index 50a5ed8c8..b4e5faa16 100644 Binary files a/JA2.suo and b/JA2.suo differ diff --git a/TileEngine/worldman.cpp b/TileEngine/worldman.cpp index 6e2d978bf..cf857b142 100644 --- a/TileEngine/worldman.cpp +++ b/TileEngine/worldman.cpp @@ -3386,8 +3386,7 @@ UINT8 WhoIsThere2( INT16 sGridNo, INT8 bLevel ) // person must either have their pSoldier->sGridNo here or be non-passable if ( (pStructure->fFlags & STRUCTURE_PERSON) && ( !(pStructure->fFlags & STRUCTURE_PASSABLE) || MercPtrs[ pStructure->usStructureID ]->sGridNo == sGridNo) ) { - // WANNE NEW: CTH Fix - //if ( ( bLevel == 0 && pStructure->sCubeOffset == 0 ) || (bLevel > 0 && pStructure->sCubeOffset > 0) ) + if ( ( bLevel == 0 && pStructure->sCubeOffset == 0 ) || (bLevel > 0 && pStructure->sCubeOffset > 0) ) { // found a person, on the right level! // structure ID and merc ID are identical for merc structures