aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver/Main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/worldserver/Main.cpp')
-rwxr-xr-xsrc/server/worldserver/Main.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 4a09fb718b7..334b3e27bf0 100755
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -58,7 +58,7 @@ uint32 realmID; ///< Id of the realm
/// Print out the usage string for this program on the console.
void usage(const char *prog)
{
- sLog.outString("Usage: \n %s [<options>]\n"
+ sLog->outString("Usage: \n %s [<options>]\n"
" -c config_file use config_file as configuration file\n\r"
#ifdef _WIN32
" Running as service functions:\n\r"
@@ -83,7 +83,7 @@ extern int main(int argc, char **argv)
{
if( ++c >= argc )
{
- sLog.outError("Runtime-Error: -c option requires an input argument");
+ sLog->outError("Runtime-Error: -c option requires an input argument");
usage(argv[0]);
return 1;
}
@@ -99,25 +99,25 @@ extern int main(int argc, char **argv)
{
if( ++c >= argc )
{
- sLog.outError("Runtime-Error: -s option requires an input argument");
+ sLog->outError("Runtime-Error: -s option requires an input argument");
usage(argv[0]);
return 1;
}
if( strcmp(argv[c],"install") == 0)
{
if (WinServiceInstall())
- sLog.outString("Installing service");
+ sLog->outString("Installing service");
return 1;
}
else if( strcmp(argv[c],"uninstall") == 0)
{
if(WinServiceUninstall())
- sLog.outString("Uninstalling service");
+ sLog->outString("Uninstalling service");
return 1;
}
else
{
- sLog.outError("Runtime-Error: unsupported option %s",argv[c]);
+ sLog->outError("Runtime-Error: unsupported option %s",argv[c]);
usage(argv[0]);
return 1;
}
@@ -131,20 +131,20 @@ extern int main(int argc, char **argv)
++c;
}
- if (!sConfig.SetSource(cfg_file))
+ if (!sConfig->SetSource(cfg_file))
{
- sLog.outError("Invalid or missing configuration file : %s", cfg_file);
- sLog.outError("Verify that the file exists and has \'[worldserver]' written in the top of the file!");
+ sLog->outError("Invalid or missing configuration file : %s", cfg_file);
+ sLog->outError("Verify that the file exists and has \'[worldserver]' written in the top of the file!");
return 1;
}
- sLog.outString("Using configuration file %s.", cfg_file);
+ sLog->outString("Using configuration file %s.", cfg_file);
- sLog.outDetail("%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
- sLog.outDetail("Using ACE: %s", ACE_VERSION);
+ sLog->outDetail("%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
+ sLog->outDetail("Using ACE: %s", ACE_VERSION);
///- and run the 'Master'
/// \todo Why do we need this 'Master'? Can't all of this be in the Main as for Realmd?
- int ret = sMaster.Run();
+ int ret = sMaster->Run();
// at sMaster return function exist with codes
// 0 - normal shutdown