Properly calculate falling damage based on player scale. Don't just offset the damage...

[voretournament/voretournament.git] / data / qcsrc / server / defs.qh

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 7bba8ff338b9c8314730713de662f47658605430..6871a58495c6b48a7716b90617d382ae61b4139b 100644 (file)
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -67,11 +67,13 @@ float maxclients;
 \r
 .entity predator;\r
 .entity fakepredator;\r
+.float swallow_progress_prey, swallow_progress_pred;\r
 .float digesting;\r
-.float stomach_load;\r
+.float stomach_load, stomach_maxload;\r
 .float weapon_delay;\r
 .float fakeprey;\r
-.float stat_eaten, stat_stomachload, stat_digesting, stat_canleave, stat_canswallow;\r
+.float stat_eaten, stat_stomachload, stat_stomachmaxload, stat_digesting, stat_canleave, stat_canswallow;\r
+.float dropweapon_check;\r
 \r
 // Fields\r
 \r
@@ -213,6 +215,7 @@ void setanim(entity e, vector anim, float looping, float override, float restart
 \r
 .entity weaponentity;\r
 .entity exteriorweaponentity;\r
+.vector weaponentity_glowmod;\r
 .float switchweapon;\r
 .float autoswitch;\r
 float weapon_action(float wpn, float wrequest);\r
@@ -294,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\r
 float orig_slowmo; // contains the value of cvar("slowmo") so that, after timeout finished, it isn't set to slowmo 1 necessarily\r
 .vector lastV_angle; //used when pausing the game in order to force the player to keep his old view angle fixed\r
+.vector leanangle_damage_loc, leanangle_damage_force; // used for leaning the player model\r
 entity timeoutHandler; //responsible for centerprinting the timeout countdowns and playing sounds\r
 void timeoutHandler_Think();\r
 void evaluateTimeout();\r
@@ -307,8 +311,6 @@ string getTimeoutText(float addOneSecond);
 \r
 .entity flagcarried;\r
 \r
-.entity lastrocket;\r
-\r
 .float playerid;\r
 float playerid_last;\r
 .float noalign;                // if set to 1, the item or spawnpoint won't be dropped to the floor\r
@@ -323,6 +325,7 @@ float default_weapon_alpha;
 \r
 .float() customizeentityforclient;\r
 .float cvar_cl_handicap;\r
+.float cvar_cl_clippedspectating;\r
 .float cvar_scr_centertime;\r
 .float cvar_cl_shownames;\r
 .string cvar_g_voretournamentversion;\r
@@ -336,8 +339,7 @@ float sv_clforceplayermodels;
 .float cvar_cl_gunalign;\r
 .float cvar_cl_noantilag;\r
 .float cvar_cl_vore_stomachmodel;\r
-.float cvar_cl_vore_cameraspeed;\r
-.float cvar_cl_vore_punchangle;\r
+.float cvar_cl_vore_swallowmodel;\r
 .float cvar_cl_vore_autodigest;\r
 .float cvar_chase_active;\r
 \r
@@ -449,6 +451,7 @@ float next_pingtime;
                _VOICEMSG(fall) \\r
                _VOICEMSG(drown) \\r
                _VOICEMSG(gasp) \\r
+               _VOICEMSG(grab) \\r
                _VOICEMSG(swallow) \\r
                _VOICEMSG(digest) \\r
                _VOICEMSG(regurgitate) \\r
@@ -515,7 +518,7 @@ void PrecacheGlobalSound(string samplestring);
 void UpdatePlayerSounds();\r
 void ClearPlayerSounds();\r
 void PlayerSound(entity player, .string samplefield, float channel, float voicetype);\r
-void GlobalSound(string samplestring, float channel, float voicetype);\r
+void GlobalSound(string samplestring, float channel, float voicetype, float vol);\r
 void VoiceMessage(string type, string message);\r
 \r
 // autotaunt system\r
@@ -607,13 +610,11 @@ string matchid;
 .float stats_hit[WEP_MAXCOUNT];  // for hitscan bullets hit\r
 .float stats_fired[WEP_MAXCOUNT];  // for hitscan bullets fired\r
 \r
-FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_hit);\r
-FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_fired);\r
+.float stat_sbring1_type, stat_sbring1_clip, stat_sbring2_type, stat_sbring2_clip;\r
+.float stat_crosshair_style;\r
 \r
 .float stat_leadlimit;\r
 \r
-float radar_showennemies;\r
-\r
 #ifdef PROFILING\r
 float client_cefc_accumulator;\r
 float client_cefc_accumulatortime;\r
@@ -621,11 +622,13 @@ float client_cefc_accumulatortime;
 \r
 ..float current_ammo;\r
 \r
-.float weapon_load[WEP_MAXCOUNT]; FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(weapon_load);\r
+.float weapon_load[WEP_MAXCOUNT];\r
 .float clip_load;\r
 .float old_clip_load;\r
 .float clip_size;\r
 \r
+.float grabber_stunned;\r
+\r
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE\r
 // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX\r
 \r