#include "globalsound.qh"
-#include "../common/ent_cs.qh"
+#include <common/ent_cs.qh>
#ifdef IMPLEMENTATION
- #include "../../animdecide.qh"
+ #include <common/animdecide.qh>
#ifdef SVQC
- #include "../../../server/cl_player.qh"
+ #include <server/cl_player.qh>
#endif
REGISTER_NET_TEMP(globalsound)
REGISTER_NET_TEMP(playersound)
+ string GlobalSound_sample(string pair, float r);
+
#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)
+ void globalsound(int channel, entity from, entity gs, float r, int chan, float _vol, float _atten)
{
- assert(IS_PLAYER(from), eprint(from));
+ //assert(IS_PLAYER(from), eprint(from));
if (channel == MSG_ONE && !IS_REAL_CLIENT(msg_entity)) return;
+ if (!autocvar_g_debug_globalsounds) {
+ string sample = GlobalSound_sample(gs.m_globalsoundstr, r);
+ switch (channel) {
+ case MSG_ONE:
+ soundto(channel, from, chan, sample, _vol, _atten);
+ break;
+ case MSG_ALL:
+ _sound(from, chan, sample, _vol, _atten);
+ break;
+ }
+ return;
+ }
WriteHeader(channel, globalsound);
WriteByte(channel, gs.m_id);
WriteByte(channel, r * 255);
WriteByte(channel, etof(from));
WriteByte(channel, chan);
- WriteByte(channel, floor(vol * 255));
- WriteByte(channel, floor(atten * 64));
+ WriteByte(channel, floor(_vol * 255));
+ WriteByte(channel, floor(_atten * 64));
entcs_force_origin(from);
vector o = from.origin + 0.5 * (from.mins + from.maxs);
WriteCoord(channel, o.x);
* @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)
+ void playersound(int channel, entity from, entity ps, float r, int chan, float _vol, float _atten)
{
- assert(IS_PLAYER(from), eprint(from));
+ //assert(IS_PLAYER(from), eprint(from));
if (channel == MSG_ONE && !IS_REAL_CLIENT(msg_entity)) return;
+ if (!autocvar_g_debug_globalsounds) {
+ //UpdatePlayerSounds(from);
+ string s = from.(ps.m_playersoundfld);
+ string sample = GlobalSound_sample(s, r);
+ switch (channel) {
+ case MSG_ONE:
+ soundto(channel, from, chan, sample, _vol, _atten);
+ break;
+ case MSG_ALL:
+ _sound(from, chan, sample, _vol, _atten);
+ break;
+ }
+ return;
+ }
WriteHeader(channel, playersound);
WriteByte(channel, ps.m_id);
WriteByte(channel, r * 255);
WriteByte(channel, etof(from));
WriteByte(channel, chan);
- WriteByte(channel, floor(vol * 255));
- WriteByte(channel, floor(atten * 64));
+ WriteByte(channel, floor(_vol * 255));
+ WriteByte(channel, floor(_atten * 64));
entcs_force_origin(from);
vector o = from.origin + 0.5 * (from.mins + from.maxs);
WriteCoord(channel, o.x);
}
#endif
- string GlobalSound_sample(string pair, float r);
-
#ifdef CSQC
NET_HANDLE(globalsound, bool isnew)
string sample = GlobalSound_sample(gs.m_globalsoundstr, r);
int who = ReadByte();
entity e = entcs_receiver(who - 1);
- int chan = ReadByte();
- chan = (chan & BIT(7) ? -1 : 1) * (chan & BITS(7));
+ int chan = ReadSByte();
float vol = ReadByte() / 255;
float atten = ReadByte() / 64;
vector o;
o.y = ReadCoord();
o.z = ReadCoord();
// TODO: is this really what we want to be doing? Footsteps that follow the player at head height?
- if (who == player_currententnum) e = findfloat(world, entnum, who); // play at camera position for full volume
+ if (who == player_currententnum) e = findfloat(NULL, entnum, who); // play at camera position for full volume
else if (e) e.origin = o;
if (e)
{
UpdatePlayerSounds(e);
string s = e.(ps.m_playersoundfld);
string sample = GlobalSound_sample(s, r);
- int chan = ReadByte();
- chan = (chan & BIT(7) ? -1 : 1) * (chan & BITS(7));
+ int chan = ReadSByte();
float vol = ReadByte() / 255;
float atten = ReadByte() / 64;
vector o;
o.x = ReadCoord();
o.y = ReadCoord();
o.z = ReadCoord();
- if (who == player_currententnum) e = findfloat(world, entnum, who); // play at camera position for full volume
+ if (who == player_currententnum) e = findfloat(NULL, entnum, who); // play at camera position for full volume
else if (e) e.origin = o;
if (e)
{
entity GetVoiceMessage(string type)
{
- FOREACH(PlayerSounds, it.m_playersoundstr == type && it.instanceOfVoiceMessage == true, LAMBDA(return it));
+ FOREACH(PlayerSounds, it.m_playersoundstr == type && it.instanceOfVoiceMessage == true, return it);
return NULL;
}
entity GetPlayerSound(string type)
{
- FOREACH(PlayerSounds, it.m_playersoundstr == type && it.instanceOfVoiceMessage == false, LAMBDA(return it));
+ FOREACH(PlayerSounds, it.m_playersoundstr == type && it.instanceOfVoiceMessage == false, 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;
fclose(fh);
}
- #ifdef CSQC
+ //#ifdef CSQC
.string GetPlayerSoundSampleField(string type)
{
void ClearPlayerSounds(entity this)
{
- FOREACH(PlayerSounds, true, LAMBDA(
+ FOREACH(PlayerSounds, true, {
.string fld = it.m_playersoundfld;
if (this.(fld))
- {
- strunzone(this.(fld));
- this.(fld) = string_null;
- }
- ));
+ {
+ strunzone(this.(fld));
+ this.(fld) = string_null;
+ }
+ });
}
bool LoadPlayerSounds(entity this, string f, bool strict)
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 (this.model == "null"
+ #ifdef SVQC
+ && autocvar_g_debug_globalsounds
+ #endif
+ ) return;
+ if (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
+ //#endif
#ifdef SVQC
- bool autocvar_g_debug_globalsounds;
-
void _GlobalSound(entity this, entity gs, entity ps, string sample, int chan, int voicetype, bool fake)
{
if (gs == NULL && ps == NULL && sample == "") return;
+ if(this.classname == "body") return;
float r = random();
if (sample != "") sample = GlobalSound_sample(sample, r);
switch (voicetype)
case VOICETYPE_TEAMRADIO:
{
#define X() \
- do \
+ MACRO_BEGIN \
{ \
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)
+ } MACRO_END
if (fake) { msg_entity = this; X(); }
else
{
- FOR_EACH_REALCLIENT(msg_entity)
- {
- if (!teamplay || msg_entity.team == this.team) X();
- }
+ FOREACH_CLIENT(IS_REAL_CLIENT(it) && (!teamplay || msg_entity.team == this.team), {
+ msg_entity = it;
+ X();
+ });
}
#undef X
break;
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,
+ else if (IS_PLAYER(this) && !IS_DEAD(this)) 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 \
+ MACRO_BEGIN \
{ \
if (voicetype != VOICETYPE_AUTOTAUNT || tauntrand < msg_entity.cvar_cl_autotaunt) \
{ \
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)
+ } MACRO_END
if (fake)
{
msg_entity = this;
}
else
{
- FOR_EACH_REALCLIENT(msg_entity)
- {
+ FOREACH_CLIENT(IS_REAL_CLIENT(it), {
+ msg_entity = it;
X();
- }
+ });
}
#undef X
break;
}
else
{
- if (gs)
- {
- if(autocvar_g_debug_globalsounds)
- globalsound(MSG_ALL, this, gs, r, chan, VOL_BASE, ATTEN_NORM);
- else
- _sound(this, chan, GlobalSound_sample(gs.m_globalsoundstr, r), VOL_BASE, ATTEN_NORM);
- }
+ 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);
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff