X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fdefs.qh;h=b54fcc7a2476b40c044bad79d1561e639e4ed004;hp=7953f82281dc82f6e993e6082b2dc21c0980e167;hb=410a8dd0cf7bf2149e16d52103045ddf0be303e4;hpb=929ad35e68958e61d3ff3a21d523ea2086aa32db

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 7953f822..b54fcc7a 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
@@ -65,11 +65,11 @@ float maxclients;
 
 // Vore functions
 
-.entity eater;
+.entity predator;
 .float digesting;
 .float stomach_load;
 .float weapon_delay;
-.float stat_eaten;
+.float stat_eaten, stat_stomachload, stat_digesting, stat_canleave;
 
 // Fields
 
@@ -196,8 +196,7 @@ 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;
 
@@ -259,9 +258,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 +331,9 @@ 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_chase_active;
 
 void Announce(string snd);
@@ -443,6 +442,7 @@ float next_pingtime;
 #define ALLPLAYERSOUNDS \
 		_VOICEMSG(death) \
 		_VOICEMSG(drown) \
+		_VOICEMSG(fall) \
 		_VOICEMSG(gasp) \
 		_VOICEMSG(swallow) \
 		_VOICEMSG(digest) \
@@ -540,10 +540,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);
 
@@ -610,8 +606,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