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

Use inline function to compute extra-short secondary names

Browse source
This commit is contained in:
Kp 2012-07-01 01:03:14 +00:00
parent 8148ddd416
commit ace282222f
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
main/gauges.c
View file

@ -1064,12 +1064,23 @@ void hud_show_afterburner(void)
newdemo_record_player_afterburner(Afterburner_charge);
}
char *d2_very_short_secondary_weapon_names[] =
{"Flash","Guided","SmrtMine","Mercury","Shaker"};
#define SECONDARY_WEAPON_NAMES_VERY_SHORT(weapon_num) \
((weapon_num <= MEGA_INDEX)?(*(&TXT_CONCUSSION + (weapon_num))): \
d2_very_short_secondary_weapon_names[weapon_num-SMISSILE1_INDEX])
static inline const char *SECONDARY_WEAPON_NAMES_VERY_SHORT(const unsigned u)
{
switch(u)
{
default:
case 0: return TXT_CONCUSSION;
case 1: return TXT_HOMING;
case 2: return TXT_PROXBOMB;
case 3: return TXT_SMART;
case 4: return TXT_MEGA;
case 5: return "Flash";
case 6: return "Guided";
case 7: return "SmrtMine";
case 8: return "Mercury";
case 9: return "Shaker";
}
}
void show_bomb_count(int x,int y,int bg_color,int always_show,int right_align)
{
@ -1254,7 +1265,7 @@ void hud_show_weapons(void)
{
int w, h, aw;
int y;
char *weapon_name;
const char *weapon_name;
char weapon_str[32];
gr_set_curfont( GAME_FONT );