Scoreboard respawn info from my code in Xonotic

[voretournament/voretournament.git] / data / qcsrc / server / g_world.qc

diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index 7a065d43dc6c056c5e2b1d96d9c1ceb5e9d0f83c..93a16bdd98c9b75bc714caacb553087c850c872f 100644 (file)
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -49,17 +49,17 @@ void OtherPLReport_Think()
        WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);\r
        WriteByte(MSG_BROADCAST, TE_CSQC_OTHERPLREPORT);\r
        WriteByte(MSG_BROADCAST, self.cnt);\r
-       if(e.predator.classname == "player") // tempt hackers less by only sending the info of eaten players\r
+       if(e.stat_eaten) // tempt hackers less by only sending the info of eaten players\r
        {\r
                if(cvar("g_vore_showhealth"))\r
-                       WriteByte(MSG_BROADCAST, e.health);\r
+                       WriteShort(MSG_BROADCAST, e.health); // not WriteByte because we show minus health too\r
                else\r
-                       WriteByte(MSG_BROADCAST, 0);\r
+                       WriteShort(MSG_BROADCAST, 0);\r
                WriteByte(MSG_BROADCAST, num_for_edict(e.predator));\r
        }\r
        else\r
        {\r
-               WriteByte(MSG_BROADCAST, 0);\r
+               WriteShort(MSG_BROADCAST, 0);\r
                WriteByte(MSG_BROADCAST, 0);\r
        }\r
        self.cnt = mod(self.cnt + 1, maxclients);\r
@@ -659,11 +659,19 @@ void spawnfunc_worldspawn (void)
        addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);\r
        addstat(STAT_WINNING, AS_FLOAT, winning);\r
        addstat(STAT_VORE_LOAD, AS_INT, stat_stomachload);\r
+       addstat(STAT_VORE_MAXLOAD, AS_INT, stat_stomachmaxload);\r
        addstat(STAT_VORE_CANSWALLOW, AS_INT, stat_canswallow);\r
        addstat(STAT_VORE_DIGESTING, AS_INT, stat_digesting);\r
        addstat(STAT_VORE_EATEN, AS_INT, stat_eaten);\r
        addstat(STAT_VORE_CANLEAVE, AS_INT, stat_canleave);\r
-\r
+       addstat(STAT_VORE_PROGRESS_PREY, AS_FLOAT, swallow_progress_prey);\r
+       addstat(STAT_VORE_PROGRESS_PRED, AS_FLOAT, swallow_progress_pred);\r
+       addstat(STAT_CROSSHAIR_STYLE, AS_INT, stat_crosshair_style);\r
+       addstat(STAT_SBRING1_TYPE, AS_INT, stat_sbring1_type);\r
+       addstat(STAT_SBRING1_CLIP, AS_FLOAT, stat_sbring1_clip);\r
+       addstat(STAT_SBRING2_TYPE, AS_INT, stat_sbring2_type);\r
+       addstat(STAT_SBRING2_CLIP, AS_FLOAT, stat_sbring2_clip);\r
+       addstat(STAT_RESPAWN_TIME, AS_FLOAT, stat_respawn_time);\r
        next_pingtime = time + 5;\r
        InitializeEntity(self, cvar_changes_init, INITPRIO_CVARS);\r
 \r