TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Replace HAS_PRIMARY_FLAG(x) with HAS_x_FLAG

Browse source
This commit is contained in:
Kp 2015-04-19 04:18:50 +00:00
parent 12673084a0
commit aa4c5efbb9
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
similar/main/gauges.cpp
View file

@ -1259,11 +1259,11 @@ static void hud_printf_vulcan_ammo(const int x, const int y)
if (PlayerCfg.CockpitMode[1]!=CM_FULL_SCREEN) if (PlayerCfg.CockpitMode[1]!=CM_FULL_SCREEN)
return; return;
const unsigned primary_weapon_flags = Players[Player_num].primary_weapon_flags; const unsigned primary_weapon_flags = Players[Player_num].primary_weapon_flags;
const unsigned vulcan_mask = 1 << VULCAN_INDEX; const auto vulcan_mask = HAS_VULCAN_FLAG;
#if defined(DXX_BUILD_DESCENT_I) #if defined(DXX_BUILD_DESCENT_I)
const unsigned gauss_mask = 0; const auto gauss_mask = vulcan_mask;
#elif defined(DXX_BUILD_DESCENT_II) #elif defined(DXX_BUILD_DESCENT_II)
const unsigned gauss_mask = 1 << GAUSS_INDEX; const auto gauss_mask = HAS_GAUSS_FLAG;
#endif #endif
const int fmt_vulcan_ammo = f2i((unsigned int)Players[Player_num].vulcan_ammo * VULCAN_AMMO_SCALE); const int fmt_vulcan_ammo = f2i((unsigned int)Players[Player_num].vulcan_ammo * VULCAN_AMMO_SCALE);
const unsigned has_weapon_uses_vulcan_ammo = (primary_weapon_flags & (gauss_mask | vulcan_mask)); const unsigned has_weapon_uses_vulcan_ammo = (primary_weapon_flags & (gauss_mask | vulcan_mask));

16
similar/main/multi.cpp
View file

@ -3177,15 +3177,15 @@ uint_fast32_t map_granted_flags_to_player_flags(const uint16_t grant)
uint_fast32_t map_granted_flags_to_primary_weapon_flags(const uint16_t grant) uint_fast32_t map_granted_flags_to_primary_weapon_flags(const uint16_t grant)
{ {
return ((grant & NETGRANT_VULCAN) ? HAS_PRIMARY_FLAG(VULCAN_INDEX) : 0) return ((grant & NETGRANT_VULCAN) ? HAS_VULCAN_FLAG : 0)
| ((grant & NETGRANT_SPREAD) ? HAS_PRIMARY_FLAG(SPREADFIRE_INDEX) : 0) | ((grant & NETGRANT_SPREAD) ? HAS_SPREADFIRE_FLAG : 0)
| ((grant & NETGRANT_PLASMA) ? HAS_PRIMARY_FLAG(PLASMA_INDEX) : 0) | ((grant & NETGRANT_PLASMA) ? HAS_PLASMA_FLAG : 0)
| ((grant & NETGRANT_FUSION) ? HAS_PRIMARY_FLAG(FUSION_INDEX) : 0) | ((grant & NETGRANT_FUSION) ? HAS_FUSION_FLAG : 0)
#if defined(DXX_BUILD_DESCENT_II) #if defined(DXX_BUILD_DESCENT_II)
| ((grant & NETGRANT_GAUSS) ? HAS_PRIMARY_FLAG(GAUSS_INDEX) : 0) | ((grant & NETGRANT_GAUSS) ? HAS_GAUSS_FLAG : 0)
| ((grant & NETGRANT_HELIX) ? HAS_PRIMARY_FLAG(HELIX_INDEX) : 0) | ((grant & NETGRANT_HELIX) ? HAS_HELIX_FLAG : 0)
| ((grant & NETGRANT_PHOENIX) ? HAS_PRIMARY_FLAG(PHOENIX_INDEX) : 0) | ((grant & NETGRANT_PHOENIX) ? HAS_PHOENIX_FLAG : 0)
| ((grant & NETGRANT_OMEGA) ? HAS_PRIMARY_FLAG(OMEGA_INDEX) : 0) | ((grant & NETGRANT_OMEGA) ? HAS_OMEGA_FLAG : 0)
#endif #endif
; ;
} }