From f9fe75d5e7286088fdfe4cd2f0611e0bb35b825b Mon Sep 17 00:00:00 2001 From: AcyForsythe Date: Wed, 25 Apr 2007 22:45:10 +0000 Subject: [PATCH] - Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@857 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 12 +-- GameSettings.h | 3 +- GameVersion.cpp | 4 +- Init.cpp | 7 ++ JA2.opt | Bin 124928 -> 159232 bytes JA2.plg | 156 +++++++++++++++++++++++++++--------- Strategic/MilitiaSquads.cpp | 13 +++ Strategic/Strategic.dsp | 8 ++ Strategic/Town Militia.cpp | 6 +- Tactical/Overhead.cpp | 4 +- Tactical/Weapons.h | 1 - Tactical/XML.h | 5 ++ Tactical/bullets.cpp | 4 +- 13 files changed, 168 insertions(+), 55 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 0e3b383f..9616bf40 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -414,14 +414,16 @@ void LoadGameExternalOptions() //################# Tactical Settings ################# + gGameExternalOptions.gfRevealItems = iniReader.ReadBoolean("JA2 Tactical Settings","REVEAL_ITEMS_AFTER_COMBAT",TRUE); + // Militia Settings gGameExternalOptions.fAllowTacticalMilitiaCommand = iniReader.ReadBoolean("JA2 Tactical Settings","ALLOW_TACTICAL_MILITIA_COMMAND",0); // Enemy AP settings - gGameExternalOptions.iEasyAPBonus = iniReader.ReadInteger("JA2 Tactical Settings","NOVICE_AP_BONUS",0); - gGameExternalOptions.iExperiencedAPBonus = iniReader.ReadInteger("JA2 Tactical Settings","EXPERIENCED_AP_BONUS",0); - gGameExternalOptions.iExpertAPBonus = iniReader.ReadInteger("JA2 Tactical Settings","EXPERT_AP_BONUS",0); - gGameExternalOptions.iInsaneAPBonus = iniReader.ReadInteger("JA2 Tactical Settings","INSANE_AP_BONUS",0); + gGameExternalOptions.iEasyAPBonus = iniReader.ReadInteger("JA2 Gameplay Settings","NOVICE_AP_BONUS",0); + gGameExternalOptions.iExperiencedAPBonus = iniReader.ReadInteger("JA2 Gameplay Settings","EXPERIENCED_AP_BONUS",0); + gGameExternalOptions.iExpertAPBonus = iniReader.ReadInteger("JA2 Gameplay Settings","EXPERT_AP_BONUS",0); + gGameExternalOptions.iInsaneAPBonus = iniReader.ReadInteger("JA2 Gameplay Settings","INSANE_AP_BONUS",0); // Sight range gGameExternalOptions.ubStraightSightRange = iniReader.ReadInteger("JA2 Tactical Settings","BASE_SIGHT_RANGE",13); @@ -602,7 +604,7 @@ void LoadGameExternalOptions() gGameExternalOptions.iRegularCostModifier = iniReader.ReadInteger("JA2 Gameplay Settings","REGULAR_COST_MODIFIER",1); gGameExternalOptions.iVeteranCostModifier = iniReader.ReadInteger("JA2 Gameplay Settings","VETERAN_COST_MODIFIER",2); gGameExternalOptions.iMinLoyaltyToTrain = iniReader.ReadInteger("JA2 Gameplay Settings","MIN_LOYALTY_TO_TRAIN",20); - + gGameExternalOptions.gflimitedRoaming = iniReader.ReadBoolean("JA2 Gameplay Settings","RESTRICT_ROAMING",FALSE); //Assignment Settings (training, repairing, doctoring, etc) gGameExternalOptions.ubAssignmentUnitsPerDay = iniReader.ReadInteger("JA2 Gameplay Settings","ASSIGNMENT_UNITS_PER_DAY",24); gGameExternalOptions.ubMinutesForAssignmentToCount = iniReader.ReadInteger("JA2 Gameplay Settings","MINUTES_FOR_ASSIGNMENT_TO_COUNT",45); diff --git a/GameSettings.h b/GameSettings.h index bd522124..e56cf397 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -231,6 +231,7 @@ typedef struct BOOLEAN gfTrainVeteranMilitia; BOOLEAN gfAllowMilitiaGroups; BOOLEAN gfmusttrainroaming; + BOOLEAN gflimitedRoaming; BOOLEAN gfAllowReinforcements; BOOLEAN gfAllowReinforcementsOnlyInCity; UINT32 guiBaseQueenPoolIncrement; @@ -376,7 +377,7 @@ typedef struct BOOLEAN fEnableCrepitus; BOOLEAN fEnableAllWeaponCaches; BOOLEAN fEnableAllTerrorists; - + BOOLEAN gfRevealItems; BOOLEAN fEnableArmorCoverage; // ShadoWarrior for Captain J's armor coverage // ShadoWarrior: Tooltip changes (start) diff --git a/GameVersion.cpp b/GameVersion.cpp index a3b68463..d6299e98 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -13,12 +13,12 @@ #ifdef JA2BETAVERSION //BETA/TEST BUILD VERSION -INT16 zVersionLabel[256] = { L"Map Editor v1.13.687" }; +wchar_t zVersionLabel[256] = { L"Map Editor v1.13.687" }; #elif defined CRIPPLED_VERSION //RELEASE BUILD VERSION -INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; +wchar_t zVersionLabel[256] = { L"Beta v. 0.98" }; #else diff --git a/Init.cpp b/Init.cpp index 06249651..4fd872f2 100644 --- a/Init.cpp +++ b/Init.cpp @@ -389,6 +389,13 @@ BOOLEAN LoadExternalGameplayData(STR directoryName) if(!ReadInExplosionDataStats(fileName)) return FALSE; + // Kaiden: Read in Restricted Sectors for Mobile Militia + strcpy(fileName, directoryName); + strcat(fileName, ROAMINGMILITIAFILENAME); + DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); + if(!ReadInRoamingInfo(fileName)) + return FALSE; + return TRUE; } diff --git a/JA2.opt b/JA2.opt index a5f20682d5d4ef461f13f62f1fb790864f6815b7..ee1d2bcbc2c2e36e6b9d2c11b70b2cdad05036bf 100644 GIT binary patch literal 159232 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%0A% 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

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\RSP54.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\RSP54.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP55.tmp" with contents [ /nologo /out:"Release\TileEngine.lib" ".\Release\Ambient Control.obj" @@ -87,11 +87,12 @@ 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\RSP55.tmp"

Output Window

Compiling... Ambient Control.cpp GENERATED PCH FOR TILEENGINE PROJECT. + (Language set to ENGLISH, You'll need english CDs) Buildings.cpp environment.cpp Exit Grids.cpp @@ -132,7 +133,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\RSP56.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 +173,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\RSP56.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP57.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\RSP57.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP58.tmp" with contents [ /nologo /out:".\Release\Standard Gaming Platform.lib" ".\Release\Button Sound Control.obj" @@ -221,24 +222,28 @@ 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\RSP58.tmp"

Output Window

Compiling... Button Sound Control.cpp GENERATED PCH FOR JA2 SGP PROJECT. + (Language set to ENGLISH, You'll need english CDs) Button System.cpp Container.cpp Cursor Control.cpp DbMan.cpp DirectDraw Calls.cpp DirectX Common.cpp + (Language set to ENGLISH, You'll need english CDs) GENERATED PCH FOR JA2 SGP PROJECT. English.cpp GENERATED PCH FOR JA2 SGP PROJECT. + (Language set to ENGLISH, You'll need english CDs) ExceptionHandling.cpp FileCat.cpp FileMan.cpp GENERATED PCH FOR JA2 SGP PROJECT. + (Language set to ENGLISH, You'll need english CDs) Font.cpp himage.cpp impTGA.cpp @@ -247,14 +252,17 @@ Install.cpp LibraryDataBase.cpp line.cpp MemMan.cpp + (Language set to ENGLISH, You'll need english CDs) mousesystem.cpp GENERATED PCH FOR JA2 SGP PROJECT. + (Language set to ENGLISH, You'll need english CDs) Mutex Manager.cpp PCX.cpp Random.cpp readdir.cpp RegInst.cpp GENERATED PCH FOR JA2 SGP PROJECT. + (Language set to ENGLISH, You'll need english CDs) sgp.cpp shading.cpp soundman.cpp @@ -262,20 +270,23 @@ STCI.cpp stringicmp.cpp timer.cpp GENERATED PCH FOR JA2 SGP PROJECT. + (Language set to ENGLISH, You'll need english CDs) video.cpp vobject.cpp vobject_blitters.cpp vsurface.cpp WinFont.cpp + (Language set to ENGLISH, You'll need english CDs) Compiling... DEBUG.cpp GENERATED PCH FOR JA2 SGP PROJECT. + (Language set to ENGLISH, You'll need english CDs) 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\RSP59.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 +383,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\RSP59.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5A.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\RSP5A.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5B.tmp" with contents [ /nologo /out:"Release\Tactical.lib" ".\Release\Air Raid.obj" @@ -477,11 +488,12 @@ 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\RSP5B.tmp"

Output Window

Compiling... Air Raid.cpp GENERATED PCH FOR TACTICAL PROJECT. + (Language set to ENGLISH, You'll need english CDs) Animation Cache.cpp Animation Control.cpp Animation Data.cpp @@ -495,8 +507,10 @@ Civ Quotes.cpp Dialogue Control.cpp DisplayCover.cpp GENERATED PCH FOR TACTICAL AI PROJECT. + (Language set to ENGLISH, You'll need english CDs) Drugs And Alcohol.cpp GENERATED PCH FOR TACTICAL PROJECT. + (Language set to ENGLISH, You'll need english CDs) End Game.cpp Enemy Soldier Save.cpp EnemyItemDrops.cpp @@ -542,8 +556,10 @@ Soldier Profile.cpp Soldier Tile.cpp SoldierTooltips.cpp GENERATED PCH FOR TACTICAL PROJECT. + (Language set to ENGLISH, You'll need english CDs) Spread Burst.cpp GENERATED PCH FOR TACTICAL PROJECT. + (Language set to ENGLISH, You'll need english CDs) Squads.cpp Strategic Exit GUI.cpp Structure Wrap.cpp @@ -581,12 +597,13 @@ XML_TonyInventory.cpp Compiling... LOS.cpp GENERATED PCH FOR TACTICAL PROJECT. + (Language set to ENGLISH, You'll need english CDs) 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\RSP5C.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 +646,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\RSP5C.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5D.tmp" with contents [ /nologo /out:"Release\Utils.lib" .\Release\_DutchText.obj @@ -673,28 +690,36 @@ 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\RSP5D.tmp"

Output Window

Compiling... _DutchText.cpp GENERATED PCH FOR UTILS PROJECT. + (Language set to ENGLISH, You'll need english CDs) _EnglishText.cpp GENERATED PCH FOR UTILS PROJECT. + (Language set to ENGLISH, You'll need english CDs) _FrenchText.cpp _GermanText.cpp _ItalianText.cpp GENERATED PCH FOR UTILS PROJECT. + (Language set to ENGLISH, You'll need english CDs) _Ja25EnglishText.cpp GENERATED PCH FOR UTILS PROJECT. + (Language set to ENGLISH, You'll need english CDs) _Ja25GermanText.cpp _PolishText.cpp GENERATED PCH FOR UTILS PROJECT. + (Language set to ENGLISH, You'll need english CDs) _RussianText.cpp Animated ProgressBar.cpp GENERATED PCH FOR UTILS PROJECT. + (Language set to ENGLISH, You'll need english CDs) Cinematics.cpp + (Language set to ENGLISH, You'll need english CDs) Cursors.cpp GENERATED PCH FOR UTILS PROJECT. + (Language set to ENGLISH, You'll need english CDs) Debug Control.cpp dsutil.cpp Encrypted File.cpp @@ -702,20 +727,27 @@ Event Manager.cpp Event Pump.cpp Font Control.cpp INIReader.cpp + (Language set to ENGLISH, You'll need english CDs) MapUtility.cpp GENERATED PCH FOR UTILS PROJECT. + (Language set to ENGLISH, You'll need english CDs) MercTextBox.cpp message.cpp Multi Language Graphic Utils.cpp GENERATED PCH FOR UTILS PROJECT. + (Language set to ENGLISH, You'll need english CDs) Multilingual Text Code Generator.cpp Music Control.cpp GENERATED PCH FOR UTILS PROJECT. + (Language set to ENGLISH, You'll need english CDs) PopUpBox.cpp Quantize Wrap.cpp + (Language set to ENGLISH, You'll need english CDs) Quantize.cpp + (Language set to ENGLISH, You'll need english CDs) Slider.cpp GENERATED PCH FOR UTILS PROJECT. + (Language set to ENGLISH, You'll need english CDs) Sound Control.cpp STIConvert.cpp Text Input.cpp @@ -725,6 +757,7 @@ Utilities.cpp WordWrap.cpp XML_Items.cpp GENERATED PCH FOR TACTICAL PROJECT. + (Language set to ENGLISH, You'll need english CDs) XML_Strings.cpp XML_Strings2.cpp Creating library... @@ -732,7 +765,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\RSP5E.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 +783,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\RSP5E.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5F.tmp" with contents [ /nologo /out:"Release\TacticalAI.lib" .\Release\AIList.obj @@ -769,11 +802,12 @@ 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\RSP5F.tmp"

Output Window

Compiling... AIList.cpp GENERATED PCH FOR TACTICAL AI PROJECT. + (Language set to ENGLISH, You'll need english CDs) AIMain.cpp AIUtils.cpp Attacks.cpp @@ -792,7 +826,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\RSP60.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 +854,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\RSP60.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP61.tmp" with contents [ /nologo /out:"Release\Editor.lib" ".\Release\Cursor Modes.obj" @@ -849,10 +883,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\RSP61.tmp"

Output Window

Compiling... Cursor Modes.cpp + (Language set to ENGLISH, You'll need english CDs) edit_sys.cpp Editor Callbacks.cpp Editor Modes.cpp @@ -881,7 +916,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\RSP62.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 +977,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\RSP62.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP63.tmp" with contents [ /nologo /out:"Release\Laptop.lib" .\Release\aim.obj @@ -1004,11 +1039,12 @@ 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\RSP63.tmp"

Output Window

Compiling... aim.cpp GENERATED PCH FOR LAPTOP PROJECT. + (Language set to ENGLISH, You'll need english CDs) AimArchives.cpp AimFacialIndex.cpp AimHistory.cpp @@ -1070,7 +1106,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\RSP64.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" @@ -1116,9 +1152,11 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1C.tmp" with content "C:\JA2\Build\Strategic\strategic.cpp" "C:\JA2\Build\Strategic\strategicmap.cpp" "C:\JA2\Build\Strategic\Town Militia.cpp" +"C:\JA2\Build\Strategic\XML_Army.cpp" +"C:\JA2\Build\Strategic\XML_Roaming.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\RSP64.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP65.tmp" with contents [ /nologo /out:"Release\Strategic.lib" ".\Release\AI Viewer.obj" @@ -1164,12 +1202,15 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1D.tmp" with content .\Release\strategic.obj .\Release\strategicmap.obj ".\Release\Town Militia.obj" +.\Release\XML_Army.obj +.\Release\XML_Roaming.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\RSP65.tmp"

Output Window

Compiling... AI Viewer.cpp GENERATED PCH FOR STRATEGIC PROJECT. + (Language set to ENGLISH, You'll need english CDs) Assignments.cpp Auto Resolve.cpp Campaign Init.cpp @@ -1212,13 +1253,15 @@ Strategic Turns.cpp strategic.cpp strategicmap.cpp Town Militia.cpp +XML_Army.cpp +XML_Roaming.cpp Creating library...

--------------------Configuration: ja2 - Win32 Release--------------------

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\RSP66.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 +1288,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\RSP66.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP67.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,19 +1326,23 @@ 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\RSP67.tmp"

Output Window

Compiling resources... Compiling... _Ja25GermanText.cpp GENERATED PCH FOR UTILS PROJECT. + (Language set to ENGLISH, You'll need english CDs) aniviewscreen.cpp GENERATED PCH FOR JA2 PROJECT. + (Language set to ENGLISH, You'll need english CDs) Credits.cpp Cursors.cpp GENERATED PCH FOR UTILS PROJECT. + (Language set to ENGLISH, You'll need english CDs) Fade Screen.cpp GENERATED PCH FOR JA2 PROJECT. + (Language set to ENGLISH, You'll need english CDs) GameInitOptionsScreen.cpp gameloop.cpp gamescreen.cpp @@ -1316,6 +1363,35 @@ SCREENS.cpp Sys Globals.cpp Linking... LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP69.tmp" with contents +[ +/nologo /o"Release/JA2.bsc" +.\Release\_Ja25GermanText.sbr +.\Release\aniviewscreen.sbr +.\Release\Credits.sbr +.\Release\Cursors.sbr +".\Release\Fade Screen.sbr" +.\Release\GameInitOptionsScreen.sbr +.\Release\gameloop.sbr +.\Release\gamescreen.sbr +.\Release\GameSettings.sbr +.\Release\GameVersion.sbr +.\Release\HelpScreen.sbr +.\Release\Init.sbr +.\Release\Intro.sbr +".\Release\JA2 Splash.sbr" +.\Release\jascreens.sbr +".\Release\Loading Screen.sbr" +.\Release\MainMenuScreen.sbr +.\Release\MessageBoxScreen.sbr +".\Release\Options Screen.sbr" +.\Release\SaveLoadGame.sbr +.\Release\SaveLoadScreen.sbr +.\Release\SCREENS.sbr +".\Release\Sys Globals.sbr"] +Creating command line "bscmake.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP69.tmp" +Creating browse info file... +

Output Window

diff --git a/Strategic/MilitiaSquads.cpp b/Strategic/MilitiaSquads.cpp index 2f2ba9e0..757ebc2e 100644 --- a/Strategic/MilitiaSquads.cpp +++ b/Strategic/MilitiaSquads.cpp @@ -57,6 +57,9 @@ #define DIR_SOUTH 2 #define DIR_WEST 3 +INT32 iRestrictedSectorArraySize; +UINT32 gRestrictMilitia[256]; + UINT8 gpAttackDirs[5][4]; // 0. Green Militia 1. Regular Militia 2. Elite Militia 3. Insertion code UINT8 guiDirNumber = 0; BOOLEAN gfMSBattle = FALSE; @@ -509,6 +512,16 @@ void UpdateMilitiaSquads(INT16 sMapX, INT16 sMapY ) return; //ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%ld,%ld:Dir count %ld, Rand %ld. Go to %ld,%ld. Have %ld militia men", sMapX, sMapY, uiDirNumber, iRandomRes, SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0] ), uiMilitiaCount); + //Kaiden: if Restricted Sectors List option is turned on, + // militia can't move to any sectors in the list. + // Unless they are following a group of mercs. + if (gGameExternalOptions.gflimitedRoaming) + for (INT32 i=0;i 0) { - // great! Promote a REGULAR militia guy in the training sector to a REGULAR + // great! Promote a REGULAR militia guy in the training sector to a VETERAN StrategicPromoteMilitiaInSector(sMapX, sMapY, REGULAR_MILITIA, 1); fFoundOne = TRUE; } @@ -216,7 +216,7 @@ void TownMilitiaTrainingCompleted( SOLDIERTYPE *pTrainer, INT16 sMapX, INT16 sMa { if( ubTownId != BLANK_SECTOR ) { - // dammit! Last chance - try to find other eligible sectors in the same town with a Green guy to be promoted + // dammit! Last chance - try to find other eligible sectors in the same town with a Regular guy to be promoted InitFriendlyTownSectorServer(ubTownId, sMapX, sMapY); // check other eligible sectors in this town for room for another militia @@ -225,7 +225,7 @@ void TownMilitiaTrainingCompleted( SOLDIERTYPE *pTrainer, INT16 sMapX, INT16 sMa // are there any REGULAR militia men in the neighbouring sector ? if (MilitiaInSectorOfRank(sNeighbourX, sNeighbourY, REGULAR_MILITIA) > 0) { - // great! Promote a GREEN militia guy in the neighbouring sector to a REGULAR + // great! Promote a Regular militia guy in the neighbouring sector to a Veteran StrategicPromoteMilitiaInSector(sNeighbourX, sNeighbourY, REGULAR_MILITIA, 1); fFoundOne = TRUE; diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index ee59227b..3b91de8b 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -6278,7 +6278,9 @@ BOOLEAN CheckForEndOfBattle( BOOLEAN fAnEnemyRetreated ) // Kaiden: More UB Reveal All Items after combat code. //When all the enemy gets killed, reveal the items they dropped - RevealAllDroppedEnemyItems(); + //But only if the option is turned ON. + if(gGameExternalOptions.gfRevealItems) + RevealAllDroppedEnemyItems(); return( TRUE ); } diff --git a/Tactical/Weapons.h b/Tactical/Weapons.h index 13bd4d6e..30542f80 100644 --- a/Tactical/Weapons.h +++ b/Tactical/Weapons.h @@ -314,7 +314,6 @@ extern EXPLOSIVETYPE Explosive[MAXITEMS+1]; extern INT8 gzBurstSndStrings[MAXITEMS*2][128]; // Lesh: changed this extern AMMOTYPE AmmoTypes[MAXITEMS]; - extern BOOLEAN ReadInWeaponStats(STR fileName); extern BOOLEAN WriteWeaponStats(); diff --git a/Tactical/XML.h b/Tactical/XML.h index 524380b4..8cca9bb6 100644 --- a/Tactical/XML.h +++ b/Tactical/XML.h @@ -70,6 +70,8 @@ typedef PARSE_STAGE; #define MOVEMENTCOSTFILENAME "Map\\MovementCosts.xml" #define ALTSECTORSFILENAME "Map\\AltSectors.xml" #define SAMSITESFILENAME "Map\\SamSites.xml" +#define ROAMINGMILITIAFILENAME "Map\\RestrictedRoamingMilitia.xml" + #define GARRISONFILENAME "Army\\GarrisonGroups.xml" #define PATROLFILENAME "Army\\PatrolGroups.xml" @@ -175,4 +177,7 @@ extern BOOLEAN ReadInPatrolInfo(STR fileName); extern BOOLEAN WriteInPatrolInfo(STR fileName); extern BOOLEAN ReadInArmyCompositionInfo(STR fileName); extern BOOLEAN WriteInArmyCompositionInfo(STR fileName); + +//Kaiden: Roaming Militia Restricted Sectors List +extern BOOLEAN ReadInRoamingInfo(STR filename); #endif \ No newline at end of file diff --git a/Tactical/bullets.cpp b/Tactical/bullets.cpp index 9879d2d4..34fd48cc 100644 --- a/Tactical/bullets.cpp +++ b/Tactical/bullets.cpp @@ -431,13 +431,13 @@ void AddMissileTrail( BULLET *pBullet, FIXEDPT qCurrX, FIXEDPT qCurrY, FIXEDPT q { strcpy( AniParams.zCachedFile, "TILECACHE\\BULLET_TRACER.STI" ); AniParams.uiFlags |= ANITILE_LIGHT; - if ( pBullet->pFirer->bLevel > 0 ) // if firer on roof then + /*if ( pBullet->pFirer->bLevel > 0 ) // if firer on roof then { if ( FindBuilding(AniParams.sGridNo) != NULL ) // if this spot is still within the building's grid area { AniParams.uiFlags &= ~ANITILE_LIGHT; } - } + }*/ } CreateAnimationTile( &AniParams );