Registry API: add REGISTRY_GET

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / commands / cl_cmd.qh

diff --git a/qcsrc/client/commands/cl_cmd.qh b/qcsrc/client/commands/cl_cmd.qh
index 23d72ff60e9020eab24806688f32e80c08d1d96e..725baa408e9c0c47dd748a596e26a751e1b05683 100644 (file)
--- a/qcsrc/client/commands/cl_cmd.qh
+++ b/qcsrc/client/commands/cl_cmd.qh
@@ -1,27 +1,26 @@
-#ifndef CLIENT_COMMANDS_CL_CMD_H
-#define CLIENT_COMMANDS_CL_CMD_H
+#pragma once
 
-void Cmd_HUD_SetFields(int);
-void Cmd_HUD_Help();
+void Cmd_Scoreboard_SetFields(int);
+void Cmd_Scoreboard_Help();
+void ConsoleCommand_macro_init();
 
 // used by common/command/generic.qc:GenericCommand_dumpcommands to list all commands into a .txt file
 void LocalCommand_macro_write_aliases(int fh);
 
 REGISTRY(CLIENT_COMMANDS, BITS(7))
-#define CLIENT_COMMANDS_from(i) _CLIENT_COMMANDS_from(i, NULL)
 REGISTER_REGISTRY(CLIENT_COMMANDS)
 REGISTRY_SORT(CLIENT_COMMANDS)
 
+REGISTRY_DEFINE_GET(CLIENT_COMMANDS, NULL)
+
 #define CLIENT_COMMAND(id, description) \
        CLASS(clientcommand_##id, Command) \
                ATTRIB(clientcommand_##id, m_name, string, #id); \
        ATTRIB(clientcommand_##id, m_description, string, description); \
        ENDCLASS(clientcommand_##id) \
     REGISTER(CLIENT_COMMANDS, CMD_CL, id, m_id, NEW(clientcommand_##id)); \
-       METHOD(clientcommand_##id, m_invokecmd, void(int request, entity caller, int arguments, string command))
+       METHOD(clientcommand_##id, m_invokecmd, void(clientcommand_##id this, int request, entity caller, int arguments, string command))
 
 STATIC_INIT(CLIENT_COMMANDS_aliases) {
-       FOREACH(CLIENT_COMMANDS, true, LAMBDA(localcmd(sprintf("alias %1$s \"%2$s %1$s ${* ?}\"\n", it.m_name, "qc_cmd_cl"))));
+       FOREACH(CLIENT_COMMANDS, true, localcmd(sprintf("alias %1$s \"%2$s %1$s ${* ?}\"\n", it.m_name, "qc_cmd_cl")));
 }
-
-#endif