From 49ef10fe3a7a9fae91a237148a39b15e53b0b496 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 8 Jun 2013 23:19:26 +0000 Subject: [PATCH] Convert HAS_*_INDEX to use helper macro --- main/weapon.h | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/main/weapon.h b/main/weapon.h index 984f0d84e..751bb7af2 100644 --- a/main/weapon.h +++ b/main/weapon.h @@ -94,17 +94,15 @@ typedef struct weapon_info { #define HAS_FLAG(index) (1<<(index)) // Weapon flags, if player->weapon_flags & WEAPON_FLAG is set, then the player has this weapon -#define HAS_LASER_FLAG 0x001 -#define HAS_VULCAN_FLAG 0x002 -#define HAS_SPREADFIRE_FLAG 0x004 -#define HAS_PLASMA_FLAG 0x008 -#define HAS_FUSION_FLAG 0x010 +#define HAS_LASER_FLAG HAS_FLAG(LASER_INDEX) +#define HAS_VULCAN_FLAG HAS_FLAG(VULCAN_INDEX) +#define HAS_SPREADFIRE_FLAG HAS_FLAG(SPREADFIRE_INDEX) +#define HAS_PLASMA_FLAG HAS_FLAG(PLASMA_INDEX) +#define HAS_FUSION_FLAG HAS_FLAG(FUSION_INDEX) -#define HAS_CONCUSSION_FLAG 0x001 -#define HAS_HOMING_FLAG 0x002 -#define HAS_PROXIMITY_FLAG 0x004 -#define HAS_SMART_FLAG 0x008 -#define HAS_MEGA_FLAG 0x010 +#define HAS_CONCUSSION_FLAG HAS_FLAG(CONCUSSION_INDEX) +#define HAS_SMART_FLAG HAS_FLAG(SMART_INDEX) +#define HAS_MEGA_FLAG HAS_FLAG(MEGA_INDEX) #define CLASS_PRIMARY 0 #define CLASS_SECONDARY 1