Limit g_balance_vore_swallow_limit between 1 and 9. This fixes some small bugs, such...

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

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index d1834f6590549559a9a2fc98a08567733072f4e3..af3fa770879e1dd6bac5269fcf1ca88f0cfd2c08 100644 (file)
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -21,6 +21,7 @@ float ctf_score_value(string parameter);
 \r
 float g_dm, g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault, g_arena, g_ca, g_lms, g_race, g_cts, g_rpg;\r
 float g_cloaked, g_footsteps, g_jump_grunt, g_midair, g_norecoil, g_vampire, g_bloodloss;\r
+float g_balance_vore_swallow_limit;\r
 float g_warmup_limit;\r
 float g_warmup_allguns;\r
 float g_warmup_allow_timeout;\r
@@ -71,7 +72,8 @@ float maxclients;
 .float stomach_load;\r
 .float weapon_delay;\r
 .float fakeprey;\r
-.float stat_eaten, stat_stomachload, stat_digesting, stat_canleave;\r
+.float stat_eaten, stat_stomachload, stat_digesting, stat_canleave, stat_canswallow;\r
+.float dropweapon_check;\r
 \r
 // Fields\r
 \r
@@ -213,6 +215,7 @@ void setanim(entity e, vector anim, float looping, float override, float restart
 \r
 .entity weaponentity;\r
 .entity exteriorweaponentity;\r
+.vector weaponentity_glowmod;\r
 .float switchweapon;\r
 .float autoswitch;\r
 float weapon_action(float wpn, float wrequest);\r
@@ -244,6 +247,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
@@ -306,8 +310,6 @@ string getTimeoutText(float addOneSecond);
 \r
 .entity flagcarried;\r
 \r
-.entity lastrocket;\r
-\r
 .float playerid;\r
 float playerid_last;\r
 .float noalign;                // if set to 1, the item or spawnpoint won't be dropped to the floor\r
@@ -335,8 +337,7 @@ float sv_clforceplayermodels;
 .float cvar_cl_gunalign;\r
 .float cvar_cl_noantilag;\r
 .float cvar_cl_vore_stomachmodel;\r
-.float cvar_cl_vore_cameraspeed;\r
-.float cvar_cl_vore_punchangle;\r
+.float cvar_cl_vore_autodigest;\r
 .float cvar_chase_active;\r
 \r
 void Announce(string snd);\r
@@ -463,6 +464,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
@@ -502,6 +505,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
@@ -602,6 +609,8 @@ string matchid;
 FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_hit);\r
 FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_fired);\r
 \r
+.float stat_sbring1_type, stat_sbring1_clip, stat_sbring2_type, stat_sbring2_clip;\r
+\r
 .float stat_leadlimit;\r
 \r
 float radar_showennemies;\r
@@ -611,6 +620,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