X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fdefs.qh;h=cbf049f3474f75317f32580fe467da3433f17169;hb=b7712e8491994a0663833345fa4a5c46ef6a0ecc;hp=91fc21e270ec636f6d98d5082cfb315a59b8890f;hpb=cc148bf19700d380a18d7f51a706f9bbe959811b;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 91fc21e2..cbf049f3 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,14 @@ 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, 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,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_autodigest;
 .float cvar_chase_active;
 
 void Announce(string snd);
@@ -442,11 +444,14 @@ 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) \
 		_VOICEMSG(jump) \
 		_VOICEMSG(pain25) \
 		_VOICEMSG(pain50) \
@@ -458,6 +463,8 @@ float next_pingtime;
 		_VOICEMSG(meet) \
 		_VOICEMSG(seenflag) \
 		_VOICEMSG(taunt) \
+		_VOICEMSG(pred) \
+		_VOICEMSG(prey) \
 		_VOICEMSG(teamshoot)
 
 #define _VOICEMSG(m) .string playersound_##m;
@@ -495,6 +502,11 @@ string globalsound_metalstep;
 #define VOICETYPE_LASTATTACKER_ONLY 13
 #define VOICETYPE_AUTOTAUNT 14
 #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);
@@ -537,10 +549,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);
 
@@ -588,6 +596,8 @@ string matchid;
 .float hitplotfh;
 .string noise4;
 
+.float last_pickup;
+
 .float stat_hit;
 .float stat_fired;
 .float stat_count;
@@ -607,7 +617,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