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
ucs/CMakeLists.txt
+1 -1
View File
@@ -46,4 +46,4 @@ IF(UNIX)
ADD_DEFINITIONS(-fPIC)
ENDIF(UNIX)
SET(EXECUTABLE_OUTPUT_PATH ../Bin)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/Bin)
ucs/database.cpp
+1 -1
View File
@@ -402,7 +402,7 @@ void Database::SendHeaders(Client *c) {
char Buf[100];
my_ulonglong NumRows = mysql_num_rows(result);
uint32 NumRows = mysql_num_rows(result);
int HeaderCountPacketLength = 0;
ucs/ucs.cpp
+4 -4
View File
@@ -82,7 +82,7 @@ int main() {
_log(UCS__INIT, "Loading server configuration failed.");
return(1);
return 1;
}
Config = ucsconfig::get();
@@ -103,7 +103,7 @@ int main() {
Config->DatabaseDB.c_str(),
Config->DatabasePort)) {
_log(WORLD__INIT_ERR, "Cannot continue without a database connection.");
return(1);
return 1;
}
char tmp[64];
@@ -137,11 +137,11 @@ int main() {
if (signal(SIGINT, CatchSignal) == SIG_ERR) {
_log(UCS__ERROR, "Could not set signal handler");
return 0;
return 1;
}
if (signal(SIGTERM, CatchSignal) == SIG_ERR) {
_log(UCS__ERROR, "Could not set signal handler");
return 0;
return 1;
}
worldserver = new WorldServer;