From 243ae9a69b1a62c5addaa445f8c5108815231317 Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Thu, 7 Mar 2024 00:46:04 -0800 Subject: [PATCH] more reverts for diff purposes --- dMasterServer/MasterServer.cpp | 3 +-- dScripts/02_server/Map/AM/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dMasterServer/MasterServer.cpp b/dMasterServer/MasterServer.cpp index 802697e7..4104f5ea 100644 --- a/dMasterServer/MasterServer.cpp +++ b/dMasterServer/MasterServer.cpp @@ -282,8 +282,7 @@ int main(int argc, char** argv) { StartChatServer(); Game::im->GetInstance(0, false, 0); - Game::im->GetInstance(1200, false, 0); - Game::im->GetInstance(1800, false, 0); + Game::im->GetInstance(1000, false, 0); StartAuthServer(); } diff --git a/dScripts/02_server/Map/AM/CMakeLists.txt b/dScripts/02_server/Map/AM/CMakeLists.txt index 9bbe9906..81a37548 100644 --- a/dScripts/02_server/Map/AM/CMakeLists.txt +++ b/dScripts/02_server/Map/AM/CMakeLists.txt @@ -1,4 +1,4 @@ -set(DSCRIPTS_SOURCES_02_SERVER_MAP_AM +set(DSCRIPTS_SOURCES_02_SERVER_MAP_AM "AmConsoleTeleportServer.cpp" "RandomSpawnerFin.cpp" "RandomSpawnerPit.cpp" @@ -17,7 +17,7 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_AM "AmBlueX.cpp" "AmTeapotServer.cpp" "WanderingVendor.cpp" -) + ) add_library(dScriptsServerMapAM OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_AM}) target_include_directories(dScriptsServerMapAM PUBLIC ".")