X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Feffects%2Fqc%2Fglobalsound.qh;h=2b6b52896f88fd3ec4d935c74dc20f8efaca256a;hp=b5631ed5fd246774277adb823dae760d31700b9d;hb=90d9f7c775306324957323d53d5a4ad995d999e3;hpb=7b1c7d6a2f8f423b2642a4d2f5f07be9cd5890d0 diff --git a/qcsrc/common/effects/qc/globalsound.qh b/qcsrc/common/effects/qc/globalsound.qh index b5631ed5f..2b6b52896 100644 --- a/qcsrc/common/effects/qc/globalsound.qh +++ b/qcsrc/common/effects/qc/globalsound.qh @@ -11,7 +11,6 @@ ..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_pure(PlayerSound)) \ @@ -21,6 +20,8 @@ REGISTRY(PlayerSounds, BITS(8) - 1) } REGISTER_REGISTRY(PlayerSounds) REGISTRY_SORT(PlayerSounds) + +REGISTRY_DEFINE_GET(PlayerSounds, NULL) STATIC_INIT(PlayerSounds_renumber) { FOREACH(PlayerSounds, true, it.m_id = i); @@ -84,7 +85,6 @@ REGISTER_VOICEMSG(seenenemy, VOICETYPE_TEAMRADIO, false) .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_pure(GlobalSound)) \ { \ @@ -92,6 +92,8 @@ REGISTRY(GlobalSounds, BITS(8) - 1) } REGISTER_REGISTRY(GlobalSounds) REGISTRY_SORT(GlobalSounds) + +REGISTRY_DEFINE_GET(GlobalSounds, NULL) STATIC_INIT(GlobalSounds_renumber) { FOREACH(GlobalSounds, true, it.m_id = i);