]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into TimePath/csqc_sounds
authorTimePath <andrew.hardaker1995@gmail.com>
Fri, 13 Nov 2015 03:15:19 +0000 (14:15 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Fri, 13 Nov 2015 03:17:50 +0000 (14:17 +1100)
# Conflicts:
# qcsrc/server/cl_player.qh

14 files changed:
qcsrc/common/effects/qc/all.inc
qcsrc/common/effects/qc/globalsound.qc [new file with mode: 0644]
qcsrc/common/effects/qc/globalsound.qh [new file with mode: 0644]
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/physics.qc
qcsrc/common/sounds/sound.qh
qcsrc/lib/net.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_player.qh
qcsrc/server/command/cmd.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc

index cda1a638c44895ef04aea7a27bbaf34448df0815..6b5c2fffedd4b3ccb888bf411aec70f81853882e 100644 (file)
@@ -1,5 +1,6 @@
 #include "casings.qc"
 #include "damageeffects.qc"
 #include "gibs.qc"
+#include "globalsound.qc"
 #include "lightningarc.qc"
 #include "modeleffects.qc"
diff --git a/qcsrc/common/effects/qc/globalsound.qc b/qcsrc/common/effects/qc/globalsound.qc
new file mode 100644 (file)
index 0000000..301b021
--- /dev/null
@@ -0,0 +1,415 @@
+#include "globalsound.qh"
+#ifdef IMPLEMENTATION
+       #include "../../animdecide.qh"
+
+       #ifdef SVQC
+               #include "../../../server/cl_player.qh"
+       #endif
+
+       REGISTER_NET_TEMP(globalsound)
+       REGISTER_NET_TEMP(playersound)
+
+       #ifdef SVQC
+               /**
+                * @param from the source entity, its position is sent
+                * @param gs the global sound def
+                * @param r a random number in 0..1
+                */
+               void globalsound(int channel, entity from, entity gs, float r, int chan, float vol, float atten)
+               {
+                       if (channel == MSG_ONE && !IS_REAL_CLIENT(msg_entity)) return;
+                       WriteHeader(channel, globalsound);
+                       WriteByte(channel, gs.m_id);
+                       WriteByte(channel, r * 255);
+                       WriteByte(channel, etof(from));
+                       WriteByte(channel, fabs(chan));
+                       WriteByte(channel, floor(vol * 255));
+                       WriteByte(channel, floor(atten * 64));
+                       vector o = from.origin + 0.5 * (from.mins + from.maxs);
+                       WriteCoord(channel, o.x);
+                       WriteCoord(channel, o.y);
+                       WriteCoord(channel, o.z);
+               }
+
+               /**
+               * @param from the source entity, its position is sent
+               * @param ps the player sound def
+               * @param r a random number in 0..1
+               */
+               void playersound(int channel, entity from, entity ps, float r, int chan, float vol, float atten)
+               {
+                       if (channel == MSG_ONE && !IS_REAL_CLIENT(msg_entity)) return;
+                       WriteHeader(channel, playersound);
+                       WriteByte(channel, ps.m_id);
+                       WriteByte(channel, r * 255);
+                       WriteByte(channel, etof(from));
+                       WriteByte(channel, fabs(chan));
+                       WriteByte(channel, floor(vol * 255));
+                       WriteByte(channel, floor(atten * 64));
+                       vector o = from.origin + 0.5 * (from.mins + from.maxs);
+                       WriteCoord(channel, o.x);
+                       WriteCoord(channel, o.y);
+                       WriteCoord(channel, o.z);
+               }
+       #endif
+
+       string GlobalSound_sample(string pair, float r);
+
+       #ifdef CSQC
+
+               NET_HANDLE(globalsound, bool isnew)
+               {
+                       entity gs = GlobalSounds_from(ReadByte());
+                       float r = ReadByte() / 255;
+                       string sample = GlobalSound_sample(gs.m_globalsoundstr, r);
+                       int who = ReadByte();
+                       int chan = ReadByte();
+                       float vol = ReadByte() / 255;
+                       float atten = ReadByte() / 64;
+                       vector o;
+                       o.x = ReadCoord();
+                       o.y = ReadCoord();
+                       o.z = ReadCoord();
+                       if (who == player_currententnum)
+                       {
+                               // client knows better, play at current position to unlag
+                               entity e = findfloat(world, entnum, who);
+                               sound7(e, chan, sample, vol, atten, 0, 0);
+                       }
+                       else
+                       {
+                               entity e = new(globalsound);
+                               e.origin = o;
+                               sound8(e, o, chan, sample, vol, atten, 0, 0);
+                               remove(e);  // debug with: e.think = SUB_Remove; e.nextthink = time + 1;
+                       }
+                       return true;
+               }
+
+               NET_HANDLE(playersound, bool isnew)
+               {
+                       entity ps;
+                       ps = PlayerSounds_from(ReadByte());
+                       float r = ReadByte() / 255;
+                       int who = ReadByte();
+                       entity e = findfloat(world, entnum, who);
+                       if (autocvar_cl_forceplayermodels)
+                       {
+                               entity me = findfloat(world, entnum, player_currententnum);
+                               if (me.model != "null") e = me;
+                       }
+                       UpdatePlayerSounds(e);
+                       string s = e.(ps.m_playersoundfld);
+                       string sample = GlobalSound_sample(s, r);
+                       int chan = ReadByte();
+                       float vol = ReadByte() / 255;
+                       float atten = ReadByte() / 64;
+                       vector o;
+                       o.x = ReadCoord();
+                       o.y = ReadCoord();
+                       o.z = ReadCoord();
+                       if (who == player_currententnum)
+                       {
+                               // client knows better, play at current position to unlag
+                               sound7(e, chan, sample, vol, atten, 0, 0);
+                       }
+                       else
+                       {
+                               entity e = new(playersound);
+                               e.origin = o;
+                               sound8(e, o, chan, sample, vol, atten, 0, 0);
+                               remove(e);  // debug with: e.think = SUB_Remove; e.nextthink = time + 1;
+                       }
+                       return true;
+               }
+
+       #endif
+
+       string GlobalSound_sample(string pair, float r)
+       {
+               int n;
+               {
+                       string s = cdr(pair);
+                       if (s) n = stof(s);
+                       else n = 0;
+               }
+               string sample = car(pair);
+               if (n > 0) sample = sprintf("%s%d.wav", sample, floor(r * n + 1));  // randomization
+               else sample = sprintf("%s.wav", sample);
+               return sample;
+       }
+
+       void PrecacheGlobalSound(string sample)
+       {
+               int n;
+               {
+                       string s = cdr(sample);
+                       if (s) n = stof(s);
+                       else n = 0;
+               }
+               sample = car(sample);
+               if (n > 0)
+               {
+                       for (int i = 1; i <= n; ++i)
+                               precache_sound(sprintf("%s%d.wav", sample, i));
+               }
+               else
+               {
+                       precache_sound(sprintf("%s.wav", sample));
+               }
+       }
+
+       entity GetVoiceMessage(string type)
+       {
+               FOREACH(PlayerSounds, it.m_playersoundstr == type && it.instanceOfVoiceMessage == true, LAMBDA(return it));
+               return NULL;
+       }
+
+       entity GetPlayerSound(string type)
+       {
+               FOREACH(PlayerSounds, it.m_playersoundstr == type && it.instanceOfVoiceMessage == false, LAMBDA(return it));
+               return NULL;
+       }
+
+       string allvoicesamples;
+       STATIC_INIT(allvoicesamples)
+       {
+               FOREACH(PlayerSounds, it.instanceOfVoiceMessage, LAMBDA(
+                       allvoicesamples = strcat(allvoicesamples, " ", it.m_playersoundstr)
+                                                                          ));
+               allvoicesamples = strzone(substring(allvoicesamples, 1, -1));
+       }
+
+       .string _GetPlayerSoundSampleField(string type, bool voice)
+       {
+               GetPlayerSoundSampleField_notFound = false;
+               entity e = voice ? GetVoiceMessage(type) : GetPlayerSound(type);
+               if (e) return e.m_playersoundfld;
+               GetPlayerSoundSampleField_notFound = true;
+               return playersound_taunt.m_playersoundfld;
+       }
+
+       .string GetVoiceMessageSampleField(string type)
+       {
+               return _GetPlayerSoundSampleField(type, true);
+       }
+
+       void PrecachePlayerSounds(string f)
+       {
+               int fh = fopen(f, FILE_READ);
+               if (fh < 0)
+               {
+                       LOG_WARNINGF("Player sound file not found: %s\n", f);
+                       return;
+               }
+               for (string s; (s = fgets(fh)); )
+               {
+                       int n = tokenize_console(s);
+                       if (n != 3)
+                       {
+                               if (n != 0) LOG_WARNINGF("Invalid sound info line: %s\n", s);
+                               continue;
+                       }
+                       string file = argv(1);
+                       string variants = argv(2);
+                       PrecacheGlobalSound(strcat(file, " ", variants));
+               }
+               fclose(fh);
+       }
+
+       #ifdef CSQC
+
+               .string GetPlayerSoundSampleField(string type)
+               {
+                       return _GetPlayerSoundSampleField(type, false);
+               }
+
+               void ClearPlayerSounds(entity this)
+               {
+                       FOREACH(PlayerSounds, true, LAMBDA(
+                               .string fld = it.m_playersoundfld;
+                               if (this.(fld))
+       {
+               strunzone(this.(fld));
+               this.(fld) = string_null;
+       }
+                                                             ));
+               }
+
+               bool LoadPlayerSounds(entity this, string f, bool strict)
+               {
+                       int fh = fopen(f, FILE_READ);
+                       if (fh < 0)
+                       {
+                               if (strict) LOG_WARNINGF("Player sound file not found: %s\n", f);
+                               return false;
+                       }
+                       for (string s; (s = fgets(fh)); )
+                       {
+                               int n = tokenize_console(s);
+                               if (n != 3)
+                               {
+                                       if (n != 0) LOG_WARNINGF("Invalid sound info line: %s\n", s);
+                                       continue;
+                               }
+                               string key = argv(0);
+                               var.string field = GetPlayerSoundSampleField(key);
+                               if (GetPlayerSoundSampleField_notFound) field = GetVoiceMessageSampleField(key);
+                               if (GetPlayerSoundSampleField_notFound)
+                               {
+                                       LOG_TRACEF("Invalid sound info field: %s\n", key);
+                                       continue;
+                               }
+                               string file = argv(1);
+                               string variants = argv(2);
+                               if (this.(field)) strunzone(this.(field));
+                               this.(field) = strzone(strcat(file, " ", variants));
+                       }
+                       fclose(fh);
+                       return true;
+               }
+
+               .int modelindex_for_playersound;
+               .int skin_for_playersound;
+
+               bool autocvar_g_debug_defaultsounds;
+
+               void UpdatePlayerSounds(entity this)
+               {
+                       if (this.modelindex == this.modelindex_for_playersound && this.skin == this.skin_for_playersound) return;
+                       this.modelindex_for_playersound = this.modelindex;
+                       this.skin_for_playersound = this.skin;
+                       ClearPlayerSounds(this);
+                       LoadPlayerSounds(this, "sound/player/default.sounds", true);
+                       if (this.model == "null" || autocvar_g_debug_defaultsounds) return;
+                       if (LoadPlayerSounds(this, get_model_datafilename(this.model, this.skin, "sounds"), false)) return;
+                       LoadPlayerSounds(this, get_model_datafilename(this.model, 0, "sounds"), true);
+               }
+
+       #endif
+
+       #ifdef SVQC
+
+               void _GlobalSound(entity gs, entity ps, string sample, int chan, int voicetype, bool fake)
+               {
+                       SELFPARAM();
+                       if (gs == NULL && ps == NULL && sample == "") return;
+                       float r = random();
+                       if (sample != "") sample = GlobalSound_sample(sample, r);
+                       switch (voicetype)
+                       {
+                               case VOICETYPE_LASTATTACKER_ONLY:
+                               case VOICETYPE_LASTATTACKER:
+                               {
+                                       if (!fake)
+                                       {
+                                               if (!this.pusher) break;
+                                               msg_entity = this.pusher;
+                                               if (IS_REAL_CLIENT(msg_entity))
+                                               {
+                                                       float atten = (msg_entity.cvar_cl_voice_directional == 1) ? ATTEN_MIN : ATTEN_NONE;
+                                                       if (gs) globalsound(MSG_ONE, this, gs, r, chan, VOL_BASEVOICE, atten);
+                                                       else if (ps) playersound(MSG_ONE, this, ps, r, chan, VOL_BASEVOICE, atten);
+                                                       else soundto(MSG_ONE, this, chan, sample, VOL_BASEVOICE, atten);
+                                               }
+                                       }
+                                       if (voicetype == VOICETYPE_LASTATTACKER_ONLY) break;
+                                       msg_entity = this;
+                                       if (IS_REAL_CLIENT(msg_entity))
+                                       {
+                                               if (gs) globalsound(MSG_ONE, this, gs, r, chan, VOL_BASE, ATTEN_NONE);
+                                               else if (ps) playersound(MSG_ONE, this, ps, r, chan, VOL_BASE, ATTEN_NONE);
+                                               else soundto(MSG_ONE, this, chan, sample, VOL_BASE, ATTEN_NONE);
+                                       }
+                                       break;
+                               }
+                               case VOICETYPE_TEAMRADIO:
+                               {
+                                       #define X() \
+                                               do \
+                                               { \
+                                                       float atten = (msg_entity.cvar_cl_voice_directional == 1) ? ATTEN_MIN : ATTEN_NONE; \
+                                                       if (gs) globalsound(MSG_ONE, this, gs, r, chan, VOL_BASEVOICE, atten); \
+                                                       else if (ps) playersound(MSG_ONE, this, ps, r, chan, VOL_BASEVOICE, atten); \
+                                                       else soundto(MSG_ONE, this, chan, sample, VOL_BASEVOICE, atten); \
+                                               } \
+                                               while (0)
+
+                                       if (fake) { msg_entity = this; X(); }
+                                       else
+                                       {
+                                               FOR_EACH_REALCLIENT(msg_entity)
+                                               {
+                                                       if (!teamplay || msg_entity.team == this.team) X();
+                                               }
+                                       }
+               #undef X
+                                       break;
+                               }
+                               case VOICETYPE_AUTOTAUNT:
+                               case VOICETYPE_TAUNT:
+                               {
+                                       if (voicetype == VOICETYPE_AUTOTAUNT) if (!sv_autotaunt) { break; }else {}
+                                       else if (IS_PLAYER(this) && this.deadflag == DEAD_NO) animdecide_setaction(this, ANIMACTION_TAUNT,
+                                                       true);
+                                       if (!sv_taunt) break;
+                                       if (autocvar_sv_gentle) break;
+                                       float tauntrand = 0;
+                                       if (voicetype == VOICETYPE_AUTOTAUNT) tauntrand = random();
+                                       #define X() \
+                                               do \
+                                               { \
+                                                       if (voicetype != VOICETYPE_AUTOTAUNT || tauntrand < msg_entity.cvar_cl_autotaunt) \
+                                                       { \
+                                                               float atten = (msg_entity.cvar_cl_voice_directional >= 1) \
+                                                                   ? bound(ATTEN_MIN, msg_entity.cvar_cl_voice_directional_taunt_attenuation, \
+                                                                       ATTEN_MAX) \
+                                                                       : ATTEN_NONE; \
+                                                               if (gs) globalsound(MSG_ONE, this, gs, r, chan, VOL_BASEVOICE, atten); \
+                                                               else if (ps) playersound(MSG_ONE, this, ps, r, chan, VOL_BASEVOICE, atten); \
+                                                               else soundto(MSG_ONE, this, chan, sample, VOL_BASEVOICE, atten); \
+                                                       } \
+                                               } \
+                                               while (0)
+                                       if (fake)
+                                       {
+                                               msg_entity = this;
+                                               X();
+                                       }
+                                       else
+                                       {
+                                               FOR_EACH_REALCLIENT(msg_entity)
+                                               {
+                                                       X();
+                                               }
+                                       }
+               #undef X
+                                       break;
+                               }
+                               case VOICETYPE_PLAYERSOUND:
+                               {
+                                       msg_entity = this;
+                                       if (fake)
+                                       {
+                                               if (gs) globalsound(MSG_ONE, this, gs, r, chan, VOL_BASE, ATTEN_NORM);
+                                               else if (ps) playersound(MSG_ONE, this, ps, r, chan, VOL_BASE, ATTEN_NORM);
+                                               else soundto(MSG_ONE, this, chan, sample, VOL_BASE, ATTEN_NORM);
+                                       }
+                                       else
+                                       {
+                                               if (gs) globalsound(MSG_ALL, this, gs, r, chan, VOL_BASE, ATTEN_NORM);
+                                               else if (ps) playersound(MSG_ALL, this, ps, r, chan, VOL_BASE, ATTEN_NORM);
+                                               else _sound(this, chan, sample, VOL_BASE, ATTEN_NORM);
+                                       }
+                                       break;
+                               }
+                               default:
+                               {
+                                       backtrace("Invalid voice type!");
+                                       break;
+                               }
+                       }
+               }
+
+       #endif
+#endif
diff --git a/qcsrc/common/effects/qc/globalsound.qh b/qcsrc/common/effects/qc/globalsound.qh
new file mode 100644 (file)
index 0000000..e8baf1b
--- /dev/null
@@ -0,0 +1,145 @@
+#ifndef GLOBALSOUND_H
+#define GLOBALSOUND_H
+
+// player sounds, voice messages
+
+.string m_playersoundstr;
+..string m_playersoundfld;
+
+REGISTRY(PlayerSounds, BITS(8) - 1)
+#define PlayerSounds_from(i) _PlayerSounds_from(i, NULL)
+#define REGISTER_PLAYERSOUND(id) \
+       .string _playersound_##id; \
+       REGISTER(PlayerSounds, playersound, id, m_id, new(PlayerSound)) \
+       { \
+               make_pure(this); \
+               this.m_playersoundstr = #id; \
+               this.m_playersoundfld = _playersound_##id; \
+       }
+REGISTER_REGISTRY(PlayerSounds)
+REGISTRY_SORT(PlayerSounds, 0)
+STATIC_INIT(PlayerSounds_renumber)
+{
+       FOREACH(PlayerSounds, true, LAMBDA(it.m_id = i));
+}
+REGISTRY_CHECK(PlayerSounds)
+
+// TODO implement fall and falling
+
+REGISTER_PLAYERSOUND(death)
+REGISTER_PLAYERSOUND(drown)
+REGISTER_PLAYERSOUND(fall)
+REGISTER_PLAYERSOUND(falling)
+REGISTER_PLAYERSOUND(gasp)
+REGISTER_PLAYERSOUND(jump)
+REGISTER_PLAYERSOUND(pain100)
+REGISTER_PLAYERSOUND(pain25)
+REGISTER_PLAYERSOUND(pain50)
+REGISTER_PLAYERSOUND(pain75)
+
+.bool instanceOfVoiceMessage;
+.int m_playersoundvt;
+#define REGISTER_VOICEMSG(id, vt) \
+       .string _playersound_##id; \
+       REGISTER(PlayerSounds, playersound, id, m_id, new(VoiceMessage)) \
+       { \
+               make_pure(this); \
+               this.instanceOfVoiceMessage = true; \
+               this.m_playersoundstr = #id; \
+               this.m_playersoundfld = _playersound_##id; \
+               this.m_playersoundvt = vt; \
+       }
+
+const int VOICETYPE_PLAYERSOUND = 10;
+const int VOICETYPE_TEAMRADIO = 11;
+const int VOICETYPE_LASTATTACKER = 12;
+const int VOICETYPE_LASTATTACKER_ONLY = 13;
+const int VOICETYPE_AUTOTAUNT = 14;
+const int VOICETYPE_TAUNT = 15;
+
+REGISTER_VOICEMSG(attack, VOICETYPE_TEAMRADIO)
+REGISTER_VOICEMSG(attackinfive, VOICETYPE_TEAMRADIO)
+REGISTER_VOICEMSG(coverme, VOICETYPE_TEAMRADIO)
+REGISTER_VOICEMSG(defend, VOICETYPE_TEAMRADIO)
+REGISTER_VOICEMSG(freelance, VOICETYPE_TEAMRADIO)
+REGISTER_VOICEMSG(incoming, VOICETYPE_TEAMRADIO)
+REGISTER_VOICEMSG(meet, VOICETYPE_TEAMRADIO)
+REGISTER_VOICEMSG(needhelp, VOICETYPE_TEAMRADIO)
+REGISTER_VOICEMSG(seenflag, VOICETYPE_TEAMRADIO)
+REGISTER_VOICEMSG(taunt, VOICETYPE_TAUNT)
+REGISTER_VOICEMSG(teamshoot, VOICETYPE_LASTATTACKER)
+
+// reserved sound names for the future (some models lack sounds for them):
+// _VOICEMSG(flagcarriertakingdamage)
+// _VOICEMSG(getflag)
+// reserved sound names for the future (ALL models lack sounds for them):
+// _VOICEMSG(affirmative)
+// _VOICEMSG(attacking)
+// _VOICEMSG(defending)
+// _VOICEMSG(roaming)
+// _VOICEMSG(onmyway)
+// _VOICEMSG(droppedflag)
+// _VOICEMSG(negative)
+// _VOICEMSG(seenenemy)
+
+.string m_globalsoundstr;
+REGISTRY(GlobalSounds, BITS(8) - 1)
+#define GlobalSounds_from(i) _GlobalSounds_from(i, NULL)
+#define REGISTER_GLOBALSOUND(id, str) \
+       REGISTER(GlobalSounds, GS, id, m_id, new(GlobalSound)) \
+       { \
+               make_pure(this); \
+               this.m_globalsoundstr = str; \
+       }
+REGISTER_REGISTRY(GlobalSounds)
+REGISTRY_SORT(GlobalSounds, 0)
+STATIC_INIT(GlobalSounds_renumber)
+{
+       FOREACH(GlobalSounds, true, LAMBDA(it.m_id = i));
+}
+REGISTRY_CHECK(GlobalSounds)
+void PrecacheGlobalSound(string samplestring);
+PRECACHE(GlobalSounds)
+{
+       FOREACH(GlobalSounds, true, LAMBDA(PrecacheGlobalSound(it.m_globalsoundstr)));
+}
+
+REGISTER_GLOBALSOUND(STEP, "misc/footstep0 6")
+REGISTER_GLOBALSOUND(STEP_METAL, "misc/metalfootstep0 6")
+REGISTER_GLOBALSOUND(FALL, "misc/hitground 4")
+REGISTER_GLOBALSOUND(FALL_METAL, "misc/metalhitground 4")
+
+bool GetPlayerSoundSampleField_notFound;
+void PrecachePlayerSounds(string f);
+#ifdef CSQC
+       .string GetVoiceMessageSampleField(string type);
+       .string GetPlayerSoundSampleField(string type);
+       void ClearPlayerSounds(entity this);
+       float LoadPlayerSounds(entity this, string f, bool strict);
+       void UpdatePlayerSounds(entity this);
+#endif
+
+#ifdef SVQC
+
+       void _GlobalSound(entity gs, entity ps, string sample, float chan, float voicetype, bool fake);
+       #define GlobalSound(def, chan, voicetype) _GlobalSound(def, NULL, string_null, chan, voicetype, false)
+       #define GlobalSound_string(def, chan, voicetype) _GlobalSound(NULL, NULL, def, chan, voicetype, false)
+       #define PlayerSound(def, chan, voicetype) _GlobalSound(NULL, def, string_null, chan, voicetype, false)
+       #define VoiceMessage(def, msg) \
+               do \
+               { \
+                       entity VM = def; \
+                       int voicetype = VM.m_playersoundvt; \
+                       bool ownteam = (voicetype == VOICETYPE_TEAMRADIO); \
+                       int flood = Say(this, ownteam, world, msg, true); \
+                       bool fake; \
+                       if (IS_SPEC(this) || IS_OBSERVER(this) || flood < 0) fake = true; \
+                       else if (flood > 0) fake = false; \
+                       else break; \
+                       _GlobalSound(NULL, VM, string_null, CH_VOICE, voicetype, fake); \
+               } \
+               while (0)
+
+#endif
+
+#endif
index a3610e17f7e76b27db8f694a1414d4603797ddca..702e8ee39d010bc67d77dff3b4f5118d9485421c 100644 (file)
@@ -346,7 +346,7 @@ void Monster_Sound(.string samplefield, float sound_delay, float delaytoo, float
        if(delaytoo)
        if(time < self.msound_delay)
                return; // too early
-       _GlobalSound(self.(samplefield), chan, VOICETYPE_PLAYERSOUND, false);
+       GlobalSound_string(self.(samplefield), chan, VOICETYPE_PLAYERSOUND);
 
        self.msound_delay = time + sound_delay;
 }
index a49f79df833d9d1652cae099adada98937d134a7..ad5f13808637f592d46ecdea365092b7a5813c71 100644 (file)
@@ -1100,27 +1100,19 @@ void PM_check_frozen()
 void PM_check_hitground()
 {SELFPARAM();
 #ifdef SVQC
-       if (IS_ONGROUND(self))
-       if (IS_PLAYER(self)) // no fall sounds for observers thank you very much
-       if (self.wasFlying)
-       {
-               self.wasFlying = 0;
-               if (self.waterlevel < WATERLEVEL_SWIMMING)
-               if (time >= self.ladder_time)
-               if (!self.hook)
-               {
-                       self.nextstep = time + 0.3 + random() * 0.1;
-                       trace_dphitq3surfaceflags = 0;
-                       tracebox(self.origin, self.mins, self.maxs, self.origin - '0 0 1', MOVE_NOMONSTERS, self);
-                       if (!(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOSTEPS))
-                       {
-                               if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS)
-                                       GlobalSound(GS_FALL_METAL, CH_PLAYER, VOICETYPE_PLAYERSOUND);
-                               else
-                                       GlobalSound(GS_FALL, CH_PLAYER, VOICETYPE_PLAYERSOUND);
-                       }
-               }
-       }
+       if (!IS_PLAYER(this)) return; // no fall sounds for observers thank you very much
+       if (!IS_ONGROUND(this)) return;
+       if (!this.wasFlying) return;
+    this.wasFlying = false;
+    if (this.waterlevel >= WATERLEVEL_SWIMMING) return;
+    if (time < this.ladder_time) return;
+    if (this.hook) return;
+    this.nextstep = time + 0.3 + random() * 0.1;
+    trace_dphitq3surfaceflags = 0;
+    tracebox(this.origin, this.mins, this.maxs, this.origin - '0 0 1', MOVE_NOMONSTERS, this);
+    if ((trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOSTEPS)) return;
+    entity fall = (trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS) ? GS_FALL_METAL : GS_FALL;
+    GlobalSound(fall, CH_PLAYER, VOICETYPE_PLAYERSOUND);
 #endif
 }
 
index 36bdaa833085db167c5190b946d7a701e5592faa..503290b6c03f916fbd0972eba1f767cef0360e5c 100644 (file)
@@ -1,22 +1,29 @@
 #ifndef SOUND_H
 #define SOUND_H
 
+// negative = SVQC autochannels
+// positive = one per entity
+
 const int CH_INFO = 0;
-const int CH_TRIGGER = -3;
 const int CH_WEAPON_A = -1;
+const int CH_WEAPON_B = -1;
 const int CH_WEAPON_SINGLE = 1;
 const int CH_VOICE = -2;
-const int CH_BGM_SINGLE = 8;
-const int CH_AMBIENT = -9;
+// const int CH_VOICE_SINGLE = 2;
+const int CH_TRIGGER = -3;
 const int CH_TRIGGER_SINGLE = 3;
 const int CH_SHOTS = -4;
 const int CH_SHOTS_SINGLE = 4;
-const int CH_WEAPON_B = -1;
+// const int CH_TUBA = -5;
+const int CH_TUBA_SINGLE = 5;
 const int CH_PAIN = -6;
 const int CH_PAIN_SINGLE = 6;
 const int CH_PLAYER = -7;
 const int CH_PLAYER_SINGLE = 7;
-const int CH_TUBA_SINGLE = 5;
+// const int CH_BGM_SINGLE = -8;
+const int CH_BGM_SINGLE = 8;
+const int CH_AMBIENT = -9;
+// const int CH_AMBIENT_SINGLE = 9;
 
 const float ATTEN_NONE = 0;
 const float ATTEN_MIN = 0.015625;
index 07385b092da1cbdac01a3803b91d84262b96b97a..bbe8f327640a7259ba117ada1c7fd207a0f57d9c 100644 (file)
 
 #ifdef CSQC
        #define REGISTER_NET_LINKED(id) \
-               [[accumulate]] NET_HANDLE(id, bool) \
+               [[accumulate]] NET_HANDLE(id, bool isnew) \
                { \
                        this = self; \
                        this.sourceLocFile = __FILE__; \
                        this.sourceLocLine = __LINE__; \
+                       if (!this) isnew = true; \
                } \
                REGISTER(LinkedEntities, NET, id, m_id, new(net_linked_packet)) \
                { \
index 6cd7e2395a2acd17b62a8862691e62c7d52e6298..c271b65b49523721b47972de15f7a6caf9e6b8de 100644 (file)
@@ -437,7 +437,6 @@ bool autocvar_waypoint_benchmark;
 float autocvar_sv_gameplayfix_gravityunaffectedbyticrate;
 bool autocvar_sv_gameplayfix_upwardvelocityclearsongroundflag;
 float autocvar_g_trueaim_minrange;
-bool autocvar_g_debug_defaultsounds;
 float autocvar_g_grab_range;
 int autocvar_g_max_info_autoscreenshot;
 bool autocvar_physics_ode;
index 24a63d5aab0e8823b07b5fec3eb73dba70528d7c..454ddc9030e6a0d6ad6475ce959bc11dba5c0974 100644 (file)
@@ -175,7 +175,6 @@ void setplayermodel(entity e, string modelname)
        precache_model(modelname);
        _setmodel(e, modelname);
        player_setupanimsformodel();
-       UpdatePlayerSounds(e);
 }
 
 /*
@@ -405,7 +404,6 @@ void FixPlayermodel(entity player)
        if(chmdl || oldskin != player.skin) // model or skin has changed
        {
                player.species = player_getspecies(player); // update species
-               UpdatePlayerSounds(player); // update skin sounds
        }
 
        if(!teamplay)
@@ -1307,8 +1305,6 @@ void ClientDisconnect ()
        if(self.weaponorder_byimpulse)
                strunzone(self.weaponorder_byimpulse);
 
-       ClearPlayerSounds(self);
-
        if(self.personal)
                remove(self.personal);
 
index b49488b0553701cb528de71fd1261c0326c38e65..a9a5d03cbe2e93965f73b25e603cfbc31a5f5288 100644 (file)
@@ -959,282 +959,3 @@ int Say(entity source, float teamsay, entity privatesay, string msgin, bool floo
 
        return ret;
 }
-
-int GetVoiceMessageVoiceType(string type)
-{
-       if (type == "taunt") return VOICETYPE_TAUNT;
-       if (type == "teamshoot") return VOICETYPE_LASTATTACKER;
-       return VOICETYPE_TEAMRADIO;
-}
-
-.string GetVoiceMessageSampleField(string type)
-{
-       GetPlayerSoundSampleField_notFound = false;
-       switch (type)
-       {
-#define X(m) case #m: return playersound_##m;
-               ALLVOICEMSGS(X)
-#undef X
-       }
-       GetPlayerSoundSampleField_notFound = true;
-       return playersound_taunt;
-}
-
-.string GetPlayerSoundSampleField(string type)
-{
-       GetPlayerSoundSampleField_notFound = false;
-       switch (type)
-       {
-#define X(m) case #m: return playersound_##m;
-               ALLPLAYERSOUNDS(X)
-#undef X
-       }
-       GetPlayerSoundSampleField_notFound = true;
-       return playersound_taunt;
-}
-
-void PrecacheGlobalSound(string sample)
-{
-       int n;
-       {
-               string s = cdr(sample);
-               if (s) n = stof(s);
-               else n = 0;
-       }
-       sample = car(sample);
-       if (n > 0)
-       {
-               for (int i = 1; i <= n; ++i)
-                       precache_sound(sprintf("%s%d.wav", sample, i));
-       }
-       else
-       {
-               precache_sound(sprintf("%s.wav", sample));
-       }
-}
-
-string allvoicesamples;
-
-void PrecachePlayerSounds(string f)
-{
-       int fh = fopen(f, FILE_READ);
-       if (fh < 0)
-       {
-               LOG_WARNINGF("Player sound file not found: %s\n", f);
-               return;
-       }
-       for (string s; (s = fgets(fh)); )
-       {
-               int n = tokenize_console(s);
-               if (n != 3)
-               {
-                       if (n != 0) LOG_WARNINGF("Invalid sound info line: %s\n", s);
-                       continue;
-               }
-               string file = argv(1);
-               string variants = argv(2);
-               PrecacheGlobalSound(strcat(file, " ", variants));
-       }
-       fclose(fh);
-
-       if (!allvoicesamples)
-       {
-#define X(m) allvoicesamples = strcat(allvoicesamples, " ", #m);
-               ALLVOICEMSGS(X)
-#undef X
-               allvoicesamples = strzone(substring(allvoicesamples, 1, -1));
-       }
-}
-
-void ClearPlayerSounds(entity this)
-{
-#define X(m) if (this.playersound_##m) { strunzone(this.playersound_##m); this.playersound_##m = string_null; }
-       ALLPLAYERSOUNDS(X)
-       ALLVOICEMSGS(X)
-#undef X
-}
-
-bool LoadPlayerSounds(string f, bool strict)
-{
-       SELFPARAM();
-       int fh = fopen(f, FILE_READ);
-       if (fh < 0)
-       {
-               if (strict) LOG_WARNINGF("Player sound file not found: %s\n", f);
-               return false;
-       }
-       for (string s; (s = fgets(fh)); )
-       {
-               int n = tokenize_console(s);
-               if (n != 3)
-               {
-                       if (n != 0) LOG_WARNINGF("Invalid sound info line: %s\n", s);
-                       continue;
-               }
-               string key = argv(0);
-               var .string field = GetPlayerSoundSampleField(key);
-               if (GetPlayerSoundSampleField_notFound) field = GetVoiceMessageSampleField(key);
-               if (GetPlayerSoundSampleField_notFound)
-               {
-                       LOG_TRACEF("Invalid sound info field: %s\n", key);
-                       continue;
-               }
-               string file = argv(1);
-               string variants = argv(2);
-               if (self.(field)) strunzone(self.(field));
-               self.(field) = strzone(strcat(file, " ", variants));
-       }
-       fclose(fh);
-       return true;
-}
-
-.int modelindex_for_playersound;
-.int skin_for_playersound;
-
-void UpdatePlayerSounds(entity this)
-{
-       if (this.modelindex == this.modelindex_for_playersound && this.skin == this.skin_for_playersound) return;
-       this.modelindex_for_playersound = this.modelindex;
-       this.skin_for_playersound = this.skin;
-       ClearPlayerSounds(this);
-       LoadPlayerSounds("sound/player/default.sounds", true);
-       if (autocvar_g_debug_defaultsounds) return;
-       if (!LoadPlayerSounds(get_model_datafilename(this.model, this.skin, "sounds"), false))
-               LoadPlayerSounds(get_model_datafilename(this.model, 0, "sounds"), true);
-}
-
-void _GlobalSound(string sample, int chan, int voicetype, bool fake)
-{
-       SELFPARAM();
-       if (sample == "") return;
-       int n;
-       {
-               string s = cdr(sample);
-               if (s) n = stof(s);
-               else n = 0;
-       }
-       sample = car(sample);
-       if (n > 0) sample = sprintf("%s%d.wav", sample, floor(random() * n + 1));  // randomization
-       else sample = sprintf("%s.wav", sample);
-       switch (voicetype)
-       {
-               case VOICETYPE_LASTATTACKER_ONLY:
-               case VOICETYPE_LASTATTACKER:
-               {
-                       if (!fake)
-                       {
-                               if (!this.pusher) break;
-                               msg_entity = this.pusher;
-                               if (IS_REAL_CLIENT(msg_entity))
-                               {
-                                       float atten = (msg_entity.cvar_cl_voice_directional == 1) ? ATTEN_MIN : ATTEN_NONE;
-                                       soundto(MSG_ONE, this, chan, sample, VOL_BASEVOICE, atten);
-                               }
-                       }
-                       if (voicetype == VOICETYPE_LASTATTACKER_ONLY) break;
-                       msg_entity = this;
-                       if (IS_REAL_CLIENT(msg_entity)) soundto(MSG_ONE, this, chan, sample, VOL_BASE, ATTEN_NONE);
-                       break;
-               }
-               case VOICETYPE_TEAMRADIO:
-               {
-                       #define X() \
-                               do \
-                               { \
-                                       float atten = (msg_entity.cvar_cl_voice_directional == 1) ? ATTEN_MIN : ATTEN_NONE; \
-                                       soundto(MSG_ONE, this, chan, sample, VOL_BASEVOICE, atten); \
-                               } \
-                               while (0)
-
-                       if (fake) { msg_entity = this; X(); }
-                       else
-                       {
-                               FOR_EACH_REALCLIENT(msg_entity)
-                               {
-                                       if (!teamplay || msg_entity.team == this.team) X();
-                               }
-                       }
-                       #undef X
-                       break;
-               }
-               case VOICETYPE_AUTOTAUNT:
-               case VOICETYPE_TAUNT:
-               {
-                       if (voicetype == VOICETYPE_AUTOTAUNT) if (!sv_autotaunt) { break; }else {}
-                       else if (IS_PLAYER(this) && this.deadflag == DEAD_NO) animdecide_setaction(this, ANIMACTION_TAUNT, true);
-                       if (!sv_taunt) break;
-                       if (autocvar_sv_gentle) break;
-                       float tauntrand = 0;
-                       if (voicetype == VOICETYPE_AUTOTAUNT) tauntrand = random();
-                       #define X() \
-                               do \
-                               { \
-                                       if (voicetype != VOICETYPE_AUTOTAUNT || tauntrand < msg_entity.cvar_cl_autotaunt) \
-                                       { \
-                                               float atten = (msg_entity.cvar_cl_voice_directional >= 1) \
-                                                   ? bound(ATTEN_MIN, msg_entity.cvar_cl_voice_directional_taunt_attenuation, ATTEN_MAX) \
-                                                       : ATTEN_NONE; \
-                                               soundto(MSG_ONE, this, chan, sample, VOL_BASEVOICE, atten); \
-                                       } \
-                               } \
-                               while (0)
-                       if (fake)
-                       {
-                               msg_entity = this;
-                               X();
-                       }
-                       else
-                       {
-                               FOR_EACH_REALCLIENT(msg_entity)
-                               {
-                                       X();
-                               }
-                       }
-                       #undef X
-                       break;
-               }
-               case VOICETYPE_PLAYERSOUND:
-               {
-                       if (fake)
-                       {
-                               msg_entity = this;
-                               soundto(MSG_ONE, this, chan, sample, VOL_BASE, ATTEN_NORM);
-                       }
-                       else
-                       {
-                               _sound(this, chan, sample, VOL_BASE, ATTEN_NORM);
-                       }
-                       break;
-               }
-               default:
-               {
-                       backtrace("Invalid voice type!");
-                       break;
-               }
-       }
-}
-
-void PlayerSound(.string samplefield, int chan, float voicetype)
-{
-       SELFPARAM();
-       _GlobalSound(this.(samplefield), chan, voicetype, false);
-}
-
-void VoiceMessage(string type, string msg)
-{
-       SELFPARAM();
-       var .string sample = GetVoiceMessageSampleField(type);
-       if (GetPlayerSoundSampleField_notFound)
-       {
-               sprint(this, sprintf("Invalid voice. Use one of: %s\n", allvoicesamples));
-               return;
-       }
-       int voicetype = GetVoiceMessageVoiceType(type);
-       bool ownteam = (voicetype == VOICETYPE_TEAMRADIO);
-       int flood = Say(this, ownteam, world, msg, true);
-       bool fake;
-       if (IS_SPEC(this) || IS_OBSERVER(this) || flood < 0) fake = true;
-       else if (flood > 0) fake = false;
-       else return;
-       _GlobalSound(this.(sample), CH_VOICE, voicetype, fake);
-}
index 76c49d852f572c2f1138c00eb538b25f5db56204..e55b1c6147fac06acf8af7e1b6bed992e73bc96e 100644 (file)
@@ -39,86 +39,4 @@ void PlayerDamage(entity inflictor, entity attacker, float damage, int deathtype
 .float muted;
 int Say(entity source, float teamsay, entity privatesay, string msgin, float floodcontrol);
 
-// player sounds, voice messages
-// TODO implemented fall and falling
-#define ALLPLAYERSOUNDS(X) \
-       X(death) \
-       X(drown) \
-       X(fall) \
-       X(falling) \
-       X(gasp) \
-       X(jump) \
-       X(pain100) \
-       X(pain25) \
-       X(pain50) \
-       X(pain75)
-
-#define ALLVOICEMSGS(X) \
-       X(attack) \
-       X(attackinfive) \
-       X(coverme) \
-       X(defend) \
-       X(freelance) \
-       X(incoming) \
-       X(meet) \
-       X(needhelp) \
-       X(seenflag) \
-       X(taunt) \
-       X(teamshoot)
-
-// reserved sound names for the future (some models lack sounds for them):
-// _VOICEMSG(flagcarriertakingdamage)
-// _VOICEMSG(getflag)
-// reserved sound names for the future (ALL models lack sounds for them):
-// _VOICEMSG(affirmative)
-// _VOICEMSG(attacking)
-// _VOICEMSG(defending)
-// _VOICEMSG(roaming)
-// _VOICEMSG(onmyway)
-// _VOICEMSG(droppedflag)
-// _VOICEMSG(negative)
-// _VOICEMSG(seenenemy)
-
-#define X(m) .string playersound_##m;
-ALLPLAYERSOUNDS(X)
-ALLVOICEMSGS(X)
-#undef X
-
-bool GetPlayerSoundSampleField_notFound;
-float GetVoiceMessageVoiceType(string type);
-.string GetVoiceMessageSampleField(string type);
-.string GetPlayerSoundSampleField(string type);
-void PrecacheGlobalSound(string samplestring);
-void PrecachePlayerSounds(string f);
-void ClearPlayerSounds(entity this);
-float LoadPlayerSounds(string f, bool strict);
-void UpdatePlayerSounds(entity this);
-#define FakeGlobalSound(sample, chan, voicetype) _GlobalSound(sample, chan, voicetype, true)
-void _GlobalSound(string sample, float chan, float voicetype, bool fake);
-#define GlobalSound(def, chan, voicetype) _GlobalSound((def).m_globalsoundstr, chan, voicetype, false)
-void PlayerSound(.string samplefield, float chan, float voicetype);
-void VoiceMessage(string type, string msg);
-
-.string m_globalsoundstr;
-REGISTRY(GlobalSounds, BITS(8) - 1)
-#define GlobalSounds_from(i) _GlobalSounds_from(i, NULL)
-#define REGISTER_GLOBALSOUND(id, str) \
-       REGISTER(GlobalSounds, GS, id, m_id, new(GlobalSound)) \
-       { \
-               make_pure(this); \
-               this.m_globalsoundstr = str; \
-       }
-REGISTER_REGISTRY(GlobalSounds)
-REGISTRY_SORT(GlobalSounds, 0)
-REGISTRY_CHECK(GlobalSounds)
-PRECACHE(GlobalSounds)
-{
-       FOREACH(GlobalSounds, true, LAMBDA(PrecacheGlobalSound(it.m_globalsoundstr)));
-}
-
-REGISTER_GLOBALSOUND(STEP, "misc/footstep0 6")
-REGISTER_GLOBALSOUND(STEP_METAL, "misc/metalfootstep0 6")
-REGISTER_GLOBALSOUND(FALL, "misc/hitground 4")
-REGISTER_GLOBALSOUND(FALL_METAL, "misc/metalhitground 4")
-
 #endif
index ac21bc62dcc61b6ff73d68350ae9cafa38699b4c..6cac1c4f0620fb5a224e6d8dd2c0a5a39a865873 100644 (file)
@@ -601,8 +601,14 @@ void ClientCommand_voice(float request, float argc, string command)
                {
                        if (argv(1) != "")
                        {
-                               if (argc >= 3) VoiceMessage(argv(1), substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2)));
-                               else VoiceMessage(argv(1), "");
+                               entity e = GetVoiceMessage(argv(1));
+                               if (!e)
+                               {
+                                       sprint(this, sprintf("Invalid voice. Use one of: %s\n", allvoicesamples));
+                                       return;
+                               }
+                               if (argc >= 3) VoiceMessage(e, substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2)));
+                               else VoiceMessage(e, "");
 
                                return;
                        }
index 094eb453192a6e7b48ce2204d39ea18acdc150d9..16a7c779be9736147ee7ca9c0984e9b9f61562f0 100644 (file)
@@ -301,13 +301,6 @@ float tracebox_hits_trigger_hurt(vector start, vector mi, vector ma, vector end)
 
 float next_pingtime;
 
-const float VOICETYPE_PLAYERSOUND = 10;
-const float VOICETYPE_TEAMRADIO = 11;
-const float VOICETYPE_LASTATTACKER = 12;
-const float VOICETYPE_LASTATTACKER_ONLY = 13;
-const float VOICETYPE_AUTOTAUNT = 14;
-const float VOICETYPE_TAUNT = 15;
-
 // autotaunt system
 .float cvar_cl_autotaunt;
 .float cvar_cl_voice_directional;
index d12a903778571195c13999e904daa605330ba24d..ef399f5666c8ba40402748670d2de6d000ab6482 100644 (file)
@@ -703,7 +703,6 @@ void readplayerstartcvars()
        warmup_start_ammo_fuel = max(0, warmup_start_ammo_fuel);
 }
 
-void PrecachePlayerSounds(string f);
 void precache_playermodel(string m)
 {
        float globhandle, i, n;