Permalink
Browse files

game: uniformized health pack pickup prints

  • Loading branch information...
1 parent 0edfca4 commit 3e26c977de8791e129bbdfdc5d161bf182c1de35 @rmarquis rmarquis committed Feb 15, 2017
Showing with 4 additions and 20 deletions.
  1. +1 −17 src/cgame/cg_draw.c
  2. +3 −3 src/game/bg_misc.c
View
@@ -483,23 +483,7 @@ const char *CG_PickupItemText(int item)
{
if (bg_itemlist[item].giType == IT_HEALTH)
{
- // avoid health packs telling 0
- if (bg_itemlist[item].quantity > 0)
- {
- if (bg_itemlist[item].world_model[2]) // this is a multi-stage item
- {
- // FIXME: print the correct amount for multi-stage
- return va(CG_TranslateString("a %s"), bg_itemlist[item].pickup_name);
- }
- else
- {
- return va("%i %s", bg_itemlist[item].quantity, bg_itemlist[item].pickup_name); // FIXME: translations ?
- }
- }
- else
- {
- return va(CG_TranslateString("a %s"), bg_itemlist[item].pickup_name);
- }
+ return va(CG_TranslateString("a %s"), bg_itemlist[item].pickup_name);
}
else if (bg_itemlist[item].giType == IT_TEAM)
{
View
@@ -618,7 +618,7 @@ gitem_t bg_itemlist[] =
},
NULL,
NULL, // ammo icon
- "Small Health",
+ "Small Health Pack",
5,
IT_HEALTH,
0,
@@ -637,7 +637,7 @@ gitem_t bg_itemlist[] =
},
NULL,
NULL, // ammo icon
- "Med Health",
+ "Health Pack",
20,
IT_HEALTH,
0,
@@ -656,7 +656,7 @@ gitem_t bg_itemlist[] =
},
NULL,
NULL, // ammo icon
- "Med Health",
+ "Mega Health Pack",
50, // increased to 50 from 30 and used it for SP.
IT_HEALTH,
0,

0 comments on commit 3e26c97

Please sign in to comment.