diff options
| -rw-r--r-- | cmake/FindPCHSupport.cmake | 4 | ||||
| -rw-r--r-- | src/server/authserver/Main.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Chat/Commands/Level3.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 10 | ||||
| -rw-r--r-- | src/server/shared/SystemConfig.h | 5 |
5 files changed, 9 insertions, 14 deletions
diff --git a/cmake/FindPCHSupport.cmake b/cmake/FindPCHSupport.cmake index d96a287e1a3..0cb3af8c5f0 100644 --- a/cmake/FindPCHSupport.cmake +++ b/cmake/FindPCHSupport.cmake @@ -47,7 +47,7 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags) IF(CMAKE_COMPILER_IS_GNUCXX) GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE) IF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32) - LIST(APPEND ${_out_compile_flags} "${${_out_compile_flags}} -fPIC") + LIST(APPEND ${_out_compile_flags} -fPIC") ENDIF() ELSE(CMAKE_COMPILER_IS_GNUCXX) @@ -312,4 +312,4 @@ MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _input) endif(CMAKE_GENERATOR MATCHES Xcode) endif(CMAKE_GENERATOR MATCHES Visual*) -ENDMACRO(ADD_NATIVE_PRECOMPILED_HEADER)
\ No newline at end of file +ENDMACRO(ADD_NATIVE_PRECOMPILED_HEADER) diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index 49022059240..88a98cd6cdb 100644 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -219,7 +219,7 @@ extern int main(int argc, char **argv) ///- Launch the listening network socket RealmAcceptor acceptor; - uint16 rmport = sConfig.GetIntDefault("RealmServerPort", DEFAULT_REALMSERVER_PORT); + uint16 rmport = sConfig.GetIntDefault("RealmServerPort", 3724); std::string bind_ip = sConfig.GetStringDefault("BindIP", "0.0.0.0"); ACE_INET_Addr bind_addr(rmport, bind_ip.c_str()); diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index d42c5495049..6c1fe594e0b 100644 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -6198,7 +6198,7 @@ bool ChatHandler::HandleServerPLimitCommand(const char *args) else if (strncmp(param,"administrator",l) == 0) sWorld.SetPlayerSecurityLimit(SEC_ADMINISTRATOR); else if (strncmp(param,"reset",l) == 0) - sWorld.SetPlayerLimit(sConfig.GetIntDefault("PlayerLimit", DEFAULT_PLAYER_LIMIT)); + sWorld.SetPlayerLimit(sConfig.GetIntDefault("PlayerLimit", 100)); else { int val = atoi(param); diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index dc2cac088a8..0e5bd88fbb8 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -423,7 +423,7 @@ void World::LoadConfigSettings(bool reload) } ///- Read the player limit and the Message of the day from the config file - SetPlayerLimit(sConfig.GetIntDefault("PlayerLimit", DEFAULT_PLAYER_LIMIT), true); + SetPlayerLimit(sConfig.GetIntDefault("PlayerLimit", 100), true); SetMotd(sConfig.GetStringDefault("Motd", "Welcome to a Trinity Core Server.")); ///- Get string for new logins (newly created characters) @@ -628,21 +628,21 @@ void World::LoadConfigSettings(bool reload) if (reload) { - uint32 val = sConfig.GetIntDefault("WorldServerPort", DEFAULT_WORLDSERVER_PORT); + uint32 val = sConfig.GetIntDefault("WorldServerPort", 8085); if (val != m_configs[CONFIG_PORT_WORLD]) sLog.outError("WorldServerPort option can't be changed at worldserver.conf reload, using current value (%u).",m_configs[CONFIG_PORT_WORLD]); } else - m_configs[CONFIG_PORT_WORLD] = sConfig.GetIntDefault("WorldServerPort", DEFAULT_WORLDSERVER_PORT); + m_configs[CONFIG_PORT_WORLD] = sConfig.GetIntDefault("WorldServerPort", 8085); if (reload) { - uint32 val = sConfig.GetIntDefault("SocketSelectTime", DEFAULT_SOCKET_SELECT_TIME); + uint32 val = sConfig.GetIntDefault("SocketSelectTime", 10000); if (val != m_configs[CONFIG_SOCKET_SELECTTIME]) sLog.outError("SocketSelectTime option can't be changed at worldserver.conf reload, using current value (%u).",m_configs[CONFIG_SOCKET_SELECTTIME]); } else - m_configs[CONFIG_SOCKET_SELECTTIME] = sConfig.GetIntDefault("SocketSelectTime", DEFAULT_SOCKET_SELECT_TIME); + m_configs[CONFIG_SOCKET_SELECTTIME] = sConfig.GetIntDefault("SocketSelectTime", 10000); m_configs[CONFIG_SOCKET_TIMEOUTTIME] = sConfig.GetIntDefault("SocketTimeOutTime", 900000); m_configs[CONFIG_SESSION_ADD_DELAY] = sConfig.GetIntDefault("SessionAddDelay", 10000); diff --git a/src/server/shared/SystemConfig.h b/src/server/shared/SystemConfig.h index fd380d72b79..e7ad68fe380 100644 --- a/src/server/shared/SystemConfig.h +++ b/src/server/shared/SystemConfig.h @@ -45,10 +45,5 @@ #else # define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " " _BUILD_DIRECTIVE " Hash: " _HASH " (Unix," _ENDIAN_STRING ")" #endif - -#define DEFAULT_PLAYER_LIMIT 100 -#define DEFAULT_WORLDSERVER_PORT 8085 //8129 -#define DEFAULT_REALMSERVER_PORT 3724 -#define DEFAULT_SOCKET_SELECT_TIME 10000 #endif |