Many cosmetic changes and rearrangements in the vore code

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

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 352162d9ff9458991340b209502acd818f6bbd38..6d316524576a53b26efb63a604ee59e8539f0e68 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
@@ -19,7 +19,7 @@ float require_spawnfunc_prefix; // if this float exists, only functions with spa
 \r
 float ctf_score_value(string parameter);\r
 \r
-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;\r
+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;\r
 float g_cloaked, g_footsteps, g_jump_grunt, g_midair, g_norecoil, g_vampire, g_bloodloss;\r
 float g_warmup_limit;\r
 float g_warmup_allguns;\r
@@ -65,11 +65,11 @@ float maxclients;
 \r
 // Vore functions\r
 \r
-.entity eater;\r
+.entity predator;\r
 .float digesting;\r
 .float stomach_load;\r
 .float weapon_delay;\r
-.float stat_eaten;\r
+.float stat_eaten, stat_stomachload, stat_digesting, stat_canleave;\r
 \r
 // Fields\r
 \r
@@ -196,8 +196,7 @@ 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
@@ -259,9 +258,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 +331,8 @@ 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_chase_active;\r
 \r
 void Announce(string snd);\r
@@ -540,10 +538,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
@@ -610,8 +604,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