- Added Wanne's Landmine bugfix

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@608 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
AcyForsythe
2006-10-29 17:27:03 +00:00
parent 04913e8784
commit 75b16dbdee
9 changed files with 50 additions and 47 deletions
-2
View File
@@ -585,8 +585,6 @@ void EnterAutoResolveMode( UINT8 ubSectorX, UINT8 ubSectorY )
CreateDestroyMapInvButton();
RenderButtons();
//Kaiden: Setting Ja2_Options.ini file to be read
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Autoresolve1");
//Allocate memory for all the globals while we are in this mode.
gpAR = (AUTORESOLVE_STRUCT*)MemAlloc( sizeof( AUTORESOLVE_STRUCT ) );
+2
View File
@@ -81,6 +81,8 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent )
//Kaiden: Getting Value for MERC Available on Day one?
// for some reason, this can't be in gamesettings.cpp
// or it won't work.
bMercDayOne = iniReader.ReadBoolean("Options","MERC_DAY_ONE",FALSE);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"ExecuteStrategicEvent");
+2
View File
@@ -569,6 +569,8 @@ void CreateMilitiaSquads(INT16 sMapX, INT16 sMapY )
// for some other reason. But you also have to
// remove the same line in UpdateMilitiaSquads
// Or the ones you create won't move.
// This function is only called from UpdateMilitiaSquads
// and TownMilitiaTrainingCompleted
if( !gGameExternalOptions.gfAllowMilitiaGroups )
return;