Move enums HIT_SIDE, PROP_SIDE and SENSOR_TYPE from statsdef.h to stats-db2.tpl

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5496 4a71c877-e1ca-e34f-864e-861f7616d084

src/stats-db2.h

@@ -192,6 +192,44 @@ typedef enum WEAPON_EFFECT
 	WE_NUMEFFECTS,
 } WEAPON_EFFECT;
 
+/**
+ * Sides used for droid impact
+ */
+typedef enum HIT_SIDE
+{
+	HIT_SIDE_FRONT,
+
+	HIT_SIDE_REAR,
+
+	HIT_SIDE_LEFT,
+
+	HIT_SIDE_RIGHT,
+
+	HIT_SIDE_TOP,
+
+	HIT_SIDE_BOTTOM,
+
+	/**
+	 * The number of enumerators in this enum.
+	 */
+	NUM_HIT_SIDES,
+} HIT_SIDE;
+
+/**
+ * Defines the left and right sides for propulsion IMDs
+ */
+typedef enum PROP_SIDE
+{
+	LEFT_PROP,
+
+	RIGHT_PROP,
+
+	/**
+	 * The number of enumerators in this enum.
+	 */
+	NUM_PROP_SIDES,
+} PROP_SIDE;
+
 typedef enum PROPULSION_TYPE
 {
 	PROPULSION_TYPE_WHEELED,
@@ -218,6 +256,22 @@ typedef enum PROPULSION_TYPE
 	PROPULSION_TYPE_NUM,
 } PROPULSION_TYPE;
 
+typedef enum SENSOR_TYPE
+{
+	STANDARD_SENSOR,
+
+	INDIRECT_CB_SENSOR,
+
+	VTOL_CB_SENSOR,
+
+	VTOL_INTERCEPT_SENSOR,
+
+	/**
+	 * Works as all of the above together! - new for updates
+	 */
+	SUPER_SENSOR,
+} SENSOR_TYPE;
+
 typedef enum FIREONMOVE
 {
 	/**

src/stats-db2.tpl

@@ -85,6 +85,7 @@ end;
 enum MOVEMENT_MODEL
     %max "NUM_MOVEMENT_MODEL";
     %valprefix "MM_";
+
     DIRECT
     INDIRECT
     HOMINGDIRECT
@@ -98,6 +99,7 @@ end;
 enum WEAPON_EFFECT
     %max "WE_NUMEFFECTS";
     %valprefix "WE_";
+
     ANTI_PERSONNEL
     ANTI_TANK
     BUNKER_BUSTER
@@ -106,8 +108,30 @@ enum WEAPON_EFFECT
     ANTI_AIRCRAFT
 end;
 
+# Sides used for droid impact
+enum HIT_SIDE
+    %max "NUM_HIT_SIDES";
+
+    FRONT
+    REAR
+    LEFT
+    RIGHT
+    TOP
+    BOTTOM
+end;
+
+# Defines the left and right sides for propulsion IMDs
+enum PROP_SIDE
+    %max "NUM_PROP_SIDES";
+    %valsuffix "_PROP";
+
+    LEFT
+    RIGHT
+end;
+
 enum PROPULSION_TYPE
     %max "PROPULSION_TYPE_NUM";
+
     WHEELED
     TRACKED
     LEGGED
@@ -119,6 +143,18 @@ enum PROPULSION_TYPE
     JUMP
 end;
 
+enum SENSOR_TYPE
+    %valprefix "";
+
+    STANDARD_SENSOR
+    INDIRECT_CB_SENSOR
+    VTOL_CB_SENSOR
+    VTOL_INTERCEPT_SENSOR
+
+    # Works as all of the above together! - new for updates
+    SUPER_SENSOR
+end;
+
 enum FIREONMOVE
     %valprefix "FOM_";
 

src/statsdef.h

@@ -65,19 +65,6 @@ typedef struct _comp_base_stats
 #define    SHOOT_ON_GROUND  0x01
 #define    SHOOT_IN_AIR     0x02
 
-
-//Sides used for droid impact
-typedef enum _hit_sides
-{
-	HIT_SIDE_FRONT,
-	HIT_SIDE_REAR,
-	HIT_SIDE_LEFT,
-	HIT_SIDE_RIGHT,
-	HIT_SIDE_TOP,
-	HIT_SIDE_BOTTOM,
-	NUM_HIT_SIDES   // should be the last one
-} HIT_SIDE;
-
 //Special angles representing top or bottom hit
 #define HIT_ANGLE_TOP 361
 #define HIT_ANGLE_BOTTOM 362
@@ -108,15 +95,6 @@ typedef struct _brain_stats
 	struct _weapon_stats* psWeaponStat;     ///< weapon stats associated with this brain - for Command Droids
 } BRAIN_STATS;
 
-//defines the left and right sides for propulsion IMDs
-typedef enum _prop_side
-{
-	LEFT_PROP,
-	RIGHT_PROP,
-
-	NUM_PROP_SIDES
-} PROP_SIDE;
-
 typedef struct _propulsion_stats
 {
 	/* Common stats */
@@ -126,16 +104,6 @@ typedef struct _propulsion_stats
 	PROPULSION_TYPE propulsionType; ///< Type of propulsion used - index into PropulsionTable
 } PROPULSION_STATS;
 
-typedef enum _sensor_type
-{
-	STANDARD_SENSOR,
-	INDIRECT_CB_SENSOR,
-	VTOL_CB_SENSOR,
-	VTOL_INTERCEPT_SENSOR,
-	SUPER_SENSOR,           ///< works as all of the above together! - new for updates
-} SENSOR_TYPE;
-
-
 typedef struct _sensor_stats
 {
 	/* Common stats */