From 5dbc1d4c086031606f03d6d57b6504d1d888563e Mon Sep 17 00:00:00 2001 From: sfan5 Date: Wed, 24 Jan 2024 19:13:03 +0100 Subject: [PATCH] Move some files to src/server/ --- src/CMakeLists.txt | 4 ---- src/client/clientlauncher.cpp | 1 - src/script/lua_api/l_mainmenu.cpp | 1 - src/server.cpp | 6 +++--- src/server.h | 2 +- src/server/CMakeLists.txt | 4 ++++ src/{ => server}/ban.cpp | 0 src/{ => server}/ban.h | 0 src/{ => server}/clientiface.cpp | 0 src/{ => server}/clientiface.h | 0 src/{ => server}/rollback.cpp | 0 src/{ => server}/rollback.h | 0 src/{ => server}/serverlist.cpp | 0 src/{ => server}/serverlist.h | 4 +++- src/unittest/test_ban.cpp | 2 +- 15 files changed, 12 insertions(+), 12 deletions(-) rename src/{ => server}/ban.cpp (100%) rename src/{ => server}/ban.h (100%) rename src/{ => server}/clientiface.cpp (100%) rename src/{ => server}/clientiface.h (100%) rename src/{ => server}/rollback.cpp (100%) rename src/{ => server}/rollback.h (100%) rename src/{ => server}/serverlist.cpp (100%) rename src/{ => server}/serverlist.h (93%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c6f998a81d84..6879f2e86d1d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -366,9 +366,7 @@ set(common_SRCS ${mapgen_SRCS} ${server_SRCS} ${content_SRCS} - ban.cpp chat.cpp - clientiface.cpp collision.cpp content_mapnode.cpp content_nodemeta.cpp @@ -413,12 +411,10 @@ set(common_SRCS raycast.cpp reflowscan.cpp remoteplayer.cpp - rollback.cpp rollback_interface.cpp serialization.cpp server.cpp serverenvironment.cpp - serverlist.cpp settings.cpp staticobject.cpp terminal_chat_console.cpp diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp index eb4362348a90..aaaf5c4837c8 100644 --- a/src/client/clientlauncher.cpp +++ b/src/client/clientlauncher.cpp @@ -27,7 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "chat.h" #include "gettext.h" #include "profiler.h" -#include "serverlist.h" #include "gui/guiEngine.h" #include "fontengine.h" #include "clientlauncher.h" diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp index eef3cd635119..5bcf0f228e9e 100644 --- a/src/script/lua_api/l_mainmenu.cpp +++ b/src/script/lua_api/l_mainmenu.cpp @@ -32,7 +32,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "convert_json.h" #include "content/content.h" #include "content/subgames.h" -#include "serverlist.h" #include "mapgen/mapgen.h" #include "settings.h" #include "client/client.h" diff --git a/src/server.cpp b/src/server.cpp index fee0f557f913..177144c094cd 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "network/connection.h" #include "network/networkprotocol.h" #include "network/serveropcodes.h" -#include "ban.h" +#include "server/ban.h" #include "environment.h" #include "map.h" #include "threading/mutex_auto_lock.h" @@ -49,9 +49,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "content_nodemeta.h" #include "content/mods.h" #include "modchannels.h" -#include "serverlist.h" +#include "server/serverlist.h" #include "util/string.h" -#include "rollback.h" +#include "server/rollback.h" #include "util/serialize.h" #include "util/thread.h" #include "defaultsettings.h" diff --git a/src/server.h b/src/server.h index 2915c88cd314..1c2394fd3dd8 100644 --- a/src/server.h +++ b/src/server.h @@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/basic_macros.h" #include "util/metricsbackend.h" #include "serverenvironment.h" -#include "clientiface.h" +#include "server/clientiface.h" #include "chatmessage.h" #include "sound.h" #include "translation.h" diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 0a5a8f3a754c..d4afbc55bc15 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -1,9 +1,13 @@ set(server_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/activeobjectmgr.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ban.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/clientiface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/luaentity_sao.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mods.cpp ${CMAKE_CURRENT_SOURCE_DIR}/player_sao.cpp ${CMAKE_CURRENT_SOURCE_DIR}/serveractiveobject.cpp ${CMAKE_CURRENT_SOURCE_DIR}/serverinventorymgr.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/serverlist.cpp ${CMAKE_CURRENT_SOURCE_DIR}/unit_sao.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rollback.cpp PARENT_SCOPE) diff --git a/src/ban.cpp b/src/server/ban.cpp similarity index 100% rename from src/ban.cpp rename to src/server/ban.cpp diff --git a/src/ban.h b/src/server/ban.h similarity index 100% rename from src/ban.h rename to src/server/ban.h diff --git a/src/clientiface.cpp b/src/server/clientiface.cpp similarity index 100% rename from src/clientiface.cpp rename to src/server/clientiface.cpp diff --git a/src/clientiface.h b/src/server/clientiface.h similarity index 100% rename from src/clientiface.h rename to src/server/clientiface.h diff --git a/src/rollback.cpp b/src/server/rollback.cpp similarity index 100% rename from src/rollback.cpp rename to src/server/rollback.cpp diff --git a/src/rollback.h b/src/server/rollback.h similarity index 100% rename from src/rollback.h rename to src/server/rollback.h diff --git a/src/serverlist.cpp b/src/server/serverlist.cpp similarity index 100% rename from src/serverlist.cpp rename to src/server/serverlist.cpp diff --git a/src/serverlist.h b/src/server/serverlist.h similarity index 93% rename from src/serverlist.h rename to src/server/serverlist.h index 1466eeaf6574..2e2b8590fb42 100644 --- a/src/serverlist.h +++ b/src/server/serverlist.h @@ -24,6 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once +// Note that client serverlist handling is all in Lua, this is only announcements now. + namespace ServerList { #if USE_CURL @@ -36,4 +38,4 @@ void sendAnnounce(AnnounceAction, u16 port, bool dedicated = false); #endif -} // namespace ServerList +} diff --git a/src/unittest/test_ban.cpp b/src/unittest/test_ban.cpp index 2b9ccc218ede..6b36211ab522 100644 --- a/src/unittest/test_ban.cpp +++ b/src/unittest/test_ban.cpp @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "test.h" -#include "ban.h" +#include "server/ban.h" class TestBan : public TestBase {