Merge remote-tracking branch 'origin/master' into Juhu/strafehud

[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 65a723389e793645f7f2a674a8277ad85d61f0a8..725baa408e9c0c47dd748a596e26a751e1b05683 100644 (file)
--- a/qcsrc/client/commands/cl_cmd.qh
+++ b/qcsrc/client/commands/cl_cmd.qh
@@ -1,16 +1,18 @@
 #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); \