1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

If MILITIA_STRATEGIC_COMMAND_REQUIRES_MERC is FALSE, militia can be controlled everywhere even without staffing a HQ

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8548 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-03-14 20:20:13 +00:00
parent 56f9864441
commit 64a971edec
5 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+2 -1
View File
@@ -2124,7 +2124,8 @@ void LoadGameExternalOptions()
gGameExternalOptions.dMilitiaVolunteerMultiplierFarm = iniReader.ReadFloat( "Militia Volunteer Pool Settings", "MILITIA_VOLUNTEER_POOL_MULTIPLIER_FARM", 0.05f, 0.0f, 1.0f ); gGameExternalOptions.dMilitiaVolunteerMultiplierFarm = iniReader.ReadFloat( "Militia Volunteer Pool Settings", "MILITIA_VOLUNTEER_POOL_MULTIPLIER_FARM", 0.05f, 0.0f, 1.0f );
//################# Militia Strategic Movement Settings ################## //################# Militia Strategic Movement Settings ##################
gGameExternalOptions.fMilitiaStrategicCommand = iniReader.ReadBoolean("Militia Strategic Movement Settings", "ALLOW_MILITIA_STRATEGIC_COMMAND", FALSE ); gGameExternalOptions.fMilitiaStrategicCommand = iniReader.ReadBoolean( "Militia Strategic Movement Settings", "ALLOW_MILITIA_STRATEGIC_COMMAND", FALSE );
gGameExternalOptions.fMilitiaStrategicCommand_MercRequired = iniReader.ReadBoolean( "Militia Strategic Movement Settings", "MILITIA_STRATEGIC_COMMAND_REQUIRES_MERC", TRUE );
// SANDRO - added several bonuses for militia // SANDRO - added several bonuses for militia
//################# Militia Strength Settings ################## //################# Militia Strength Settings ##################
GameSettings.h
+1
View File
@@ -478,6 +478,7 @@ typedef struct
// Flugente: militia movement // Flugente: militia movement
BOOLEAN fMilitiaStrategicCommand; BOOLEAN fMilitiaStrategicCommand;
BOOLEAN fMilitiaStrategicCommand_MercRequired;
BOOLEAN gfAllowReinforcements; BOOLEAN gfAllowReinforcements;
BOOLEAN gfAllowReinforcementsOnlyInCity; BOOLEAN gfAllowReinforcementsOnlyInCity;
GameVersion.cpp
+9 -9
View File
@@ -15,9 +15,9 @@
#ifdef JA2EDITOR #ifdef JA2EDITOR
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8545 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8548 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8545 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8548 (Development Build)" };
#endif #endif
// ------------------------------ // ------------------------------
@@ -27,11 +27,11 @@
//DEBUG BUILD VERSION //DEBUG BUILD VERSION
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8545 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8548 (Development Build)" };
#elif defined (JA113DEMO) #elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8545 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8548 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8545 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8548 (Development Build)" };
#endif #endif
#elif defined CRIPPLED_VERSION #elif defined CRIPPLED_VERSION
@@ -46,16 +46,16 @@
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8545 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8548 (Development Build)" };
#elif defined (JA113DEMO) #elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8545 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8548 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Release v1.13.8545 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release v1.13.8548 (Development Build)" };
#endif #endif
#endif #endif
CHAR8 czVersionNumber[16] = { "Build 18.03.11" }; //YY.MM.DD CHAR8 czVersionNumber[16] = { "Build 18.03.14" }; //YY.MM.DD
CHAR16 zTrackingNumber[16] = { L"Z" }; CHAR16 zTrackingNumber[16] = { L"Z" };
// SAVE_GAME_VERSION is defined in header, change it there // SAVE_GAME_VERSION is defined in header, change it there
Strategic/Assignments.cpp
+4
View File
@@ -21522,6 +21522,10 @@ void MoveItemMenuMvtCallback(MOUSE_REGION * pRegion, INT32 iReason )
BOOLEAN MercStaffsMilitaryHQ() BOOLEAN MercStaffsMilitaryHQ()
{ {
// if we don't need a HQ, this is easy
if ( !gGameExternalOptions.fMilitiaStrategicCommand_MercRequired )
return TRUE;
SOLDIERTYPE *pSoldier = NULL; SOLDIERTYPE *pSoldier = NULL;
UINT32 uiCnt = 0; UINT32 uiCnt = 0;
UINT32 firstid = gTacticalStatus.Team[ OUR_TEAM ].bFirstID; UINT32 firstid = gTacticalStatus.Team[ OUR_TEAM ].bFirstID;
ja2_VS2017.vcxproj
+10
View File
@@ -105,26 +105,36 @@
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<TargetName>$(JA2Config)_$(JA2LangPrefix)_$(Configuration)</TargetName> <TargetName>$(JA2Config)_$(JA2LangPrefix)_$(Configuration)</TargetName>
<TargetExt>.exe</TargetExt> <TargetExt>.exe</TargetExt>
<OutDir>..\..\..\JA2 C17\</OutDir>
<IntDir>..\..\..\JA2 C17\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<TargetExt>.exe</TargetExt> <TargetExt>.exe</TargetExt>
<TargetName>MapEditor_$(JA2LangPrefix)_Debug</TargetName> <TargetName>MapEditor_$(JA2LangPrefix)_Debug</TargetName>
<OutDir>..\..\..\JA2 C17\</OutDir>
<IntDir>..\..\..\JA2 C17\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<TargetName>$(JA2Config)_$(JA2LangPrefix)_$(Configuration)</TargetName> <TargetName>$(JA2Config)_$(JA2LangPrefix)_$(Configuration)</TargetName>
<TargetExt>.exe</TargetExt> <TargetExt>.exe</TargetExt>
<OutDir>..\..\..\JA2 C17\</OutDir>
<IntDir>..\..\..\JA2 C17\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditor|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditor|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<TargetName>MapEditor_$(JA2LangPrefix)_Release</TargetName> <TargetName>MapEditor_$(JA2LangPrefix)_Release</TargetName>
<TargetExt>.exe</TargetExt> <TargetExt>.exe</TargetExt>
<OutDir>..\..\..\JA2 C17\</OutDir>
<IntDir>..\..\..\JA2 C17\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WithDebugInfo|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WithDebugInfo|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<TargetName>$(JA2Config)_$(JA2LangPrefix)_$(Configuration)</TargetName> <TargetName>$(JA2Config)_$(JA2LangPrefix)_$(Configuration)</TargetName>
<TargetExt>.exe</TargetExt> <TargetExt>.exe</TargetExt>
<OutDir>..\..\..\JA2 C17\</OutDir>
<IntDir>..\..\..\JA2 C17\</IntDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>