pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
world/AdventureManager.cpp
+4
View File
@@ -27,6 +27,10 @@ AdventureManager::~AdventureManager()
safe_delete(process_timer);
safe_delete(save_timer);
safe_delete(leaderboard_info_timer);
for (auto iter = adventure_templates.begin(); iter != adventure_templates.end(); ++iter) {
delete iter->second;
}
}
void AdventureManager::Process()
world/CMakeLists.txt
+1 -1
View File
@@ -92,4 +92,4 @@ IF(UNIX)
ADD_DEFINITIONS(-fPIC)
ENDIF(UNIX)
SET(EXECUTABLE_OUTPUT_PATH ../Bin)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin)
world/net.cpp
+34 -23
View File
@@ -126,7 +126,7 @@ int main(int argc, char** argv) {
_log(WORLD__INIT, "Loading server configuration..");
if (!WorldConfig::LoadConfig()) {
_log(WORLD__INIT_ERR, "Loading server configuration failed.");
return(1);
return 1;
}
const WorldConfig *Config=WorldConfig::get();
@@ -144,16 +144,16 @@ int main(int argc, char** argv) {
if (signal(SIGINT, CatchSignal) == SIG_ERR) {
_log(WORLD__INIT_ERR, "Could not set signal handler");
return 0;
return 1;
}
if (signal(SIGTERM, CatchSignal) == SIG_ERR) {
_log(WORLD__INIT_ERR, "Could not set signal handler");
return 0;
return 1;
}
#ifndef WIN32
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
_log(WORLD__INIT_ERR, "Could not set signal handler");
return 0;
return 1;
}
#endif
@@ -182,7 +182,7 @@ int main(int argc, char** argv) {
Config->DatabaseDB.c_str(),
Config->DatabasePort)) {
_log(WORLD__INIT_ERR, "Cannot continue without a database connection.");
return(1);
return 1;
}
dbasync = new DBAsync(&database);
guild_mgr.SetDatabase(&database);
@@ -204,8 +204,8 @@ int main(int argc, char** argv) {
else if (database.GetVariable("disablecommandline", tmp, 2)) {
if (strlen(tmp) == 1) {
if (tmp[0] == '1') {
std::cout << "Command line disabled in database... exiting" << std::endl;
return 0;
std::cerr << "Command line disabled in database... exiting" << std::endl;
return 1;
}
}
}
@@ -213,11 +213,14 @@ int main(int argc, char** argv) {
if (argc == 5) {
if (Seperator::IsNumber(argv[4])) {
if (atoi(argv[4]) >= 0 && atoi(argv[4]) <= 255) {
if (database.CreateAccount(argv[2], argv[3], atoi(argv[4])) == 0)
std::cout << "database.CreateAccount failed." << std::endl;
else
if (database.CreateAccount(argv[2], argv[3], atoi(argv[4])) == 0) {
std::cerr << "database.CreateAccount failed." << std::endl;
return 1;
}
else {
std::cout << "Account created: Username='" << argv[2] << "', Password='" << argv[3] << "', status=" << argv[4] << std::endl;
return 0;
return 0;
}
}
}
}
@@ -230,11 +233,14 @@ int main(int argc, char** argv) {
if (Seperator::IsNumber(argv[3])) {
if (atoi(argv[3]) >= 0 && atoi(argv[3]) <= 255) {
if (database.SetAccountStatus(argv[2], atoi(argv[3])))
if (database.SetAccountStatus(argv[2], atoi(argv[3]))) {
std::cout << "Account flagged: Username='" << argv[2] << "', status=" << argv[3] << std::endl;
else
std::cout << "database.SetAccountStatus failed." << std::endl;
return 0;
return 0;
}
else {
std::cerr << "database.SetAccountStatus failed." << std::endl;
return 1;
}
}
}
}
@@ -245,25 +251,30 @@ int main(int argc, char** argv) {
else if (strcasecmp(argv[1], "startzone") == 0) {
if (argc == 3) {
if (strlen(argv[2]) < 3) {
std::cout << "Error: zone name too short" << std::endl;
std::cerr << "Error: zone name too short" << std::endl;
return 1;
}
else if (strlen(argv[2]) > 15) {
std::cout << "Error: zone name too long" << std::endl;
std::cerr << "Error: zone name too long" << std::endl;
return 1;
}
else {
if (database.SetVariable("startzone", argv[2]))
if (database.SetVariable("startzone", argv[2])) {
std::cout << "Starting zone changed: '" << argv[2] << "'" << std::endl;
else
std::cout << "database.SetVariable failed." << std::endl;
return 0;
}
else {
std::cerr << "database.SetVariable failed." << std::endl;
return 1;
}
}
return 0;
}
std::cout << "Usage: world startzone zoneshortname" << std::endl;
return 0;
}
else {
std::cout << "Error, unknown command line option" << std::endl;
return 0;
std::cerr << "Error, unknown command line option" << std::endl;
return 1;
}
}