From c28d0c984c15af2bb57593bca5cda3113325fc52 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 21 Dec 2013 22:45:54 +0000 Subject: [PATCH] Combine nearby d1/d2 guard in powerup.h --- common/main/powerup.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/common/main/powerup.h b/common/main/powerup.h index b4d22c675..09789efd8 100644 --- a/common/main/powerup.h +++ b/common/main/powerup.h @@ -97,19 +97,15 @@ enum powerup_type_t #if defined(DXX_BUILD_DESCENT_I) #define VULCAN_AMMO_MAX (392*2) -#elif defined(DXX_BUILD_DESCENT_II) -#define VULCAN_AMMO_MAX (392*4) -#endif -#define VULCAN_WEAPON_AMMO_AMOUNT 196 -#define VULCAN_AMMO_AMOUNT (49*2) - -#if defined(DXX_BUILD_DESCENT_I) #define MAX_POWERUP_TYPES 29 #elif defined(DXX_BUILD_DESCENT_II) +#define VULCAN_AMMO_MAX (392*4) #define GAUSS_WEAPON_AMMO_AMOUNT 392 #define MAX_POWERUP_TYPES 50 #endif +#define VULCAN_WEAPON_AMMO_AMOUNT 196 +#define VULCAN_AMMO_AMOUNT (49*2) #define POWERUP_NAME_LENGTH 16 // Length of a robot or powerup name. extern char Powerup_names[MAX_POWERUP_TYPES][POWERUP_NAME_LENGTH];