Merge MR 'Various Q3 and QL map entity features and fixes'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / gamesettings.qh

diff --git a/qcsrc/menu/gamesettings.qh b/qcsrc/menu/gamesettings.qh
index 868ac0fe3182570457360c000511704b21e3bb7d..291b55b27aefff385e756c294ffcfc9a4b4067a9 100644 (file)
--- a/qcsrc/menu/gamesettings.qh
+++ b/qcsrc/menu/gamesettings.qh
@@ -2,11 +2,12 @@
 
 #ifdef MENUQC
 
-#include "xonotic/tab.qc"
+#include "xonotic/tab.qh"
 
 REGISTRY(Settings, BITS(3))
-#define Settings_from(i) _Settings_from(i, NULL)
 REGISTER_REGISTRY(Settings)
+
+REGISTRY_DEFINE_GET(Settings, NULL)
 #define REGISTER_SETTINGS(id, impl) \
     LAZY_NEW(id, impl) \
     REGISTER(Settings, MENU, id, m_id, NEW(Lazy, LAZY(id)))