From ca6d31dc6c7c94e651816e9e209869cc4b9b2265 Mon Sep 17 00:00:00 2001 From: Per Inge Mathisen Date: Sun, 22 Jul 2007 13:22:01 +0000 Subject: [PATCH] Remove unused POWER_STATS git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2162 4a71c877-e1ca-e34f-864e-861f7616d084 --- src/stats.c | 28 ---------------------------- src/stats.h | 5 ----- src/statsdef.h | 10 ---------- 3 files changed, 43 deletions(-) diff --git a/src/stats.c b/src/stats.c index db123aef0..5cd0ac3c5 100644 --- a/src/stats.c +++ b/src/stats.c @@ -44,7 +44,6 @@ /* The stores for the different stats */ BODY_STATS *asBodyStats; BRAIN_STATS *asBrainStats; -//POWER_STATS *asPowerStats; PROPULSION_STATS *asPropulsionStats; SENSOR_STATS *asSensorStats; ECM_STATS *asECMStats; @@ -291,7 +290,6 @@ BOOL statsShutDown(void) //STATS_DEALLOC(asBodyStats, numBodyStats, BODY_STATS); deallocBodyStats(); STATS_DEALLOC(asBrainStats, numBrainStats, BRAIN_STATS); - //STATS_DEALLOC(asPowerStats, numPowerStats, POWER_STATS); STATS_DEALLOC(asPropulsionStats, numPropulsionStats, PROPULSION_STATS); STATS_DEALLOC(asSensorStats, numSensorStats, SENSOR_STATS); STATS_DEALLOC(asECMStats, numECMStats, ECM_STATS); @@ -354,11 +352,6 @@ BOOL statsAllocBrain(UDWORD numStats) { ALLOC_STATS(numStats, asBrainStats, numBrainStats, BRAIN_STATS); } -/* Allocate Power Stats */ -/*BOOL statsAllocPower(UDWORD numStats) -{ - ALLOC_STATS(numStats, asPowerStats, numPowerStats, POWER_STATS); -}*/ /* Allocate Propulsion Stats */ BOOL statsAllocPropulsion(UDWORD numStats) { @@ -2369,11 +2362,6 @@ void statsSetBrain(BRAIN_STATS *psStats, UDWORD index) SET_STATS(psStats, asBrainStats, index, BRAIN_STATS, REF_BRAIN_START); } /* Set the stats for a particular power type */ -/*void statsSetPower(POWER_STATS *psStats, UDWORD index) -{ - SET_STATS(psStats, asPowerStats, index, POWER_STATS, REF_POWER_START); -}*/ -/* Set the stats for a particular power type */ void statsSetPropulsion(PROPULSION_STATS *psStats, UDWORD index) { SET_STATS(psStats, asPropulsionStats, index, PROPULSION_STATS, @@ -2470,22 +2458,6 @@ BRAIN_STATS *statsGetBrain(UDWORD ref) return NULL; // should never get here, but this stops the compiler complaining. } -/*POWER_STATS *statsGetPower(UDWORD ref) -{ - UDWORD index; - ASSERT( (ref >= REF_POWER_START) && (ref < REF_POWER_START + REF_RANGE), - "statsGetPower: Invalid reference number: %x", ref ); - - for (index = 0; index < numPowerStats; index++) - { - if (asPowerStats[index].ref == ref) - { - return &asPowerStats[index]; - } - } - ASSERT( FALSE, "statsGetPower: Reference number not found in list: %x", ref ); -}*/ - PROPULSION_STATS *statsGetPropulsion(UDWORD ref) { UDWORD index; diff --git a/src/stats.h b/src/stats.h index 6490cd9fe..2568c57ae 100644 --- a/src/stats.h +++ b/src/stats.h @@ -35,7 +35,6 @@ /* The stores for the different stats */ extern BODY_STATS *asBodyStats; extern BRAIN_STATS *asBrainStats; -//extern POWER_STATS *asPowerStats; extern PROPULSION_STATS *asPropulsionStats; extern SENSOR_STATS *asSensorStats; extern ECM_STATS *asECMStats; @@ -220,9 +219,6 @@ extern void statsSetBody(BODY_STATS *psStats, UDWORD index); /*Set the stats for a particular brain type*/ extern void statsSetBrain(BRAIN_STATS *psStats, UDWORD index); -/*Set the stats for a particular power type*/ -//extern void statsSetPower(POWER_STATS *psStats, UDWORD index); - /*Set the stats for a particular propulsion type*/ extern void statsSetPropulsion(PROPULSION_STATS *psStats, UDWORD index); @@ -245,7 +241,6 @@ extern WEAPON_STATS *statsGetWeapon(UDWORD ref); //extern ARMOUR_STATS *statsGetArmour(UDWORD ref); extern BODY_STATS *statsGetBody(UDWORD ref); extern BRAIN_STATS *statsGetBrain(UDWORD ref); -//extern POWER_STATS *statsGetPower(UDWORD ref); extern PROPULSION_STATS *statsGetPropulsion(UDWORD ref); extern SENSOR_STATS *statsGetSensor(UDWORD ref); extern ECM_STATS *statsGetECM(UDWORD ref); diff --git a/src/statsdef.h b/src/statsdef.h index ec21b8d6a..815a47e94 100644 --- a/src/statsdef.h +++ b/src/statsdef.h @@ -239,16 +239,6 @@ typedef struct _brain_stats struct _weapon_stats *psWeaponStat; //weapon stats associated with this brain - for Command Droids } BRAIN_STATS; -#if(0) -typedef struct _power_stats -{ - // Common stats - COMPONENT_STATS; - - UDWORD output; // Power output from the power plant -} POWER_STATS; -#endif - //defines the left and right sides for propulsion IMDs typedef enum _prop_side {