mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-17 03:08:26 +00:00
Revert "Revert "Merge pull request #77 from j883376/cleanups""
This reverts commit d25205d9d3.
This commit is contained in:
@@ -37,4 +37,4 @@ IF(UNIX)
|
||||
ADD_DEFINITIONS(-fPIC)
|
||||
ENDIF(UNIX)
|
||||
|
||||
SET(EXECUTABLE_OUTPUT_PATH ../Bin)
|
||||
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin)
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user