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

This reverts commit 4ff2efea43, reversing
changes made to e811e3975b.
This commit is contained in:
KimLS
2013-06-27 12:50:20 -07:00
parent 82f4b4ee53
commit d25205d9d3
29 changed files with 181 additions and 151 deletions
+1 -1
View File
@@ -37,4 +37,4 @@ IF(UNIX)
ADD_DEFINITIONS(-fPIC)
ENDIF(UNIX)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin)
SET(EXECUTABLE_OUTPUT_PATH ../Bin)
+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);
}