Implement full digest feature. When enabled, the pred doesn't spit the prey's dead...

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

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 440c0a2d4e1ce270be4706345797dc7017494d19..f175727db163ccb53e90637a6198543f7086ec16 100644 (file)
--- 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\r
 #define BUTTON_ZOOM        button4\r
 #define BUTTON_CROUCH      button5\r
-#define BUTTON_GRABBER        button6\r
+#define BUTTON_JETPACK     button6\r
 #define BUTTON_INFO        button7\r
 #define BUTTON_CHAT        buttonchat\r
 #define BUTTON_USE         buttonuse\r
@@ -65,11 +65,12 @@ float maxclients;
 \r
 // Vore functions\r
 \r
-.entity eater;\r
+.entity predator;\r
+.entity fakepredator;\r
 .float digesting;\r
 .float stomach_load;\r
 .float weapon_delay;\r
-.float stat_eaten, stat_stomachload, stat_digesting;\r
+.float stat_eaten, stat_stomachload, stat_digesting, stat_canleave;\r
 \r
 // Fields\r
 \r
@@ -196,13 +197,13 @@ void setanim(entity e, vector anim, float looping, float override, float restart
 .float         killcount;\r
 .float hitsound, typehitsound;\r
 \r
-.float watersound_finished;\r
-.float digestsound_finished;\r
+.float watersound_finished, digestsound_finished, gurglesound_finished;\r
 .float iscreature;\r
 .vector oldvelocity;\r
 \r
-.float pauseregen_finished;\r
+.float pauseregenhealth_finished;\r
 .float pauserothealth_finished;\r
+.float pauseregenarmor_finished;\r
 .float pauserotarmor_finished;\r
 .float pauserotfuel_finished;\r
 .string item_pickupsound;\r
@@ -259,9 +260,6 @@ float alreadychangedlevel;
 .float welcomemessage_time;\r
 .float version;\r
 \r
-// minstagib vars\r
-.float jump_interval;    // laser refire\r
-\r
 //swamp\r
 .float in_swamp;              // bool\r
 .entity swampslug;            // Uses this to release from swamp ("untouch" fix)\r
@@ -335,6 +333,9 @@ float sv_clforceplayermodels;
 #endif\r
 .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_chase_active;\r
 \r
 void Announce(string snd);\r
@@ -442,6 +443,7 @@ float next_pingtime;
 // TODO implemented fall and falling\r
 #define ALLPLAYERSOUNDS \\r
                _VOICEMSG(death) \\r
+               _VOICEMSG(fall) \\r
                _VOICEMSG(drown) \\r
                _VOICEMSG(gasp) \\r
                _VOICEMSG(swallow) \\r
@@ -540,10 +542,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\r
 .float stat_allow_oldnexbeam;\r
 \r
-// reset to 0 on weapon switch\r
-// may be useful to all weapons\r
-.float bulletcounter;\r
-\r
 void target_voicescript_next(entity pl);\r
 void target_voicescript_clear(entity pl);\r
 \r
@@ -591,6 +589,8 @@ string matchid;
 .float hitplotfh;\r
 .string noise4;\r
 \r
+.float last_pickup;\r
+\r
 .float stat_hit;\r
 .float stat_fired;\r
 .float stat_count;\r
@@ -610,8 +610,6 @@ float client_cefc_accumulator;
 float client_cefc_accumulatortime;\r
 #endif\r
 \r
-.float campingrifle_bulletcounter;\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