Merge branch 'terencehill/scoreboard_ui' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / reg.qh

diff --git a/qcsrc/server/command/reg.qh b/qcsrc/server/command/reg.qh
index b135c0460113451fe485528457fb8ba512c22e54..71ace677ab47d0b0ed829e379f9ee56e10031526 100644 (file)
--- a/qcsrc/server/command/reg.qh
+++ b/qcsrc/server/command/reg.qh
@@ -1,10 +1,11 @@
 #pragma once
 
 REGISTRY(SERVER_COMMANDS, BITS(7))
-#define SERVER_COMMANDS_from(i) _SERVER_COMMANDS_from(i, NULL)
 REGISTER_REGISTRY(SERVER_COMMANDS)
 REGISTRY_SORT(SERVER_COMMANDS)
 
+REGISTRY_DEFINE_GET(SERVER_COMMANDS, NULL)
+
 #define SERVER_COMMAND(id, description) \
        CLASS(servercommand_##id, Command) \
                ATTRIB(servercommand_##id, m_name, string, #id); \
@@ -14,5 +15,5 @@ REGISTRY_SORT(SERVER_COMMANDS)
        METHOD(servercommand_##id, m_invokecmd, void(servercommand_##id this, int request, entity caller, int arguments, string command))
 
 STATIC_INIT(SERVER_COMMANDS_aliases) {
-       FOREACH(SERVER_COMMANDS, true, LAMBDA(localcmd(sprintf("alias %1$s \"%2$s %1$s ${* ?}\"\n", it.m_name, "qc_cmd_sv"))));
+       FOREACH(SERVER_COMMANDS, true, { localcmd(sprintf("alias %1$s \"%2$s %1$s ${* ?}\"\n", it.m_name, "qc_cmd_sv")); });
 }