Fix remaining parts of server side code. Reloading will work properly now

[voretournament/voretournament.git] / data / qcsrc / server / defs.qh

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 1cb074702e9d8470da8f21bdabb110cba19e7268..64025012c2a6fcda57180edb5a08941f21ed7f44 100644 (file)
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -244,6 +244,7 @@ float WR_PRECACHE       = 6; // precaches models/sounds used by this weapon
 float WR_SUICIDEMESSAGE = 7; // sets w_deathtypestring or leaves it alone (and may inspect w_deathtype for details)\r
 float WR_KILLMESSAGE    = 8; // sets w_deathtypestring or leaves it alone\r
 float WR_RESETPLAYER    = 9; // does not need to do anything\r
+float WR_RELOAD         = 10; // used for reloading\r
 \r
 void weapon_defaultspawnfunc(float wpn);\r
 \r
@@ -464,6 +465,8 @@ float next_pingtime;
                _VOICEMSG(meet) \\r
                _VOICEMSG(seenflag) \\r
                _VOICEMSG(taunt) \\r
+               _VOICEMSG(pred) \\r
+               _VOICEMSG(prey) \\r
                _VOICEMSG(teamshoot)\r
 \r
 #define _VOICEMSG(m) .string playersound_##m;\r
@@ -503,6 +506,10 @@ string globalsound_metalstep;
 #define VOICETYPE_TAUNT 15\r
 #define VOICETYPE_GURGLE 16\r
 \r
+#define TAUNTTYPE_DEATH 1\r
+#define TAUNTTYPE_VOREPRED 2\r
+#define TAUNTTYPE_VOREPREY 3\r
+\r
 void PrecachePlayerSounds(string f);\r
 void PrecacheGlobalSound(string samplestring);\r
 void UpdatePlayerSounds();\r
@@ -612,6 +619,13 @@ float client_cefc_accumulator;
 float client_cefc_accumulatortime;\r
 #endif\r
 \r
+..float current_ammo;\r
+\r
+.float weapon_load[WEP_MAXCOUNT]; FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(weapon_load);\r
+.float clip_load;\r
+.float old_clip_load;\r
+.float clip_size;\r
+\r
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE\r
 // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX\r
 \r