From d855a3447390d3656b560b41c263adb051697856 Mon Sep 17 00:00:00 2001 From: AcyForsythe Date: Sat, 7 Oct 2006 03:40:02 +0000 Subject: [PATCH] - Added options to remove mercenary on-assignment deaths, and also set the number of deaths per difficulty level git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@594 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 8 ++- GameSettings.h | 8 +++ GameVersion.cpp | 4 +- JA2.opt | Bin 177664 -> 113664 bytes JA2.plg | 84 ++++++++++++++------------- Strategic/Strategic Merc Handler.cpp | 5 +- Tactical/Campaign.cpp | 10 ++-- builddefines.h | 4 +- 8 files changed, 71 insertions(+), 52 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index f508b8741..50a25cd60 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -310,7 +310,13 @@ void LoadGameExternalOptions() gGameExternalOptions.fMercDayOne = iniReader.ReadBoolean("JA2 Laptop Settings","MERC_AVAILABLE_DAY_ONE",FALSE); gGameExternalOptions.fAllMercsAvailable = iniReader.ReadBoolean("JA2 Laptop Settings","ALL_MERCS_AT_MERC",FALSE); - + //Merc Death Settings: + gGameExternalOptions.gfMercsDieOnAssignment = iniReader.ReadBoolean("JA2 Laptop Settings","MERCS_DIE_ON_ASSIGNMENT",TRUE); + gGameExternalOptions.giEasyMercDeaths = iniReader.ReadInteger("JA2 Laptop Settings","EASY_MERC_DEATHS",1); + gGameExternalOptions.giExperiencedMercDeaths = iniReader.ReadInteger("JA2 Laptop Settings","EXPERIENCED_MERC_DEATHS",2); + gGameExternalOptions.giExpertMercDeaths = iniReader.ReadInteger("JA2 Laptop Settings","EXPERT_MERC_DEATHS",3); + gGameExternalOptions.giInsaneMercDeaths = iniReader.ReadInteger("JA2 Laptop Settings","INSANE_MERC_DEATHS",4); + //################# System Settings ################# gGameExternalOptions.gubDeadLockDelay = iniReader.ReadInteger("JA2 System Settings","DEAD_LOCK_DELAY",15); gGameExternalOptions.gfEnableEmergencyButton_SkipStrategicEvents = iniReader.ReadBoolean("JA2 System Settings","ENABLE_EMERGENCY_BUTTON_NUMLOCK_TO_SKIP_STRATEGIC_EVENTS",0); diff --git a/GameSettings.h b/GameSettings.h index a256063e9..1f5a6be14 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -379,6 +379,14 @@ typedef struct BOOLEAN fEnableSoldierTooltipBigSlot4; // ShadoWarrior: Tooltip changes (end) + //Kaiden MERC Deaths Externalized: + BOOLEAN gfMercsDieOnAssignment; + INT32 giEasyMercDeaths; + INT32 giExperiencedMercDeaths; + INT32 giExpertMercDeaths; + INT32 giInsaneMercDeaths; + + } GAME_EXTERNAL_OPTIONS; //This structure will contain general Ja2 settings NOT individual game settings. diff --git a/GameVersion.cpp b/GameVersion.cpp index ae454f23d..bdb90ccab 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -13,7 +13,7 @@ #ifdef JA2BETAVERSION //BETA/TEST BUILD VERSION -INT16 zVersionLabel[256] = { L"Map Editor v1.13.579" }; +INT16 zVersionLabel[256] = { L"Map Editor v1.13.592" }; #elif defined CRIPPLED_VERSION @@ -22,7 +22,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else - //RELEASE BUILD VERSION + //RELEASE BUILD VERSION INT16 zVersionLabel[256] = { L"Release v1.13.592" }; diff --git a/JA2.opt b/JA2.opt index e588d262281193c89f022f0abc98cd7f2a49e595..a359a007f007b556eda78c3e59675fa0e318702e 100644 GIT binary patch literal 113664 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 literal 177664 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 W>)GDYb5GOjnA#Kq3V|010{k*iby diff --git a/JA2.plg b/JA2.plg index cfb2cca9c..371566d38 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\RSPC.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP63.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\RSPC.tmp" with contents "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\RSPC.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP63.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP64.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\RSPD.tmp" with contents .\Release\worldman.obj .\Release\XML_ExplosionData.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPD.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP64.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\RSPE.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP65.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\RSPE.tmp" with contents "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\RSPE.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSPF.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP65.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP66.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\RSPF.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP10.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP66.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP67.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\RSP10.tmp" with content ".\Release\WinFont.obj" ".\ddraw.lib" ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP10.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP67.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\RSP11.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP68.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\RSP11.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\RSP11.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP12.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP68.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP69.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\RSP12.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP13.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP69.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6A.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\RSP13.tmp" with content .\Release\XML_Sounds.obj .\Release\XML_TonyInventory.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP13.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6A.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\RSP14.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6B.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\RSP14.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\RSP14.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP15.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6B.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6C.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\RSP15.tmp" with content .\Release\XML_Strings.obj .\Release\XML_Strings2.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP15.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6C.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\RSP16.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6D.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\RSP16.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\RSP16.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP17.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6D.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6E.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\RSP17.tmp" with content .\Release\QuestDebug.obj .\Release\Realtime.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP17.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6E.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\RSP18.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6F.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\RSP18.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\RSP18.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP19.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP6F.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP70.tmp" with contents [ /nologo /out:"Release\Editor.lib" ".\Release\Cursor Modes.obj" @@ -849,10 +849,11 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP19.tmp" with content .\Release\smooth.obj ".\Release\Smoothing Utils.obj" ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP19.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP70.tmp"

Output Window

Compiling... Cursor Modes.cpp +GENERATED PCH FOR EDITOR PROJECT. edit_sys.cpp Editor Callbacks.cpp Editor Modes.cpp @@ -881,7 +882,7 @@ Creating library... --------------------Configuration: Laptop - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP71.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 +943,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A.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\RSP1A.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP71.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP72.tmp" with contents [ /nologo /out:"Release\Laptop.lib" .\Release\aim.obj @@ -1004,7 +1005,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B.tmp" with content .\Release\sirtech.obj ".\Release\Store Inventory.obj" ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP72.tmp"

Output Window

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

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1C.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP73.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 +1118,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1C.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\RSP1C.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1D.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP73.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP74.tmp" with contents [ /nologo /out:"Release\Strategic.lib" ".\Release\AI Viewer.obj" @@ -1165,7 +1166,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1D.tmp" with content .\Release\strategicmap.obj ".\Release\Town Militia.obj" ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1D.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP74.tmp"

Output Window

Compiling... AI Viewer.cpp @@ -1218,7 +1219,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\RSP1E.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP75.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 +1246,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1E.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\RSP1E.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1F.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP75.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP76.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 +1284,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\RSP1F.tmp" +Creating command line "link.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP76.tmp"

Output Window

Compiling resources... Compiling... @@ -1306,6 +1307,7 @@ Init.cpp Intro.cpp JA2 Splash.cpp jascreens.cpp +C:\JA2\Build\jascreens.cpp(269) : warning C4101: 'str' : unreferenced local variable Loading Screen.cpp MainMenuScreen.cpp MessageBoxScreen.cpp @@ -1320,7 +1322,7 @@ LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF

Results

-ja2_cvs.exe - 0 error(s), 1 warning(s) +ja2_cvs.exe - 0 error(s), 2 warning(s) diff --git a/Strategic/Strategic Merc Handler.cpp b/Strategic/Strategic Merc Handler.cpp index 5d8f0dfdf..4cc221c65 100644 --- a/Strategic/Strategic Merc Handler.cpp +++ b/Strategic/Strategic Merc Handler.cpp @@ -414,7 +414,10 @@ void MercDailyUpdate() if (pProfile->bMercStatus == MERC_WORKING_ELSEWHERE) { // check if he's killed - HandleUnhiredMercDeaths( cnt ); + + //Kaiden: Externalized if Mercs get killed + if (gGameExternalOptions.gfMercsDieOnAssignment) + HandleUnhiredMercDeaths( cnt ); } } } diff --git a/Tactical/Campaign.cpp b/Tactical/Campaign.cpp index 3c6985323..86579e4f1 100644 --- a/Tactical/Campaign.cpp +++ b/Tactical/Campaign.cpp @@ -1165,17 +1165,17 @@ void HandleUnhiredMercDeaths( INT32 iProfileID ) // how many in total can be killed like this depends on player's difficulty setting switch( gGameOptions.ubDifficultyLevel ) { - case DIF_LEVEL_EASY: - ubMaxDeaths = 1; + case DIF_LEVEL_EASY: //Kaiden Externalized ubMaxDeaths Values + ubMaxDeaths = gGameExternalOptions.giEasyMercDeaths; break; case DIF_LEVEL_MEDIUM: - ubMaxDeaths = 2; + ubMaxDeaths = gGameExternalOptions.giExperiencedMercDeaths; break; case DIF_LEVEL_HARD: - ubMaxDeaths = 3; + ubMaxDeaths = gGameExternalOptions.giExpertMercDeaths; break; case DIF_LEVEL_INSANE: - ubMaxDeaths = 3; + ubMaxDeaths = gGameExternalOptions.giInsaneMercDeaths; break; default: Assert(FALSE); diff --git a/builddefines.h b/builddefines.h index aebb259d7..5cd0d5fd3 100644 --- a/builddefines.h +++ b/builddefines.h @@ -4,13 +4,13 @@ #include "Language Defines.h" // Beta version -//#define JA2BETAVERSION +#define JA2BETAVERSION // Normal test version // #define JA2TESTVERSION // If we want to include the editor -//#define JA2EDITOR +#define JA2EDITOR #ifdef _DEBUG #ifndef JA2TESTVERSION