X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fdefs.qh;h=14c87aed56b2ea9e2cb5d2b965d5598877b9c836;hp=440c0a2d4e1ce270be4706345797dc7017494d19;hb=1ac0f2ca0a34ee209003526d0d5e19ece5e500e1;hpb=581d320e29b70e646c11196aaeb14316ea014305

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 440c0a2d..14c87aed 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,14 @@ float maxclients;
 
 // Vore functions
 
-.entity eater;
+.entity predator;
+.entity fakepredator;
 .float digesting;
 .float stomach_load;
 .float weapon_delay;
-.float stat_eaten, stat_stomachload, stat_digesting;
+.float fakeprey;
+.float stat_eaten, stat_stomachload, stat_digesting, stat_canleave, stat_canswallow;
+.float dropweapon_check;
 
 // Fields
 
@@ -196,13 +199,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;
@@ -242,6 +245,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)
 float WR_KILLMESSAGE    = 8; // sets w_deathtypestring or leaves it alone
 float WR_RESETPLAYER    = 9; // does not need to do anything
+float WR_RELOAD         = 10; // used for reloading
 
 void weapon_defaultspawnfunc(float wpn);
 
@@ -259,9 +263,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)
@@ -307,8 +308,6 @@ string getTimeoutText(float addOneSecond);
 
 .entity flagcarried;
 
-.entity lastrocket;
-
 .float playerid;
 float playerid_last;
 .float noalign;		// if set to 1, the item or spawnpoint won't be dropped to the floor
@@ -335,6 +334,8 @@ float sv_clforceplayermodels;
 #endif
 .float cvar_cl_gunalign;
 .float cvar_cl_noantilag;
+.float cvar_cl_vore_stomachmodel;
+.float cvar_cl_vore_autodigest;
 .float cvar_chase_active;
 
 void Announce(string snd);
@@ -442,6 +443,7 @@ float next_pingtime;
 // TODO implemented fall and falling
 #define ALLPLAYERSOUNDS \
 		_VOICEMSG(death) \
+		_VOICEMSG(fall) \
 		_VOICEMSG(drown) \
 		_VOICEMSG(gasp) \
 		_VOICEMSG(swallow) \
@@ -460,6 +462,8 @@ float next_pingtime;
 		_VOICEMSG(meet) \
 		_VOICEMSG(seenflag) \
 		_VOICEMSG(taunt) \
+		_VOICEMSG(pred) \
+		_VOICEMSG(prey) \
 		_VOICEMSG(teamshoot)
 
 #define _VOICEMSG(m) .string playersound_##m;
@@ -499,6 +503,10 @@ string globalsound_metalstep;
 #define VOICETYPE_TAUNT 15
 #define VOICETYPE_GURGLE 16
 
+#define TAUNTTYPE_DEATH 1
+#define TAUNTTYPE_VOREPRED 2
+#define TAUNTTYPE_VOREPREY 3
+
 void PrecachePlayerSounds(string f);
 void PrecacheGlobalSound(string samplestring);
 void UpdatePlayerSounds();
@@ -540,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);
 
@@ -591,6 +595,8 @@ string matchid;
 .float hitplotfh;
 .string noise4;
 
+.float last_pickup;
+
 .float stat_hit;
 .float stat_fired;
 .float stat_count;
@@ -601,6 +607,8 @@ string matchid;
 FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_hit);
 FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_fired);
 
+.float stat_sbring1_type, stat_sbring1_clip, stat_sbring2_type, stat_sbring2_clip;
+
 .float stat_leadlimit;
 
 float radar_showennemies;
@@ -610,7 +618,12 @@ float client_cefc_accumulator;
 float client_cefc_accumulatortime;
 #endif
 
-.float campingrifle_bulletcounter;
+..float current_ammo;
+
+.float weapon_load[WEP_MAXCOUNT]; FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(weapon_load);
+.float clip_load;
+.float old_clip_load;
+.float clip_size;
 
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE
 // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX