From 75b16dbdeeeb1e03f437411f050b59b74b79892a Mon Sep 17 00:00:00 2001 From: AcyForsythe Date: Sun, 29 Oct 2006 17:27:03 +0000 Subject: [PATCH] - 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 --- GameSettings.cpp | 3 +- GameSettings.h | 1 - JA2.opt | Bin 169472 -> 124928 bytes JA2.plg | 80 +++++++++++++++++----------------- Strategic/Auto Resolve.cpp | 2 - Strategic/Game Event Hook.cpp | 2 + Strategic/MilitiaSquads.cpp | 2 + Tactical/Campaign.cpp | 5 +++ Tactical/PATHAI.cpp | 2 - 9 files changed, 50 insertions(+), 47 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 7d9474c3..0c486a08 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -535,8 +535,7 @@ void LoadGameExternalOptions() gGameExternalOptions.ubRepairCostPerJam = iniReader.ReadInteger("JA2 Gameplay Settings","REPAIR_COST_PER_JAM",2); gGameExternalOptions.ubRepairRateDivisor = iniReader.ReadInteger("JA2 Gameplay Settings","REPAIR_RATE_DIVISOR",2500); - - + //Misc gGameExternalOptions.fAmmoDynamicWeight = iniReader.ReadBoolean("JA2 Gameplay Settings", "DYNAMIC_AMMO_WEIGHT", TRUE); //Pulmu diff --git a/GameSettings.h b/GameSettings.h index b17dc3ac..64976a5d 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -326,7 +326,6 @@ typedef struct INT32 ubAssignmentUnitsPerDay; INT32 ubMinutesForAssignmentToCount; - INT32 ubTrainingSkillMin; INT32 ubTrainingSkillMax; INT32 ubSelfTrainingDivisor; diff --git a/JA2.opt b/JA2.opt index 0c6beb525d72b8b2de66d44ed911e6ee85d7f05d..a5f20682d5d4ef461f13f62f1fb790864f6815b7 100644 GIT binary patch literal 124928 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 KVEzR(rTsq!gT-|K diff --git a/JA2.plg b/JA2.plg index b944aee5..cfb2cca9 100644 --- a/JA2.plg +++ b/JA2.plg @@ -6,7 +6,7 @@ --------------------Configuration: TileEngine - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD0.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPC.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/TileEngine.pch" /YX"TileEngine All.h" /Fo"Release/" /Fd"Release/" /FD /O2b2 /c "C:\JA2\Build\TileEngine\Ambient Control.cpp" @@ -46,8 +46,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD0.tmp" with content "C:\JA2\Build\TileEngine\worldman.cpp" "C:\JA2\Build\TileEngine\XML_ExplosionData.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD0.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD1.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPC.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD.tmp" with contents [ /nologo /out:"Release\TileEngine.lib" ".\Release\Ambient Control.obj" @@ -87,7 +87,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD1.tmp" with content .\Release\worldman.obj .\Release\XML_ExplosionData.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD1.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD.tmp"

Output Window

Compiling... Ambient Control.cpp @@ -132,7 +132,7 @@ Creating library... --------------------Configuration: Standard Gaming Platform - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD2.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\TileEngine" /I "..\Tactical" /I "..\Utils" /I "..\strategic" /I ".\\" /D "NO_ZLIB" /D "JA2_PRECOMPILED_HEADERS" /D "NO_ZLIB_COMPRESSION" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR".\Release/" /Fp".\Release/Standard Gaming Platform.pch" /YX"JA2 SGP ALL.H" /Fo".\Release/" /Fd".\Release/" /FD /c "C:\JA2\Build\Standard Gaming Platform\Button Sound Control.cpp" @@ -172,14 +172,14 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD2.tmp" with content "C:\JA2\Build\Standard Gaming Platform\vsurface.cpp" "C:\JA2\Build\Standard Gaming Platform\WinFont.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD2.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD3.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPF.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\TileEngine" /I "..\Tactical" /I "..\Utils" /I "..\strategic" /I ".\\" /D "NO_ZLIB" /D "JA2_PRECOMPILED_HEADERS" /D "NO_ZLIB_COMPRESSION" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /D "_DEBUG" /FR".\Release/" /Fp".\Release/Standard Gaming Platform.pch" /YX"JA2 SGP ALL.H" /Fo".\Release/" /Fd".\Release/" /FD /c "C:\JA2\Build\Standard Gaming Platform\DEBUG.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD3.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD4.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPF.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP10.tmp" with contents [ /nologo /out:".\Release\Standard Gaming Platform.lib" ".\Release\Button Sound Control.obj" @@ -221,7 +221,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD4.tmp" with content ".\Release\WinFont.obj" ".\ddraw.lib" ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD4.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP10.tmp"

Output Window

Compiling... Button Sound Control.cpp @@ -275,7 +275,7 @@ Creating library... --------------------Configuration: Tactical - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD5.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP11.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /FR"Release/" /Fp"Release/Tactical.pch" /YX"Tactical All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\Tactical\Air Raid.cpp" @@ -372,14 +372,14 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD5.tmp" with content "C:\JA2\Build\Tactical\XML_Sounds.cpp" "C:\JA2\Build\Tactical\XML_TonyInventory.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD5.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD6.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP11.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP12.tmp" with contents [ /nologo /MT /W3 /GX /Od /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /FR"Release/" /Fp"Release/Tactical.pch" /YX"Tactical All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\Tactical\LOS.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD6.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD7.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP12.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP13.tmp" with contents [ /nologo /out:"Release\Tactical.lib" ".\Release\Air Raid.obj" @@ -477,7 +477,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD7.tmp" with content .\Release\XML_Sounds.obj .\Release\XML_TonyInventory.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD7.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP13.tmp"

Output Window

Compiling... Air Raid.cpp @@ -586,7 +586,7 @@ Creating library... --------------------Configuration: Utils - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD8.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP14.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/Utils.pch" /YX"Utils All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\Utils\_DutchText.cpp" @@ -629,8 +629,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD8.tmp" with content "C:\JA2\Build\Utils\XML_Strings.cpp" "C:\JA2\Build\Utils\XML_Strings2.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD8.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD9.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP14.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP15.tmp" with contents [ /nologo /out:"Release\Utils.lib" .\Release\_DutchText.obj @@ -673,7 +673,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD9.tmp" with content .\Release\XML_Strings.obj .\Release\XML_Strings2.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD9.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP15.tmp"

Output Window

Compiling... _DutchText.cpp @@ -732,7 +732,7 @@ Creating library... --------------------Configuration: TacticalAI - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDA.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP16.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/TacticalAI.pch" /YX"AI All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\TacticalAI\AIList.cpp" @@ -750,8 +750,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDA.tmp" with content "C:\JA2\Build\TacticalAI\QuestDebug.cpp" "C:\JA2\Build\TacticalAI\Realtime.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDA.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDB.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP16.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP17.tmp" with contents [ /nologo /out:"Release\TacticalAI.lib" .\Release\AIList.obj @@ -769,7 +769,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDB.tmp" with content .\Release\QuestDebug.obj .\Release\Realtime.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDB.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP17.tmp"

Output Window

Compiling... AIList.cpp @@ -792,7 +792,7 @@ Creating library... --------------------Configuration: Editor - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDC.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP18.tmp" with contents [ /nologo /MT /W3 /GX /O2 /Ob2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\tacticalai" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/Editor.pch" /YX"Editor All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\Editor\Cursor Modes.cpp" @@ -820,8 +820,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDC.tmp" with content "C:\JA2\Build\Editor\smooth.cpp" "C:\JA2\Build\Editor\Smoothing Utils.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDC.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDD.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP18.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP19.tmp" with contents [ /nologo /out:"Release\Editor.lib" ".\Release\Cursor Modes.obj" @@ -849,7 +849,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDD.tmp" with content .\Release\smooth.obj ".\Release\Smoothing Utils.obj" ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDD.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP19.tmp"

Output Window

Compiling... Cursor Modes.cpp @@ -881,7 +881,7 @@ Creating library... --------------------Configuration: Laptop - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDE.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I ".\\" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/Laptop.pch" /YX"Laptop All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\Laptop\aim.cpp" @@ -942,8 +942,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDE.tmp" with content "C:\JA2\Build\Laptop\sirtech.cpp" "C:\JA2\Build\Laptop\Store Inventory.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDE.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDF.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B.tmp" with contents [ /nologo /out:"Release\Laptop.lib" .\Release\aim.obj @@ -1004,7 +1004,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDF.tmp" with content .\Release\sirtech.obj ".\Release\Store Inventory.obj" ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPDF.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B.tmp"

Output Window

Compiling... aim.cpp @@ -1070,7 +1070,7 @@ Creating library... --------------------Configuration: Strategic - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE0.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1C.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\Laptop" /I ".\\" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/Strategic.pch" /YX"Strategic All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\Strategic\AI Viewer.cpp" @@ -1117,8 +1117,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE0.tmp" with content "C:\JA2\Build\Strategic\strategicmap.cpp" "C:\JA2\Build\Strategic\Town Militia.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE0.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE1.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1C.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1D.tmp" with contents [ /nologo /out:"Release\Strategic.lib" ".\Release\AI Viewer.obj" @@ -1165,7 +1165,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE1.tmp" with content .\Release\strategicmap.obj ".\Release\Town Militia.obj" ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE1.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1D.tmp"

Output Window

Compiling... AI Viewer.cpp @@ -1218,7 +1218,7 @@ Creating library...

Command Lines

Creating command line "rc.exe /l 0x409 /fo"Release/ja2.res" /i "Res" /i ".\Res" /d "NDEBUG" "C:\JA2\Build\Res\ja2.rc"" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE2.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1E.tmp" with contents [ /nologo /G5 /MT /W3 /GX /Zi /O2 /Ob2 /I ".\Standard Gaming Platform" /I ".\TileEngine" /I ".\Tactical" /I ".\Utils" /I ".\TacticalAI" /I ".\Editor" /I ".\Strategic" /I ".\laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/JA2.pch" /YX"JA2 All.h" /Fo"Release/" /Fd"Release/" /FD /O2b2 /c "C:\JA2\Build\Utils\_Ja25GermanText.cpp" @@ -1245,8 +1245,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE2.tmp" with content "C:\JA2\Build\SCREENS.cpp" "C:\JA2\Build\Sys Globals.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE2.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE3.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1E.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1F.tmp" with contents [ libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib smackw32.lib mss32.lib /nologo /subsystem:windows /profile /map:"Release/ja2_cvs.map" /machine:I386 /out:"..\ja2_cvs.exe" .\Release\_Ja25GermanText.obj @@ -1283,7 +1283,7 @@ libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advap .\Laptop\Release\Laptop.lib .\Strategic\Release\Strategic.lib ] -Creating command line "link.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPE3.tmp" +Creating command line "link.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1F.tmp"

Output Window

Compiling resources... Compiling... diff --git a/Strategic/Auto Resolve.cpp b/Strategic/Auto Resolve.cpp index ab03269e..43fd8578 100644 --- a/Strategic/Auto Resolve.cpp +++ b/Strategic/Auto Resolve.cpp @@ -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 ) ); diff --git a/Strategic/Game Event Hook.cpp b/Strategic/Game Event Hook.cpp index 3a1b2305..9ddc0983 100644 --- a/Strategic/Game Event Hook.cpp +++ b/Strategic/Game Event Hook.cpp @@ -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"); diff --git a/Strategic/MilitiaSquads.cpp b/Strategic/MilitiaSquads.cpp index a81c7449..2f2ba9e0 100644 --- a/Strategic/MilitiaSquads.cpp +++ b/Strategic/MilitiaSquads.cpp @@ -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; diff --git a/Tactical/Campaign.cpp b/Tactical/Campaign.cpp index 86579e4f..dee7757b 100644 --- a/Tactical/Campaign.cpp +++ b/Tactical/Campaign.cpp @@ -278,6 +278,8 @@ void ProcessStatChange(MERCPROFILESTRUCT *pProfile, UINT8 ubStat, UINT16 usNumCh } */ + + // maximum possible usChance is 99% if (usChance > 99) { @@ -355,6 +357,9 @@ void ProcessStatChange(MERCPROFILESTRUCT *pProfile, UINT8 ubStat, UINT16 usNumCh } } + if (usChance <= 0) + usChance = 1; + if (PreRandom(100) < usChance ) { (*psStatGainPtr)--; diff --git a/Tactical/PATHAI.cpp b/Tactical/PATHAI.cpp index 88328368..6103e456 100644 --- a/Tactical/PATHAI.cpp +++ b/Tactical/PATHAI.cpp @@ -1069,7 +1069,6 @@ INT32 FindBestPath(SOLDIERTYPE *s , INT16 sDestination, INT8 ubLevel, INT16 usMo goto NEXTDIR; } - /* if ( gpWorldLevelData[newLoc].uiFlags & (MAPELEMENT_ENEMY_MINE_PRESENT | MAPELEMENT_PLAYER_MINE_PRESENT) ) { if (s->bSide == 0) @@ -1093,7 +1092,6 @@ INT32 FindBestPath(SOLDIERTYPE *s , INT16 sDestination, INT8 ubLevel, INT16 usMo } } } - */ //how much is admission to the next tile if ( gfPathAroundObstacles )