From e09f61dbc84f7ca4e3d3ccf1bc8f399f47460d64 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sun, 18 Mar 2012 20:59:42 +0200 Subject: [PATCH] Vore flash: Don't flash when team healing, and use another method to determine prey count --- data/qcsrc/client/Defs.qc | 2 ++ data/qcsrc/client/View.qc | 2 +- data/qcsrc/client/hud.qc | 13 +++++++++---- docs/TODO.txt | 2 -- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/data/qcsrc/client/Defs.qc b/data/qcsrc/client/Defs.qc index 5c8a5f5f..e9ba774f 100644 --- a/data/qcsrc/client/Defs.qc +++ b/data/qcsrc/client/Defs.qc @@ -247,3 +247,5 @@ float angles_held_status; vector angles_held; float power_boot; + +float hud_total_prey; diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 68d0bc27..c8aa6194 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -1165,7 +1165,7 @@ void CSQC_UpdateView(float w, float h) if(getstati(STAT_VORE_EATEN)) vore_flash_state = -1; else - vore_flash_state = getstati(STAT_VORE_LOAD); + vore_flash_state = hud_total_prey; if not(spectatee_status && last_spectatee != spectatee_status) // not if we switched players and that detects a different stomach load { diff --git a/data/qcsrc/client/hud.qc b/data/qcsrc/client/hud.qc index 2bf72e48..64f428c4 100644 --- a/data/qcsrc/client/hud.qc +++ b/data/qcsrc/client/hud.qc @@ -3232,6 +3232,7 @@ void Sbar_Draw (void) float f, l; pos = bottomleft; + hud_total_prey = 0; for(pl = players.sort_next; pl; pl = pl.sort_next) { if(pl.team == COLOR_SPECTATOR) @@ -3247,11 +3248,15 @@ void Sbar_Draw (void) f = pl.plpredator == player_localentnum; } - if(f && l <= 8) // limit the stomach board to 9 entries due to the HUD design + if(f) { - Sbar_PrintStomachboardItem(pos - '-16 124 0', pl); - pos_y += 1.1 * sbar_fontsize_y; - l += 1; + if(l <= 8) // limit the stomach board to 9 entries due to the HUD design + { + Sbar_PrintStomachboardItem(pos - '-16 124 0', pl); + pos_y += 1.1 * sbar_fontsize_y; + l += 1; + } + ++hud_total_prey; } // set the predator's name diff --git a/docs/TODO.txt b/docs/TODO.txt index bfe98ac6..d46b41ee 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -166,8 +166,6 @@ - +0.8: In Race and RaceCTS, having a big belly should give you some boost or bonus -- 0.7 | 0.8: Is it right to get screen flashes when team healing? - - 0.8: Why am I not seeing frags and death in the scoreboard in Team Deathmatch? - 0.8: If we eat a team mate, then a consumable item, then the tea mate gets out, autodigest won't start digesting the consumable item -- 2.39.2