mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 15:17:46 +00:00
Code Activity

Merge branch 'master' of https://github.com/SapphireMordred/Sapphire

Browse source
This commit is contained in:
Mordred 2017-08-29 17:30:11 +02:00
commit bf51a4d4c9
3 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/config/settings_zone.xml
View file

@ -1,11 +1,9 @@
<Settings> <Settings>
<General> <General>
<!-- ID of this server -->
<ServerId>100</ServerId>
<!-- Port the zone server accepts game conenctions on --> <!-- Port the zone server accepts game conenctions on -->
<ListenPort>54992</ListenPort> <ListenPort>54992</ListenPort>
<!-- Ip the zone server conenctions on --> <!-- Ip the zone server conenctions on -->
<ListenIp>127.0.0.1</ListenIp> <ListenIp>127.0.0.1</ListenIp>
<!-- Path of FFXIV dat files --> <!-- Path of FFXIV dat files -->
<DataPath>C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv</DataPath> <DataPath>C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv</DataPath>

3
src/servers/Server_Zone/ServerZone.h
View file

@ -20,9 +20,6 @@ namespace Core {
void run( int32_t argc, char* argv[] ); void run( int32_t argc, char* argv[] );
void setServerId( uint16_t serverId );
uint16_t getServerId() const;
bool createSession( uint32_t sessionId ); bool createSession( uint32_t sessionId );
void removeSession( uint32_t sessionId ); void removeSession( uint32_t sessionId );
void removeSession( std::string playerName ); void removeSession( std::string playerName );

13
src/servers/Server_Zone/mainGameServer.cpp
View file

@ -7,19 +7,6 @@ Core::ServerZone g_serverZone( "config/settings_zone.xml" );
int main( int32_t argc, char* argv[] ) 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 )
{
auto arg = boost::to_lower_copy( std::string( argv[i] ) );
// trim '-' from start of arg
arg = arg.erase( 0, arg.find_first_not_of( '-' ) );
if( arg == "sId" && argc > i + 1 )
{
g_serverZone.setServerId( std::atol( argv[i + 1] ) );
break;
}
}
g_serverZone.run( argc, argv ); g_serverZone.run( argc, argv );
return 0; return 0;
} }