1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix: Removed the serious bug that was added in exe build 568

Browse Source 
- feature: Re-enabled auto save (USE_AUTO_SAVE in ja2_options.ini)



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@576 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2006-09-28 15:23:45 +00:00
parent c9230621f9
commit 2169585abb
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+2 -4
View File
@@ -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
GameVersion.cpp
+2 -2
View File
@@ -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" };
JA2.suo
BIN
View File
Binary file not shown.
TileEngine/worldman.cpp
+1 -2
View File
@@ -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