Merge branch 'master' into martin-t/globals

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / sounds / all.qh

diff --git a/qcsrc/common/sounds/all.qh b/qcsrc/common/sounds/all.qh
index d39c701d7f0a2887295f557a01747bbb4c8bf18a..b7b296341b5a02ba5829035e158f13ad673cbefe 100644 (file)
--- a/qcsrc/common/sounds/all.qh
+++ b/qcsrc/common/sounds/all.qh
@@ -1,25 +1,22 @@
-#ifndef SOUNDS_ALL_H
-#define SOUNDS_ALL_H
+#pragma once
 
 #include "sound.qh"
 
-REGISTRY(Sounds, BITS(8))
-REGISTER_REGISTRY(RegisterSounds)
+REGISTRY(Sounds, BITS(9))
+#define Sounds_from(i) _Sounds_from(i, SND_Null)
+REGISTER_REGISTRY(Sounds)
 
 #define SOUND(name, path) \
     string SND_##name##_get() { return path; } \
-    REGISTER(RegisterSounds, SND, Sounds, name, m_id, NEW(Sound, SND_##name##_get))
+    REGISTER(Sounds, SND, name, m_id, NEW(Sound, SND_##name##_get))
 
-// Used in places where a string is required
-#define SND(id) (SND_##id.sound_str())
+/** @deprecated Used in places where a string is required for legacy reasons, prefer using SND_id constants instead */
+#define SND(id) Sound_fixpath(SND_##id)
 
-STATIC_INIT(RegisterSounds_precache) {
-    FOREACH(Sounds, true, LAMBDA({
-        it.sound_precache(it);
-    }));
+PRECACHE(Sounds) {
+    FOREACH(Sounds, true, it.sound_precache(it));
 }
 
-SOUND(Null, "misc/null.wav");
+SOUND(Null, "misc/null");
 #include "all.inc"
-
-#endif
+#include "all.qc"