Vore flash: Don't flash when team healing, and use another method to determine prey...

diff --git a/data/qcsrc/client/Defs.qc b/data/qcsrc/client/Defs.qc
index 5c8a5f5f071b8102d6106a6f0f3278963c94b68c..e9ba774fcb08300ecd8431554628b806035f44cd 100644 (file)
--- a/data/qcsrc/client/Defs.qc
+++ b/data/qcsrc/client/Defs.qc
@@ -247,3 +247,5 @@ float angles_held_status;
 vector angles_held;\r
 \r
 float power_boot;\r
+\r
+float hud_total_prey;\r

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 68d0bc27cb4d37dbef5e8aee1982304dadeb709d..c8aa619496b376537c03670ae89ac04d958bb78b 100644 (file)
--- 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))\r
                        vore_flash_state = -1;\r
                else\r
-                       vore_flash_state = getstati(STAT_VORE_LOAD);\r
+                       vore_flash_state = hud_total_prey;\r
 \r
                if not(spectatee_status && last_spectatee != spectatee_status) // not if we switched players and that detects a different stomach load\r
                {\r

diff --git a/data/qcsrc/client/hud.qc b/data/qcsrc/client/hud.qc
index 2bf72e48b1c4958f2e5283487216dfc2087c5ee6..64f428c4e603a02611a081013fc4d67e39ac252f 100644 (file)
--- a/data/qcsrc/client/hud.qc
+++ b/data/qcsrc/client/hud.qc
@@ -3232,6 +3232,7 @@ void Sbar_Draw (void)
                        float f, l;\r
 \r
                        pos = bottomleft;\r
+                       hud_total_prey = 0;\r
                        for(pl = players.sort_next; pl; pl = pl.sort_next)\r
                        {\r
                                if(pl.team == COLOR_SPECTATOR)\r
@@ -3247,11 +3248,15 @@ void Sbar_Draw (void)
                                                f = pl.plpredator == player_localentnum;\r
                                }\r
 \r
-                               if(f && l <= 8) // limit the stomach board to 9 entries due to the HUD design\r
+                               if(f)\r
                                {\r
-                                       Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);\r
-                                       pos_y += 1.1 * sbar_fontsize_y;\r
-                                       l += 1;\r
+                                       if(l <= 8) // limit the stomach board to 9 entries due to the HUD design\r
+                                       {\r
+                                               Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);\r
+                                               pos_y += 1.1 * sbar_fontsize_y;\r
+                                               l += 1;\r
+                                       }\r
+                                       ++hud_total_prey;\r
                                }\r
 \r
                                // set the predator's name\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index bfe98ac6d05e13a823e610b72ff30aa257e09246..d46b41ee377e96a0485db3131364d89ca55252f0 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -166,8 +166,6 @@
 \r
 - +0.8: In Race and RaceCTS, having a big belly should give you some boost or bonus\r
 \r
-- 0.7 | 0.8: Is it right to get screen flashes when team healing?\r
-\r
 - 0.8: Why am I not seeing frags and death in the scoreboard in Team Deathmatch?\r
 \r
 - 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\r