qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 23:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

get the hipnotic hud working properly

Browse source
This commit is contained in:
Bill Currie 2003-05-11 04:51:14 +00:00
parent 9b9c435e47
commit 5c5bb914b0
1 changed files with 9 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
nq/source/sbar.c
View file

@ -925,20 +925,20 @@ draw_hipnotic_weapons_sbar (view_t *view)
static void static void
draw_hipnotic_weapons_hud (view_t *view) draw_hipnotic_weapons_hud (view_t *view)
{ {
int flashon, grenadeflashing = 0, i; int flashon, i;
static int y[] = {0, 16, 32, 48, 64, 96, 112, 128, 144, 80, 80}; static int y[] = {0, 16, 32, 48, 64, 96, 112, 128, 144, 80};
static int h[] = {0, 1, 3};
qpic_t *pic; qpic_t *pic;
int mask; int mask;
float time; float time;
// hipnotic weapons for (i = 0; i < 10; i++) {
for (i = 0; i < 11; i++) {
if (i < 7) { if (i < 7) {
mask = cl.stats[STAT_ITEMS] & (IT_SHOTGUN << i); mask = IT_SHOTGUN << i;
time = cl.item_gettime[i]; time = cl.item_gettime[i];
} else { } else {
mask = cl.stats[STAT_ITEMS] & (1 << hipweapons[i - 7]); mask = 1 << hipweapons[h[i - 7]];
time = cl.item_gettime[hipweapons[i - 7]]; time = cl.item_gettime[hipweapons[h[i - 7]]];
} }
if (cl.stats[STAT_ITEMS] & mask) { if (cl.stats[STAT_ITEMS] & mask) {
flashon = calc_flashon (time, mask); flashon = calc_flashon (time, mask);
@ -946,29 +946,11 @@ draw_hipnotic_weapons_hud (view_t *view)
pic = 0; pic = 0;
if (i < 7) { if (i < 7) {
pic = sb_weapons[flashon][i]; pic = sb_weapons[flashon][i];
} else if (i < 9) {
pic = hsb_weapons[flashon][i - 7];
} else if (i == 9) {
if (cl.stats[STAT_ITEMS] & HIT_PROXIMITY_GUN) {
if (flashon) {
grenadeflashing = 1;
pic = hsb_weapons[flashon][2];
}
}
} else { } else {
if (cl.stats[STAT_ITEMS] & (IT_SHOTGUN << 4)) { pic = hsb_weapons[flashon][h[i - 7]];
if (flashon && !grenadeflashing) {
pic = hsb_weapons[flashon][3];
} else if (!grenadeflashing) {
pic = hsb_weapons[0][3];
}
} else {
pic = hsb_weapons[flashon][4];
}
} }
if (pic) draw_subpic (view, 0, y[i], pic, 0, 0, 24, 16);
draw_subpic (view, 0, y[i], pic, 0, 0, 24, 16);
if (flashon > 1) if (flashon > 1)
sb_updates = 0; // force update to remove flash sb_updates = 0; // force update to remove flash