[TD] Fixes loading HouseClass and Dino missions.

TheAssemblyArmada · Jun 18, 2024 · 678faa0 · 678faa0
1 parent ee2ad03
commit 678faa0
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 6 deletions.
diff --git a/common/region.h b/common/region.h
@@ -38,9 +38,8 @@
 class RegionClass
 {
 public:
-    RegionClass(void)
-    {
-        Threat = 0;
+    RegionClass(void){
+        //Threat = 0;
     };
     ~RegionClass(void){};
     int operator!=(RegionClass const& region)
@@ -75,6 +74,10 @@ class RegionClass
     {
         return Threat;
     };
+    void Init()
+    {
+        Threat = 0;
+    }
 
 protected:
     int Threat;

diff --git a/tiberiandawn/credits.h b/tiberiandawn/credits.h
@@ -50,6 +50,9 @@ class CreditClass
     **	Constructors, Destructors, and overloaded operators.
     */
     CreditClass(void);
+    CreditClass(NoInitClass const&)
+    {
+    }
 
     /*---------------------------------------------------------------------
     **	Member function prototypes.

diff --git a/tiberiandawn/house.cpp b/tiberiandawn/house.cpp
@@ -367,6 +367,9 @@ HouseClass::HouseClass(HousesType house)
     , CapturedBuildings()
     , TotalCrates()
 {
+    for (int i = 0; i < MAP_TOTAL_REGIONS; ++i) {
+        Regions[i].Init();
+    }
 
     for (HousesType i = HOUSE_FIRST; i < HOUSE_COUNT; i++) {
         UnitsKilled[i] = 0;

diff --git a/tiberiandawn/house.h b/tiberiandawn/house.h
@@ -421,10 +421,35 @@ class HouseClass
     {
     }
     HouseClass(void)
-        : Class(0){};
+        : Class(0)
+    {
+        for (int i = 0; i < MAP_TOTAL_REGIONS; ++i) {
+            Regions[i].Init();
+        }
+    }
     HouseClass(HousesType house);
-    HouseClass(NoInitClass const&)
-        : Class(this->Class){};
+    HouseClass(NoInitClass const& noinit)
+        : Class(this->Class)
+        , FreeHarvester(noinit)
+        , IonCannon(noinit)
+        , AirStrike(noinit)
+        , NukeStrike(noinit)
+        , AlertTime(noinit)
+        , BorrowedTime(noinit)
+        , BlitzTime(noinit)
+        , VisibleCredits(noinit)
+        , ScreenShakeTime(noinit)
+        , DamageTime(noinit)
+        , TeamTime(noinit)
+        , TriggerTime(noinit)
+        , SpeakAttackDelay(noinit)
+        , SpeakPowerDelay(noinit)
+        , SpeakMoneyDelay(noinit)
+        , SpeakMaxedDelay(noinit)
+        , Attack(noinit)
+        , AITimer(noinit)
+    {
+    }
     operator HousesType(void) const;
 
     /*---------------------------------------------------------------------

diff --git a/tiberiandawn/saveload.cpp b/tiberiandawn/saveload.cpp
@@ -638,6 +638,7 @@ bool Save_Misc_Values(FileClass& file)
     // This is new...
     file.Write(ActionMovie, sizeof(ActionMovie));
     file.Write(&TempleIoned, sizeof(TempleIoned));
+    file.Write(&AreThingiesEnabled, sizeof(AreThingiesEnabled));
 
     return (true);
 }
@@ -752,6 +753,10 @@ bool Load_Misc_Values(FileClass& file)
         file.Read(&TempleIoned, sizeof(TempleIoned));
     }
 
+    if (file.Seek(0, SEEK_CUR) < file.Size()) {
+        file.Read(&AreThingiesEnabled, sizeof(AreThingiesEnabled));
+    }
+
     return (true);
 }
 

diff --git a/tiberiandawn/super.h b/tiberiandawn/super.h
@@ -45,6 +45,10 @@ class SuperClass
                VoxType ready = VOX_NONE,
                VoxType impatient = VOX_NONE,
                VoxType suspend = VOX_NONE);
+    SuperClass(NoInitClass const& noinit)
+        : Control(noinit)
+    {
+    }
 
     bool Suspend(bool on);
     bool Enable(bool onetime = false, bool player = false, bool quiet = false);