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

[nq] Get face animations working again

Browse source
This commit is contained in:
Bill Currie 2022-11-04 09:41:23 +09:00
parent 6b99697e82
commit 70dae21ea6
1 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
nq/source/sbar.c
View file

@ -660,39 +660,38 @@ draw_frags (view_t view)
static void
draw_face (view_t view)
{
#if 0
int f, anim;
qpic_t *face;
if (cl.stats[STAT_HEALTH] <= 0) {//FIXME hide_Face or hide_sbar
sbar_remcomponent (sbar_face, hud_pic);
return;
}
if ((cl.stats[STAT_ITEMS] & (IT_INVISIBILITY | IT_INVULNERABILITY))
== (IT_INVISIBILITY | IT_INVULNERABILITY)) {
draw_pic (view, 112, 0, sb_face_invis_invuln);
return;
}
if (cl.stats[STAT_ITEMS] & IT_QUAD) {
draw_pic (view, 112, 0, sb_face_quad);
return;
}
if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) {
draw_pic (view, 112, 0, sb_face_invis);
return;
}
if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) {
draw_pic (view, 112, 0, sb_face_invuln);
return;
}
face = sb_face_invis_invuln;
} else if (cl.stats[STAT_ITEMS] & IT_QUAD) {
face = sb_face_quad;
} else if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) {
face = sb_face_invis;
} else if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) {
face = sb_face_invuln;
} else {
int f, anim;
if (cl.stats[STAT_HEALTH] >= 100) {
f = 4;
} else {
f = cl.stats[STAT_HEALTH] / 20;
}
if (cl.stats[STAT_HEALTH] >= 100)
f = 4;
else
f = cl.stats[STAT_HEALTH] / 20;
if (cl.time <= cl.faceanimtime) {
anim = 1;
sb_updates = 0; // make sure the anim gets drawn over
} else
anim = 0;
draw_pic (view, 112, 0, sb_faces[f][anim]);
#endif
if (cl.time <= cl.faceanimtime) {
anim = 1;
sb_updates = 0; // make sure the anim gets drawn over
} else {
anim = 0;
}
face = sb_faces[f][anim];
}
sbar_setcomponent (view, hud_pic, &face);
}
static inline void