Revert "Revert "Merge pull request #77 from j883376/cleanups""

This reverts commit d25205d9d3.
This commit is contained in:
j883376
2013-06-28 04:25:44 -04:00
parent d25205d9d3
commit 0578f45490
29 changed files with 151 additions and 181 deletions
+3 -3
View File
@@ -44,13 +44,13 @@ int main(int argc, char *argv[]) {
}
if(launcher_name.length() < 1) {
_log(LAUNCHER__ERROR, "You must specfify a launcher name as the first argument to this program.");
return(1);
return 1;
}
_log(LAUNCHER__INIT, "Loading server configuration..");
if (!EQEmuConfig::LoadConfig()) {
_log(LAUNCHER__ERROR, "Loading server configuration failed.");
return(1);
return 1;
}
const EQEmuConfig *Config = EQEmuConfig::get();
@@ -173,7 +173,7 @@ int main(int argc, char *argv[]) {
delete zone->second;
}
return(0);
return 0;
}