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
+9 -9
View File
@@ -38,7 +38,7 @@
extern WorldServer worldserver;
extern const queryservconfig *Config;
extern QSDatabase qs_database;
extern Database database;
extern LFGuildManager lfguildmanager;
WorldServer::WorldServer()
@@ -78,42 +78,42 @@ void WorldServer::Process()
Server_Speech_Struct *SSS = (Server_Speech_Struct*)pack->pBuffer;
std::string tmp1 = SSS->from;
std::string tmp2 = SSS->to;
qs_database.AddSpeech(tmp1.c_str(), tmp2.c_str(), SSS->message, SSS->minstatus, SSS->guilddbid, SSS->type);
database.AddSpeech(tmp1.c_str(), tmp2.c_str(), SSS->message, SSS->minstatus, SSS->guilddbid, SSS->type);
break;
}
case ServerOP_QSPlayerLogTrades: {
QSPlayerLogTrade_Struct *QS = (QSPlayerLogTrade_Struct*)pack->pBuffer;
qs_database.LogPlayerTrade(QS, QS->_detail_count);
database.LogPlayerTrade(QS, QS->_detail_count);
break;
}
case ServerOP_QSPlayerLogHandins: {
QSPlayerLogHandin_Struct *QS = (QSPlayerLogHandin_Struct*)pack->pBuffer;
qs_database.LogPlayerHandin(QS, QS->_detail_count);
database.LogPlayerHandin(QS, QS->_detail_count);
break;
}
case ServerOP_QSPlayerLogNPCKills: {
QSPlayerLogNPCKill_Struct *QS = (QSPlayerLogNPCKill_Struct*)pack->pBuffer;
uint32 Members = pack->size - sizeof(QSPlayerLogNPCKill_Struct);
if (Members > 0) Members = Members / sizeof(QSPlayerLogNPCKillsPlayers_Struct);
qs_database.LogPlayerNPCKill(QS, Members);
database.LogPlayerNPCKill(QS, Members);
break;
}
case ServerOP_QSPlayerLogDeletes: {
QSPlayerLogDelete_Struct *QS = (QSPlayerLogDelete_Struct*)pack->pBuffer;
uint32 Items = QS->char_count;
qs_database.LogPlayerDelete(QS, Items);
database.LogPlayerDelete(QS, Items);
break;
}
case ServerOP_QSPlayerLogMoves: {
QSPlayerLogMove_Struct *QS = (QSPlayerLogMove_Struct*)pack->pBuffer;
uint32 Items = QS->char_count;
qs_database.LogPlayerMove(QS, Items);
database.LogPlayerMove(QS, Items);
break;
}
case ServerOP_QSPlayerLogMerchantTransactions: {
QSMerchantLogTransaction_Struct *QS = (QSMerchantLogTransaction_Struct*)pack->pBuffer;
uint32 Items = QS->char_count + QS->merchant_count;
qs_database.LogMerchantTransaction(QS, Items);
database.LogMerchantTransaction(QS, Items);
break;
}
case ServerOP_QueryServGeneric: {
@@ -155,7 +155,7 @@ void WorldServer::Process()
}
case ServerOP_QSSendQuery: {
/* Process all packets here */
qs_database.GeneralQueryReceive(pack);
database.GeneralQueryReceive(pack);
break;
}
}