stats.cpp: remove unused macros for stats allocation

The old `STATS_DEALLOC` and `ALLOC_STATS` macros are not needed anymore. Rename `ALLOC_STATS_VECTOR` to just `ALLOC_STATS`. Signed-off-by: Pavel Solodovnikov <[email protected]>
Warzone2100 · Jan 28, 2024 · 9e5e386 · 9e5e386
1 parent 5bd04ef
commit 9e5e386
Showing 1 changed file with 9 additions and 22 deletions.
diff --git a/src/stats.cpp b/src/stats.cpp
@@ -95,25 +95,12 @@ static void deallocTerrainTable()
 *******************************************************************************/
 
 /* Macro to allocate memory for a set of stats */
-#define ALLOC_STATS(numEntries, list, listSize, type) \
-	ASSERT((numEntries) < ~STAT_MASK + 1, "Number of stats entries too large for " #type);\
-	if ((list))	delete [] (list);	\
-	(list) = new type[numEntries]; \
-	(listSize) = (numEntries); \
-	return true
-
-#define ALLOC_STATS_VECTOR(numEntries, list, type) \
+#define ALLOC_STATS(numEntries, list, type) \
 	ASSERT((numEntries) < ~STAT_MASK + 1, "Number of stats entries too large for " #type);\
 	if (!list.empty()) list.clear(); \
 	list.resize(numEntries); \
 	return true
 
-/*Macro to Deallocate stats*/
-#define STATS_DEALLOC(list, listSize) \
-	delete [] (list); \
-	listSize = 0; \
-	(list) = NULL
-
 /*Deallocate all the stats assigned from input data*/
 bool statsShutDown()
 {
@@ -141,44 +128,44 @@ bool statsShutDown()
 /* Allocate Weapon stats */
 bool statsAllocWeapons(UDWORD	numStats)
 {
-	ALLOC_STATS_VECTOR(numStats, asWeaponStats, WEAPON_STATS);
+	ALLOC_STATS(numStats, asWeaponStats, WEAPON_STATS);
 }
 /* Allocate Body Stats */
 bool statsAllocBody(UDWORD	numStats)
 {
-	ALLOC_STATS_VECTOR(numStats, asBodyStats, BODY_STATS);
+	ALLOC_STATS(numStats, asBodyStats, BODY_STATS);
 }
 /* Allocate Brain Stats */
 bool statsAllocBrain(UDWORD	numStats)
 {
-	ALLOC_STATS_VECTOR(numStats, asBrainStats, BRAIN_STATS);
+	ALLOC_STATS(numStats, asBrainStats, BRAIN_STATS);
 }
 /* Allocate Propulsion Stats */
 bool statsAllocPropulsion(UDWORD	numStats)
 {
-	ALLOC_STATS_VECTOR(numStats, asPropulsionStats, PROPULSION_STATS);
+	ALLOC_STATS(numStats, asPropulsionStats, PROPULSION_STATS);
 }
 /* Allocate Sensor Stats */
 bool statsAllocSensor(UDWORD	numStats)
 {
-	ALLOC_STATS_VECTOR(numStats, asSensorStats, SENSOR_STATS);
+	ALLOC_STATS(numStats, asSensorStats, SENSOR_STATS);
 }
 /* Allocate Ecm Stats */
 bool statsAllocECM(UDWORD	numStats)
 {
-	ALLOC_STATS_VECTOR(numStats, asECMStats, ECM_STATS);
+	ALLOC_STATS(numStats, asECMStats, ECM_STATS);
 }
 
 /* Allocate Repair Stats */
 bool statsAllocRepair(UDWORD	numStats)
 {
-	ALLOC_STATS_VECTOR(numStats, asRepairStats, REPAIR_STATS);
+	ALLOC_STATS(numStats, asRepairStats, REPAIR_STATS);
 }
 
 /* Allocate Construct Stats */
 bool statsAllocConstruct(UDWORD	numStats)
 {
-	ALLOC_STATS_VECTOR(numStats, asConstructStats, CONSTRUCT_STATS);
+	ALLOC_STATS(numStats, asConstructStats, CONSTRUCT_STATS);
 }
 
 /*******************************************************************************