X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fdefs.qh;h=0109de5eb9dc8d6b05de27a7534385311416fcb7;hb=cc045f9d09b57e3ce32ee45f807b18438e410380;hp=5bc4e17e98e5c2a695318a087508740b4957c984;hpb=ade121cafbc3bc108bb983fecaeca4bc540ff273;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 5bc4e17e..0109de5e 100644
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -21,7 +21,6 @@ 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, g_rpg;
 float g_cloaked, g_footsteps, g_jump_grunt, g_midair, g_norecoil, g_vampire, g_bloodloss;
-float g_balance_vore_swallow_limit;
 float g_warmup_limit;
 float g_warmup_allguns;
 float g_warmup_allow_timeout;
@@ -68,11 +67,12 @@ float maxclients;
 
 .entity predator;
 .entity fakepredator;
+.float swallow_progress_prey, swallow_progress_pred;
 .float digesting;
-.float stomach_load;
+.float stomach_load, stomach_maxload;
 .float weapon_delay;
 .float fakeprey;
-.float stat_eaten, stat_stomachload, stat_digesting, stat_canleave, stat_canswallow;
+.float stat_eaten, stat_stomachload, stat_stomachmaxload, stat_digesting, stat_canleave, stat_canswallow;
 .float dropweapon_check;
 
 // Fields
@@ -297,6 +297,7 @@ float timeoutStatus; // (values: 0, 1, 2) contains whether a timeout is not acti
 entity timeoutInitiator; // contains the entity of the player who started the last timeout
 float orig_slowmo; // contains the value of cvar("slowmo") so that, after timeout finished, it isn't set to slowmo 1 necessarily
 .vector lastV_angle; //used when pausing the game in order to force the player to keep his old view angle fixed
+.vector leanangle_damage_loc, leanangle_damage_force; // used for leaning the player model
 entity timeoutHandler; //responsible for centerprinting the timeout countdowns and playing sounds
 void timeoutHandler_Think();
 void evaluateTimeout();
@@ -324,6 +325,7 @@ float default_weapon_alpha;
 
 .float() customizeentityforclient;
 .float cvar_cl_handicap;
+.float cvar_cl_clippedspectating;
 .float cvar_scr_centertime;
 .float cvar_cl_shownames;
 .string cvar_g_voretournamentversion;
@@ -337,6 +339,7 @@ float sv_clforceplayermodels;
 .float cvar_cl_gunalign;
 .float cvar_cl_noantilag;
 .float cvar_cl_vore_stomachmodel;
+.float cvar_cl_vore_swallowmodel;
 .float cvar_cl_vore_autodigest;
 .float cvar_chase_active;
 
@@ -448,6 +451,7 @@ float next_pingtime;
 		_VOICEMSG(fall) \
 		_VOICEMSG(drown) \
 		_VOICEMSG(gasp) \
+		_VOICEMSG(grab) \
 		_VOICEMSG(swallow) \
 		_VOICEMSG(digest) \
 		_VOICEMSG(regurgitate) \
@@ -514,7 +518,7 @@ void PrecacheGlobalSound(string samplestring);
 void UpdatePlayerSounds();
 void ClearPlayerSounds();
 void PlayerSound(entity player, .string samplefield, float channel, float voicetype);
-void GlobalSound(string samplestring, float channel, float voicetype);
+void GlobalSound(string samplestring, float channel, float voicetype, float vol);
 void VoiceMessage(string type, string message);
 
 // autotaunt system
@@ -606,13 +610,13 @@ string matchid;
 .float stats_hit[WEP_MAXCOUNT];  // for hitscan bullets hit
 .float stats_fired[WEP_MAXCOUNT];  // for hitscan bullets fired
 
-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_crosshair_style;
 
 .float stat_leadlimit;
 
+.float stat_respawn_time; // shows respawn time, and is negative when awaiting respawn
+
 #ifdef PROFILING
 float client_cefc_accumulator;
 float client_cefc_accumulatortime;
@@ -620,11 +624,13 @@ float client_cefc_accumulatortime;
 
 ..float current_ammo;
 
-.float weapon_load[WEP_MAXCOUNT]; FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(weapon_load);
+.float weapon_load[WEP_MAXCOUNT];
 .float clip_load;
 .float old_clip_load;
 .float clip_size;
 
+.float grabber_stunned;
+
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE
 // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX
 
@@ -642,3 +648,31 @@ string deathmessage;
 
 .float cvar_cl_accuracy_data_share;
 .float cvar_cl_accuracy_data_receive;
+
+// dodging
+.float cvar_cl_dodging_timeout;
+
+// these are used to store the last key press time for each of the keys..
+.float last_FORWARD_KEY_time;
+.float last_BACKWARD_KEY_time;
+.float last_LEFT_KEY_time;
+.float last_RIGHT_KEY_time;
+
+// these store the movement direction at the time of the dodge action happening.
+.float dodging_direction_x;
+.float dodging_direction_y;
+
+// this indicates the last time a dodge was executed. used to check if another one is allowed
+// and to ramp up the dodge acceleration in the physics hook.
+.float last_dodging_time;
+
+// set to 1 to indicate dodging has started.. reset by physics hook after dodge has been done..
+.float dodging_action;
+
+// This is the velocity gain to be added over the ramp time.
+// It will decrease from frame to frame during dodging_action = 1
+// until it's 0.
+.float dodging_velocity_gain;
+
+// the jump part of the dodge cannot be ramped
+.float dodging_single_action;