Moved some around, more renames

This commit is contained in:
KimLS committed 2014-08-21 22:43:33 -07:00
1 parent 504a8b19ce
commit cd0824ee71
63 files changed
+8 -10

No files matched your search

+2 -2
View File
@@ -3,12 +3,12 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
SET(eqlaunch_sources
eqlaunch.cpp
worldserver.cpp
ZoneLaunch.cpp
zone_launch.cpp
)
SET(eqlaunch_headers
worldserver.h
ZoneLaunch.h
zone_launch.h
)
ADD_EXECUTABLE(eqlaunch ${eqlaunch_sources} ${eqlaunch_headers})
+1 -1
View File
@@ -23,7 +23,7 @@
#include "../common/platform.h"
#include "../common/crash.h"
#include "worldserver.h"
#include "ZoneLaunch.h"
#include "zone_launch.h"
#include <vector>
#include <map>
#include <set>
+2 -3
View File
@@ -16,12 +16,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../common/debug.h"
#include "worldserver.h"
#include "../common/servertalk.h"
#include "ZoneLaunch.h"
#include "../common/eqemu_config.h"
#include "../common/string_util.h"
#include "worldserver.h"
#include "zone_launch.h"
WorldServer::WorldServer(std::map<std::string, ZoneLaunch *> &zones, const char *name, const EQEmuConfig *config)
: WorldConnection(EmuTCPConnection::packetModeLauncher, config->SharedKey.c_str()),
@@ -16,11 +16,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "ZoneLaunch.h"
#include "worldserver.h"
#include "../common/debug.h"
#include "../common/eqemu_config.h"
#include "zone_launch.h"
#include "worldserver.h"
//static const uint32 ZONE_RESTART_DELAY = 10000;
//static const uint32 ZONE_TERMINATE_WAIT = 10000;
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.