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
+1 -1
View File
@@ -43,4 +43,4 @@ IF(UNIX)
ADD_DEFINITIONS(-fPIC)
ENDIF(UNIX)
SET(EXECUTABLE_OUTPUT_PATH ../Bin)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin)
+7 -7
View File
@@ -37,7 +37,7 @@ int main(int argc, char **argv) {
LogFile->write(EQEMuLog::Status, "Shared Memory Loader Program");
if(!EQEmuConfig::LoadConfig()) {
LogFile->write(EQEMuLog::Error, "Unable to load configuration file.");
return 0;
return 1;
}
const EQEmuConfig *config = EQEmuConfig::get();
@@ -51,7 +51,7 @@ int main(int argc, char **argv) {
config->DatabasePassword.c_str(), config->DatabaseDB.c_str(), config->DatabasePort)) {
LogFile->write(EQEMuLog::Error, "Unable to connect to the database, cannot continue without a "
"database connection");
return 0;
return 1;
}
bool load_all = true;
@@ -111,7 +111,7 @@ int main(int argc, char **argv) {
LoadItems(&database);
} catch(std::exception &ex) {
LogFile->write(EQEMuLog::Error, "%s", ex.what());
return 0;
return 1;
}
}
@@ -121,7 +121,7 @@ int main(int argc, char **argv) {
LoadFactions(&database);
} catch(std::exception &ex) {
LogFile->write(EQEMuLog::Error, "%s", ex.what());
return 0;
return 1;
}
}
@@ -131,7 +131,7 @@ int main(int argc, char **argv) {
LoadLoot(&database);
} catch(std::exception &ex) {
LogFile->write(EQEMuLog::Error, "%s", ex.what());
return 0;
return 1;
}
}
@@ -141,7 +141,7 @@ int main(int argc, char **argv) {
LoadSkillCaps(&database);
} catch(std::exception &ex) {
LogFile->write(EQEMuLog::Error, "%s", ex.what());
return 0;
return 1;
}
}
@@ -151,7 +151,7 @@ int main(int argc, char **argv) {
LoadSpells(&database);
} catch(std::exception &ex) {
LogFile->write(EQEMuLog::Error, "%s", ex.what());
return 0;
return 1;
}
}