Switch to a VectorClass

Vinifera-Developers · Sep 10, 2024 · f7e4b7c · f7e4b7c
1 parent 47b3d5d
commit f7e4b7c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/src/extensions/house/houseext.cpp b/src/extensions/house/houseext.cpp
@@ -50,8 +50,8 @@ HouseClassExtension::HouseClassExtension(const HouseClass *this_ptr) :
 
     for (int i = 0; i < Tiberiums.Count(); i++)
     {
-        TiberiumStorage.Add(0);
-        WeedStorage.Add(0);
+        TiberiumStorage[i] = 0;
+        WeedStorage[i] = 0;
     }
 
     if (this_ptr)

diff --git a/src/extensions/house/houseext.h b/src/extensions/house/houseext.h
@@ -69,10 +69,10 @@ HouseClassExtension final : public AbstractClassExtension
         /**
          *  Replacement Tiberium storage.
          */
-        DynamicVectorClass<int> TiberiumStorage;
+        VectorClass<int> TiberiumStorage;
 
         /**
          *  Replacement Weed storage.
          */
-        DynamicVectorClass<int> WeedStorage;
+        VectorClass<int> WeedStorage;
 };
diff --git a/src/extensions/storage/storageext.h b/src/extensions/storage/storageext.h
@@ -35,16 +35,16 @@
 class StorageClassExt
 {
 public:
-    StorageClassExt(DynamicVectorClass<int>* vector) :
+    StorageClassExt(VectorClass<int>* vector) :
         Types(vector)
     {
     }
 
 public:
     /**
-     *  Pointer to the DVC located in the extension for the class that contains the StorageClass.
+     *  Pointer to the vector located in the extension for the class that contains the StorageClass.
      */
-    DynamicVectorClass<int>* Types;
+    VectorClass<int>* Types;
 
 public:
     int Get_Total_Value() const;

diff --git a/src/extensions/techno/technoext.cpp b/src/extensions/techno/technoext.cpp
@@ -57,7 +57,7 @@ TechnoClassExtension::TechnoClassExtension(const TechnoClass *this_ptr) :
 
     for (int i = 0; i < Tiberiums.Count(); i++)
     {
-        Storage.Add(0);
+        Storage[i] = 0;
     }
 
     if (this_ptr)

diff --git a/src/extensions/techno/technoext.h b/src/extensions/techno/technoext.h
@@ -79,5 +79,5 @@ class TechnoClassExtension : public RadioClassExtension
         /**
          *  Replacement Tiberium storage.
          */
-        DynamicVectorClass<int> Storage;
+        VectorClass<int> Storage;
 };
diff --git a/src/vinifera/vinifera_saveload.h b/src/vinifera/vinifera_saveload.h
@@ -96,9 +96,9 @@ void Vinifera_Remap_Storage_Pointers();
 
 
 template<class T>
-HRESULT Save_Primitive_Vector(LPSTREAM& pStm, DynamicVectorClass<T>& list)
+HRESULT Save_Primitive_Vector(LPSTREAM& pStm, VectorClass<T>& list)
 {
-    int count = list.Count();
+    int count = list.Length();
     HRESULT hr = pStm->Write(&count, sizeof(count), nullptr);
     if (FAILED(hr)) {
         return hr;
@@ -122,15 +122,15 @@ HRESULT Save_Primitive_Vector(LPSTREAM& pStm, DynamicVectorClass<T>& list)
 
 
 template<class T>
-HRESULT Load_Primitive_Vector(LPSTREAM& pStm, DynamicVectorClass<T>& list)
+HRESULT Load_Primitive_Vector(LPSTREAM& pStm, VectorClass<T>& list)
 {
     int count = 0;
     HRESULT hr = pStm->Read(&count, sizeof(count), nullptr);
     if (FAILED(hr)) {
         return hr;
     }
 
-    new (&list) DynamicVectorClass<T>();
+    new (&list) VectorClass<T>(count);
 
     if (count <= 0) {
         return hr;
@@ -143,7 +143,7 @@ HRESULT Load_Primitive_Vector(LPSTREAM& pStm, DynamicVectorClass<T>& list)
         if (FAILED(hr)) {
             return hr;
         }
-        list.Add(obj);
+        list[index] = obj;
 
     }