#define PlayerSounds_from(i) _PlayerSounds_from(i, NULL)
#define REGISTER_PLAYERSOUND(id) \
.string _playersound_##id; \
- REGISTER(PlayerSounds, playersound, id, m_id, new(PlayerSound)) \
+ REGISTER(PlayerSounds, playersound, id, m_id, new_pure(PlayerSound)) \
{ \
- make_pure(this); \
this.m_playersoundstr = #id; \
this.m_playersoundfld = _playersound_##id; \
}
.int m_playersoundvt;
#define REGISTER_VOICEMSG(id, vt) \
.string _playersound_##id; \
- REGISTER(PlayerSounds, playersound, id, m_id, new(VoiceMessage)) \
+ REGISTER(PlayerSounds, playersound, id, m_id, new_pure(VoiceMessage)) \
{ \
- make_pure(this); \
this.instanceOfVoiceMessage = true; \
this.m_playersoundstr = #id; \
this.m_playersoundfld = _playersound_##id; \
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)) \
+ REGISTER(GlobalSounds, GS, id, m_id, new_pure(GlobalSound)) \
{ \
- make_pure(this); \
this.m_globalsoundstr = str; \
}
REGISTER_REGISTRY(GlobalSounds)
bool GetPlayerSoundSampleField_notFound;
void PrecachePlayerSounds(string f);
-#ifdef CSQC
+//#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
+//#endif
#ifdef SVQC
void _GlobalSound(entity this, entity gs, entity ps, string sample, float chan, float voicetype, bool fake);
#define GlobalSound(this, def, chan, voicetype) _GlobalSound(this, def, NULL, string_null, chan, voicetype, false)
#define GlobalSound_string(this, def, chan, voicetype) _GlobalSound(this, NULL, NULL, def, chan, voicetype, false)
- #define PlayerSound(thise, def, chan, voicetype) _GlobalSound(this, NULL, def, string_null, chan, voicetype, false)
+ #define PlayerSound(this, def, chan, voicetype) _GlobalSound(this, NULL, def, string_null, chan, voicetype, false)
#define VoiceMessage(this, def, msg) \
- do \
+ MACRO_BEGIN \
{ \
entity VM = def; \
int voicetype = VM.m_playersoundvt; \
else if (flood > 0) fake = false; \
else break; \
_GlobalSound(this, NULL, VM, string_null, CH_VOICE, voicetype, fake); \
- } \
- while (0)
+ } MACRO_END
#endif