From 42c7f6369c43f43b6c5f54bab89e2fff14aee2ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= Date: Sat, 3 May 2014 21:30:15 +0300 Subject: [PATCH] Fixed|Console: "clear" is a client-side command --- doomsday/client/src/dd_main.cpp | 11 +++++++++++ doomsday/libdoomsday/src/console/exec.cpp | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/doomsday/client/src/dd_main.cpp b/doomsday/client/src/dd_main.cpp index d214d0d90e..e01f4da355 100644 --- a/doomsday/client/src/dd_main.cpp +++ b/doomsday/client/src/dd_main.cpp @@ -3217,6 +3217,16 @@ D_CMD(HelpWhat) return true; } +#ifdef __CLIENT__ +D_CMD(Clear) +{ + DENG2_UNUSED3(src, argc, argv); + + ClientWindow::main().console().clearLog(); + return true; +} +#endif + static void consoleRegister() { C_VAR_CHARPTR("file-startup", &startupFiles, 0, 0, 0); @@ -3245,6 +3255,7 @@ static void consoleRegister() S_Register(); #ifdef __CLIENT__ + C_CMD("clear", "", Clear); C_CMD("update", "", CheckForUpdates); C_CMD("updateandnotify", "", CheckForUpdatesAndNotify); C_CMD("updatesettings", "", ShowUpdateSettings); diff --git a/doomsday/libdoomsday/src/console/exec.cpp b/doomsday/libdoomsday/src/console/exec.cpp index af847a4d7d..6c2e266593 100644 --- a/doomsday/libdoomsday/src/console/exec.cpp +++ b/doomsday/libdoomsday/src/console/exec.cpp @@ -87,7 +87,6 @@ typedef struct execbuff_s { D_CMD(AddSub); D_CMD(IncDec); D_CMD(Alias); -D_CMD(Clear); D_CMD(Echo); D_CMD(Help); D_CMD(If); @@ -119,7 +118,6 @@ void Con_Register(void) C_CMD("add", NULL, AddSub); C_CMD("after", "is", Wait); C_CMD("alias", NULL, Alias); - C_CMD("clear", "", Clear); C_CMD("dec", NULL, IncDec); C_CMD("echo", "s*", Echo); C_CMD("print", "s*", Echo); @@ -921,16 +919,6 @@ static void makeAlias(char *aName, char *command) Con_AddAlias(aName, command); } -D_CMD(Clear) -{ - DENG2_UNUSED3(src, argc, argv); - -#ifdef __CLIENT__ - ClientWindow::main().console().clearLog(); -#endif - return true; -} - D_CMD(Alias) { DENG2_UNUSED(src);