X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fdefs.qh;h=9c80b05264e162994a21eafe1692db5974df7e66;hb=3b891be3ed44a7cee7f2fdeb49dca83a13dad5be;hp=8af7677cf2d0cf6b4c891bf07aab0448a4f5ad80;hpb=9b6ce936009f5a171e1d8ff2227e1db54a1670d2;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 8af7677c..9c80b052 100644
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -7,7 +7,7 @@ float require_spawnfunc_prefix; // if this float exists, only functions with spa
 #define BUTTON_ATCK2       button3
 #define BUTTON_ZOOM        button4
 #define BUTTON_CROUCH      button5
-#define BUTTON_GRABBER        button6
+#define BUTTON_JETPACK     button6
 #define BUTTON_INFO        button7
 #define BUTTON_CHAT        buttonchat
 #define BUTTON_USE         buttonuse
@@ -19,7 +19,7 @@ float require_spawnfunc_prefix; // if this float exists, only functions with spa
 
 float ctf_score_value(string parameter);
 
-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;
+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;
 float g_cloaked, g_footsteps, g_jump_grunt, g_midair, g_norecoil, g_vampire, g_bloodloss;
 float g_warmup_limit;
 float g_warmup_allguns;
@@ -65,11 +65,13 @@ float maxclients;
 
 // Vore functions
 
-.entity eater;
+.entity predator;
+.entity fakepredator;
 .float digesting;
 .float stomach_load;
 .float weapon_delay;
-.float stat_eaten;
+.float fakeprey;
+.float stat_eaten, stat_stomachload, stat_digesting, stat_canleave;
 
 // Fields
 
@@ -196,13 +198,13 @@ void setanim(entity e, vector anim, float looping, float override, float restart
 .float		killcount;
 .float hitsound, typehitsound;
 
-.float watersound_finished;
-.float digestsound_finished;
+.float watersound_finished, digestsound_finished, gurglesound_finished;
 .float iscreature;
 .vector oldvelocity;
 
-.float pauseregen_finished;
+.float pauseregenhealth_finished;
 .float pauserothealth_finished;
+.float pauseregenarmor_finished;
 .float pauserotarmor_finished;
 .float pauserotfuel_finished;
 .string item_pickupsound;
@@ -259,9 +261,6 @@ float alreadychangedlevel;
 .float welcomemessage_time;
 .float version;
 
-// minstagib vars
-.float jump_interval;    // laser refire
-
 //swamp
 .float in_swamp;              // bool
 .entity swampslug;            // Uses this to release from swamp ("untouch" fix)
@@ -335,6 +334,10 @@ float sv_clforceplayermodels;
 #endif
 .float cvar_cl_gunalign;
 .float cvar_cl_noantilag;
+.float cvar_cl_vore_stomachmodel;
+.float cvar_cl_vore_cameraspeed;
+.float cvar_cl_vore_punchangle;
+.float cvar_cl_vore_autodigest;
 .float cvar_chase_active;
 
 void Announce(string snd);
@@ -442,9 +445,11 @@ float next_pingtime;
 // TODO implemented fall and falling
 #define ALLPLAYERSOUNDS \
 		_VOICEMSG(death) \
+		_VOICEMSG(fall) \
 		_VOICEMSG(drown) \
 		_VOICEMSG(gasp) \
 		_VOICEMSG(swallow) \
+		_VOICEMSG(digest) \
 		_VOICEMSG(regurgitate) \
 		_VOICEMSG(regurgitate_prepare) \
 		_VOICEMSG(gurgle) \
@@ -498,6 +503,9 @@ string globalsound_metalstep;
 #define VOICETYPE_TAUNT 15
 #define VOICETYPE_GURGLE 16
 
+#define TAUNTTYPE_DEATH 1
+#define TAUNTTYPE_VORE 2
+
 void PrecachePlayerSounds(string f);
 void PrecacheGlobalSound(string samplestring);
 void UpdatePlayerSounds();
@@ -508,6 +516,7 @@ void VoiceMessage(string type, string message);
 
 // autotaunt system
 .float cvar_cl_autotaunt;
+.float cvar_cl_autotaunt_repeat;
 .float cvar_cl_voice_directional;
 .float cvar_cl_voice_directional_taunt_attenuation;
 
@@ -539,10 +548,6 @@ float game_starttime; //point in time when the countdown is over
 vector railgun_start, railgun_end; // filled by FireRailgunBullet, used by damage code for head shot
 .float stat_allow_oldnexbeam;
 
-// reset to 0 on weapon switch
-// may be useful to all weapons
-.float bulletcounter;
-
 void target_voicescript_next(entity pl);
 void target_voicescript_clear(entity pl);
 
@@ -590,6 +595,8 @@ string matchid;
 .float hitplotfh;
 .string noise4;
 
+.float last_pickup;
+
 .float stat_hit;
 .float stat_fired;
 .float stat_count;
@@ -609,8 +616,6 @@ float client_cefc_accumulator;
 float client_cefc_accumulatortime;
 #endif
 
-.float campingrifle_bulletcounter;
-
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE
 // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX