Move some files to src/server/

This commit is contained in:
sfan5 2024-01-24 19:13:03 +01:00
parent c0f852e016
commit 5dbc1d4c08
15 changed files with 12 additions and 12 deletions

@ -366,9 +366,7 @@ set(common_SRCS
${mapgen_SRCS} ${mapgen_SRCS}
${server_SRCS} ${server_SRCS}
${content_SRCS} ${content_SRCS}
ban.cpp
chat.cpp chat.cpp
clientiface.cpp
collision.cpp collision.cpp
content_mapnode.cpp content_mapnode.cpp
content_nodemeta.cpp content_nodemeta.cpp
@ -413,12 +411,10 @@ set(common_SRCS
raycast.cpp raycast.cpp
reflowscan.cpp reflowscan.cpp
remoteplayer.cpp remoteplayer.cpp
rollback.cpp
rollback_interface.cpp rollback_interface.cpp
serialization.cpp serialization.cpp
server.cpp server.cpp
serverenvironment.cpp serverenvironment.cpp
serverlist.cpp
settings.cpp settings.cpp
staticobject.cpp staticobject.cpp
terminal_chat_console.cpp terminal_chat_console.cpp

@ -27,7 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "chat.h" #include "chat.h"
#include "gettext.h" #include "gettext.h"
#include "profiler.h" #include "profiler.h"
#include "serverlist.h"
#include "gui/guiEngine.h" #include "gui/guiEngine.h"
#include "fontengine.h" #include "fontengine.h"
#include "clientlauncher.h" #include "clientlauncher.h"

@ -32,7 +32,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "convert_json.h" #include "convert_json.h"
#include "content/content.h" #include "content/content.h"
#include "content/subgames.h" #include "content/subgames.h"
#include "serverlist.h"
#include "mapgen/mapgen.h" #include "mapgen/mapgen.h"
#include "settings.h" #include "settings.h"
#include "client/client.h" #include "client/client.h"

@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "network/connection.h" #include "network/connection.h"
#include "network/networkprotocol.h" #include "network/networkprotocol.h"
#include "network/serveropcodes.h" #include "network/serveropcodes.h"
#include "ban.h" #include "server/ban.h"
#include "environment.h" #include "environment.h"
#include "map.h" #include "map.h"
#include "threading/mutex_auto_lock.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_nodemeta.h"
#include "content/mods.h" #include "content/mods.h"
#include "modchannels.h" #include "modchannels.h"
#include "serverlist.h" #include "server/serverlist.h"
#include "util/string.h" #include "util/string.h"
#include "rollback.h" #include "server/rollback.h"
#include "util/serialize.h" #include "util/serialize.h"
#include "util/thread.h" #include "util/thread.h"
#include "defaultsettings.h" #include "defaultsettings.h"

@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/basic_macros.h" #include "util/basic_macros.h"
#include "util/metricsbackend.h" #include "util/metricsbackend.h"
#include "serverenvironment.h" #include "serverenvironment.h"
#include "clientiface.h" #include "server/clientiface.h"
#include "chatmessage.h" #include "chatmessage.h"
#include "sound.h" #include "sound.h"
#include "translation.h" #include "translation.h"

@ -1,9 +1,13 @@
set(server_SRCS set(server_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/activeobjectmgr.cpp ${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}/luaentity_sao.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mods.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mods.cpp
${CMAKE_CURRENT_SOURCE_DIR}/player_sao.cpp ${CMAKE_CURRENT_SOURCE_DIR}/player_sao.cpp
${CMAKE_CURRENT_SOURCE_DIR}/serveractiveobject.cpp ${CMAKE_CURRENT_SOURCE_DIR}/serveractiveobject.cpp
${CMAKE_CURRENT_SOURCE_DIR}/serverinventorymgr.cpp ${CMAKE_CURRENT_SOURCE_DIR}/serverinventorymgr.cpp
${CMAKE_CURRENT_SOURCE_DIR}/serverlist.cpp
${CMAKE_CURRENT_SOURCE_DIR}/unit_sao.cpp ${CMAKE_CURRENT_SOURCE_DIR}/unit_sao.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rollback.cpp
PARENT_SCOPE) PARENT_SCOPE)

@ -24,6 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
// Note that client serverlist handling is all in Lua, this is only announcements now.
namespace ServerList namespace ServerList
{ {
#if USE_CURL #if USE_CURL
@ -36,4 +38,4 @@ void sendAnnounce(AnnounceAction, u16 port,
bool dedicated = false); bool dedicated = false);
#endif #endif
} // namespace ServerList }

@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "test.h" #include "test.h"
#include "ban.h" #include "server/ban.h"
class TestBan : public TestBase class TestBan : public TestBase
{ {