From 242aa6317878867a297871e0a7593e4c4d45304c Mon Sep 17 00:00:00 2001 From: Alexander Akulich Date: Tue, 12 Jan 2021 00:54:08 +0300 Subject: [PATCH] ddracechat.h is used by the client, so move it to src/game where ddracecommands.h already is. --- CMakeLists.txt | 2 +- src/game/client/components/chat.cpp | 2 +- src/game/{server => }/ddracechat.h | 0 src/game/server/gamecontext.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/game/{server => }/ddracechat.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7456522d..4e4af17b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1560,6 +1560,7 @@ set_src(GAME_SHARED GLOB src/game bezier.h collision.cpp collision.h + ddracechat.h ddracecommands.h extrainfo.cpp extrainfo.h @@ -1944,7 +1945,6 @@ set_src(ENGINE_SERVER GLOB_RECURSE src/engine/server set_src(GAME_SERVER GLOB_RECURSE src/game/server alloc.h ddracechat.cpp - ddracechat.h ddracecommands.cpp entities/character.cpp entities/character.h diff --git a/src/game/client/components/chat.cpp b/src/game/client/components/chat.cpp index 797551260..9d5fe1397 100644 --- a/src/game/client/components/chat.cpp +++ b/src/game/client/components/chat.cpp @@ -35,7 +35,7 @@ CChat::CChat() } #define CHAT_COMMAND(name, params, flags, callback, userdata, help) RegisterCommand(name, params, flags, help); -#include +#include m_Commands.sort_range(); m_Mode = MODE_NONE; diff --git a/src/game/server/ddracechat.h b/src/game/ddracechat.h similarity index 100% rename from src/game/server/ddracechat.h rename to src/game/ddracechat.h diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index 6cf72480c..d7f578174 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -3047,7 +3047,7 @@ void CGameContext::OnConsoleInit() #define CONSOLE_COMMAND(name, params, flags, callback, userdata, help) m_pConsole->Register(name, params, flags, callback, userdata, help); #include #define CHAT_COMMAND(name, params, flags, callback, userdata, help) m_pConsole->Register(name, params, flags, callback, userdata, help); -#include "ddracechat.h" +#include } void CGameContext::OnInit(/*class IKernel *pKernel*/)