diff --git a/src/servers/Server_Lobby/ServerLobby.cpp b/src/servers/Server_Lobby/ServerLobby.cpp index 4d239ac8..1adbe99a 100644 --- a/src/servers/Server_Lobby/ServerLobby.cpp +++ b/src/servers/Server_Lobby/ServerLobby.cpp @@ -21,7 +21,7 @@ #include #include - +#include #include Core::Logger g_log; @@ -91,7 +91,7 @@ namespace Core { try { - arg = std::string( args[i] ); + arg = boost::to_lower_copy( std::string( args[i] ) ); val = std::string( args[i + 1] ); // trim '-' from start of arg @@ -100,7 +100,7 @@ namespace Core { if( arg == "ip" ) { // todo: ip addr in config - m_pConfig->setValue< std::string >( "Settings.General.ListenIP", val ); + m_pConfig->setValue< std::string >( "Settings.General.ListenIp", val ); } else if( arg == "p" || arg == "port" ) { @@ -110,11 +110,11 @@ namespace Core { { m_pConfig->setValue< std::string>( "Settings.General.AuthPort", val ); } - else if( arg == "worldIP" || arg == "worldIp" ) + else if( arg == "worldip" || arg == "worldip" ) { m_pConfig->setValue < std::string >( "Settings.General.WorldIp", val ); } - else if( arg == "worldPort" ) + else if( arg == "worldport" ) { m_pConfig->setValue< std::string >( "Settings.General.WorldPort", val ); } @@ -126,8 +126,8 @@ namespace Core { } } - m_port = m_pConfig->getValue< uint16_t >( "Settings.General.ListenPort" ); - m_ip = m_pConfig->getValue< std::string >( "Settings.General.ListenIp" ); + m_port = m_pConfig->getValue< uint16_t >( "Settings.General.ListenPort", 54994 ); + m_ip = m_pConfig->getValue< std::string >( "Settings.General.ListenIp", "0.0.0.0" ); g_restConnector.restHost = m_pConfig->getValue< std::string >( "Settings.General.RestHost" ); g_restConnector.serverSecret = m_pConfig->getValue< std::string >( "Settings.General.ServerSecret" ); diff --git a/src/servers/Server_Lobby/blowfish.cpp b/src/servers/Server_Lobby/blowfish.cpp index 96d3badc..236be5d9 100644 --- a/src/servers/Server_Lobby/blowfish.cpp +++ b/src/servers/Server_Lobby/blowfish.cpp @@ -104,7 +104,7 @@ void BlowFish::initialize (BYTE key[], int32_t keybytes) int32_t v10 = keybytes; - int32_t v9 = (int32_t)key; + int32_t v9 = (uintptr_t)key; int32_t v8 = 0; int32_t v11 = 0; do { diff --git a/src/servers/Server_Zone/ServerZone.cpp b/src/servers/Server_Zone/ServerZone.cpp index 8b7d331a..2582a9c1 100644 --- a/src/servers/Server_Zone/ServerZone.cpp +++ b/src/servers/Server_Zone/ServerZone.cpp @@ -27,6 +27,7 @@ #include "Forwards.h" #include #include +#include Core::Logger g_log; @@ -120,7 +121,7 @@ bool Core::ServerZone::loadSettings( int32_t argc, char* argv[] ) { m_pConfig->setValue< std::string >( "Settings.General.ListenPort", val ); } - else if( arg == "exdPath" || arg == "dataPath" ) + else if( arg == "exdpath" || arg == "datapath" ) { m_pConfig->setValue< std::string >( "Settings.General.DataPath", val ); } @@ -175,8 +176,8 @@ bool Core::ServerZone::loadSettings( int32_t argc, char* argv[] ) } m_serverId = m_serverId ? m_serverId : m_pConfig->getValue< uint16_t >( "Settings.General.ServerId" ); - m_port = m_pConfig->getValue< uint16_t >( "Settings.General.ListenPort" ); - m_ip = m_pConfig->getValue< std::string >( "Settings.General.ListenIp" );; + m_port = m_pConfig->getValue< uint16_t >( "Settings.General.ListenPort", 54992 ); + m_ip = m_pConfig->getValue< std::string >( "Settings.General.ListenIp", "0.0.0.0" );; g_log.info( "Server ID: " + std::to_string( m_serverId ) ); diff --git a/src/servers/Server_Zone/mainGameServer.cpp b/src/servers/Server_Zone/mainGameServer.cpp index 0706dc08..c6d6a6f4 100644 --- a/src/servers/Server_Zone/mainGameServer.cpp +++ b/src/servers/Server_Zone/mainGameServer.cpp @@ -1,6 +1,7 @@ #include #include "ServerZone.h" +#include Core::ServerZone g_serverZone( "config/settings_zone.xml" ); @@ -9,7 +10,7 @@ int main( int32_t argc, char* argv[] ) // i hate to do this, but we need to set this first... for(auto i = 1; i < argc; ++i ) { - std::string arg( argv[i] ); + auto arg = boost::to_lower_copy( std::string( argv[i] ) ); // trim '-' from start of arg arg = arg.erase( 0, arg.find_first_not_of( '-' ) );