Prevent evacuate logic by default in MP, add EvacInMP map keyword to …

…enable evac and add DisableEvac keyword to disable evacuate entirely for sp&mp
TheAssemblyArmada · Jun 28, 2022 · afe532c · afe532c
1 parent 3777ae9
commit afe532c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/redalert/aircraft.cpp b/redalert/aircraft.cpp
@@ -111,6 +111,16 @@
  *=============================================================================================*/
 static bool _Counts_As_Civ_Evac(ObjectClass const* candidate)
 {
+    if (Scen.DisableEvac) {
+        return false;
+    }
+
+    // If it's a multiplayer game and the scenario doesn't have 
+    // evacuate in multiplayer keyword defined, don't evacuate
+    if (Scen.EvacInMP == false && Session.Type != GAME_NORMAL) {
+        return false;
+    }
+
     /*
     **	If the candidate pointer is missing, then return with failure code.
     */

diff --git a/redalert/scenario.cpp b/redalert/scenario.cpp
@@ -165,7 +165,9 @@ ScenarioClass::ScenarioClass(void)
     , IsNoMapSel(false)
     , IsTruckCrate(false)
     , IsMoneyTiberium(false)
-    ,
+    , EvacInMP(false)
+    , DisableEvac(false)
+    , 
 #ifdef FIXIT_VERSION_3 //	For endgame auto-sonar pulse.
 #define AUTOSONAR_PERIOD TICKS_PER_SECOND * 40
     AutoSonarTimer(AUTOSONAR_PERIOD)
@@ -2302,6 +2304,8 @@ bool Read_Scenario_INI(char* fname, bool)
     Scen.IsTruckCrate = ini.Get_Bool(BASIC, "TruckCrate", Scen.IsTruckCrate);
     Scen.IsMoneyTiberium = ini.Get_Bool(BASIC, "FillSilos", Scen.IsMoneyTiberium);
     Scen.Percent = ini.Get_Int(BASIC, "Percent", Scen.Percent);
+    Scen.EvacInMP = ini.Get_Int(BASIC, "EvacInMP", Scen.EvacInMP);
+    Scen.DisableEvac = ini.Get_Int(BASIC, "DisableEvac", Scen.DisableEvac);
 
     /*
     **	Read in the specific information for each of the house types.  This creates

diff --git a/redalert/scenario.h b/redalert/scenario.h
@@ -249,7 +249,7 @@ class ScenarioClass
     unsigned IsToInherit : 1;
 
     /*
-    **	If Tanya or a civilian is to be automatically evacuated when they enter
+    **	If Tanya is to be automatically evacuated when they enter
     **	a transport vehicle, then this flag will be true.
     */
     unsigned IsTanyaEvac : 1;
@@ -310,6 +310,12 @@ class ScenarioClass
     */
     unsigned IsMoneyTiberium : 1;
 
+    /* With this disabled the units will not be evacuated in single player*/
+    bool DisableEvac;
+
+    /* by default evacuate is disabled for multiplayer*/
+    bool EvacInMP;
+
     /*
     **	This is the fading countdown timer.  As this timer counts down, the
     **	fading to b&w or color will progress.  This timer represents a