pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-23 02:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

normalize includes: eqlaunch

Browse Source
This commit is contained in:
brainiac 2025-12-17 09:33:40 -08:00 committed by Alex
parent d306e139e8
commit 227553337e
6 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eqlaunch/CMakeLists.txt
View File

@ -16,6 +16,7 @@ add_executable(eqlaunch ${eqlaunch_sources} ${eqlaunch_headers})
install(TARGETS eqlaunch RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS eqlaunch RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
target_link_libraries(eqlaunch common) target_link_libraries(eqlaunch common)
target_include_directories(eqlaunch PRIVATE ..)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set_property(TARGET eqlaunch PROPERTY FOLDER executables/tools) set_property(TARGET eqlaunch PROPERTY FOLDER executables/tools)

23
eqlaunch/eqlaunch.cpp
View File

@ -16,17 +16,18 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "../common/global_define.h" #include "common/crash.h"
#include "../common/eqemu_logsys.h" #include "common/eqemu_config.h"
#include "../common/proc_launcher.h" #include "common/eqemu_logsys.h"
#include "../common/eqemu_config.h" #include "common/global_define.h"
#include "../common/servertalk.h" #include "common/path_manager.h"
#include "../common/path_manager.h" #include "common/platform.h"
#include "../common/platform.h" #include "common/proc_launcher.h"
#include "../common/crash.h" #include "common/servertalk.h"
#include "../common/unix.h" #include "common/unix.h"
#include "worldserver.h" #include "eqlaunch/worldserver.h"
#include "zone_launch.h" #include "eqlaunch/zone_launch.h"
#include <vector> #include <vector>
#include <map> #include <map>
#include <set> #include <set>

13
eqlaunch/worldserver.cpp
View File

@ -16,13 +16,14 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "../common/global_define.h"
#include "../common/eqemu_logsys.h"
#include "../common/servertalk.h"
#include "../common/eqemu_config.h"
#include "../common/strings.h"
#include "worldserver.h" #include "worldserver.h"
#include "zone_launch.h"
#include "common/eqemu_config.h"
#include "common/eqemu_logsys.h"
#include "common/global_define.h"
#include "common/servertalk.h"
#include "common/strings.h"
#include "eqlaunch/zone_launch.h"
WorldServer::WorldServer(std::map<std::string, ZoneLaunch *> &zones, const char *name, const EQEmuConfig *config) WorldServer::WorldServer(std::map<std::string, ZoneLaunch *> &zones, const char *name, const EQEmuConfig *config)
: m_name(name), : m_name(name),

15
eqlaunch/worldserver.h
View File

@ -15,14 +15,15 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef WORLDSERVER_H
#define WORLDSERVER_H
#include "../common/net/servertalk_client_connection.h" #pragma once
#include <memory>
#include <string> #include "common/net/servertalk_client_connection.h"
#include <queue>
#include <map> #include <map>
#include <memory>
#include <queue>
#include <string>
class ZoneLaunch; class ZoneLaunch;
class EQEmuConfig; class EQEmuConfig;
@ -44,5 +45,3 @@ private:
const EQEmuConfig *const m_config; const EQEmuConfig *const m_config;
std::map<std::string, ZoneLaunch *> &m_zones; std::map<std::string, ZoneLaunch *> &m_zones;
}; };
#endif

9
eqlaunch/zone_launch.cpp
View File

@ -16,11 +16,12 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "../common/global_define.h"
#include "../common/eqemu_logsys.h"
#include "../common/eqemu_config.h"
#include "zone_launch.h" #include "zone_launch.h"
#include "worldserver.h"
#include "common/eqemu_config.h"
#include "common/eqemu_logsys.h"
#include "common/global_define.h"
#include "eqlaunch/worldserver.h"
//static const uint32 ZONE_RESTART_DELAY = 10000; //static const uint32 ZONE_RESTART_DELAY = 10000;
//static const uint32 ZONE_TERMINATE_WAIT = 10000; //static const uint32 ZONE_TERMINATE_WAIT = 10000;

11
eqlaunch/zone_launch.h
View File

@ -15,11 +15,12 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef ZONELAUNCH_H_
#define ZONELAUNCH_H_
#include "../common/proc_launcher.h" #pragma once
#include "../common/timer.h"
#include "common/proc_launcher.h"
#include "common/timer.h"
#include <string> #include <string>
class WorldServer; class WorldServer;
@ -71,5 +72,3 @@ private:
static int s_running; static int s_running;
static Timer s_startTimer; static Timer s_startTimer;
}; };
#endif /*ZONELAUNCH_H_*/