Undo Queryserv refactoring because our database class stuff is stupid

This commit is contained in:
Akkadius
2015-01-20 05:30:19 -06:00
parent 7f2f6a8612
commit a64c21eb96
5 changed files with 72 additions and 38 deletions
+1 -3
View File
@@ -17,7 +17,6 @@
*/
#include "../common/database.h"
#include "../common/global_define.h"
#include "../common/eqemu_logsys.h"
#include "../common/opcodemgr.h"
@@ -37,7 +36,6 @@ volatile bool RunLoops = true;
TimeoutManager timeout_manager;
Database database;
QSDatabase qs_database;
LFGuildManager lfguildmanager;
std::string WorldShortName;
const queryservconfig *Config;
@@ -79,7 +77,7 @@ int main() {
Log.Out(Logs::General, Logs::QS_Server, "Connecting to MySQL...");
/* MySQL Connection */
if (!qs_database.Connect(
if (!database.Connect(
Config->QSDatabaseHost.c_str(),
Config->QSDatabaseUsername.c_str(),
Config->QSDatabasePassword.c_str(),