Set the proper voice types in code

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

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 91fc21e270ec636f6d98d5082cfb315a59b8890f..a2636062f4c1f1cacbbafe0e8455d08470780758 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,13 @@ 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;\r
+.float fakeprey;\r
+.float stat_eaten, stat_stomachload, stat_digesting, stat_canleave;\r
 \r
 // Fields\r
 \r
@@ -196,13 +198,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 +261,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 +334,10 @@ 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_cl_vore_autodigest;\r
 .float cvar_chase_active;\r
 \r
 void Announce(string snd);\r
@@ -442,11 +445,14 @@ 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
+               _VOICEMSG(digest) \\r
                _VOICEMSG(regurgitate) \\r
                _VOICEMSG(regurgitate_prepare) \\r
+               _VOICEMSG(gurgle) \\r
                _VOICEMSG(jump) \\r
                _VOICEMSG(pain25) \\r
                _VOICEMSG(pain50) \\r
@@ -458,6 +464,8 @@ float next_pingtime;
                _VOICEMSG(meet) \\r
                _VOICEMSG(seenflag) \\r
                _VOICEMSG(taunt) \\r
+               _VOICEMSG(pred) \\r
+               _VOICEMSG(prey) \\r
                _VOICEMSG(teamshoot)\r
 \r
 #define _VOICEMSG(m) .string playersound_##m;\r
@@ -495,6 +503,11 @@ string globalsound_metalstep;
 #define VOICETYPE_LASTATTACKER_ONLY 13\r
 #define VOICETYPE_AUTOTAUNT 14\r
 #define VOICETYPE_TAUNT 15\r
+#define VOICETYPE_GURGLE 16\r
+\r
+#define TAUNTTYPE_DEATH 1\r
+#define TAUNTTYPE_VOREPRED 2\r
+#define TAUNTTYPE_VOREPREY 3\r
 \r
 void PrecachePlayerSounds(string f);\r
 void PrecacheGlobalSound(string samplestring);\r
@@ -506,6 +519,7 @@ void VoiceMessage(string type, string message);
 \r
 // autotaunt system\r
 .float cvar_cl_autotaunt;\r
+.float cvar_cl_autotaunt_repeat;\r
 .float cvar_cl_voice_directional;\r
 .float cvar_cl_voice_directional_taunt_attenuation;\r
 \r
@@ -537,10 +551,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
@@ -588,6 +598,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
@@ -607,8 +619,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