mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-11 07:38:36 +00:00
Refactor some of the database stuff for QueryServ for uniformity, should probably be done right later
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
#include "../common/rulesys.h"
|
||||
|
||||
extern WorldServer *worldserver;
|
||||
extern Database database;
|
||||
extern QSDatabase qs_database;
|
||||
|
||||
PlayerLookingForGuild::PlayerLookingForGuild(char *Name, char *Comments, uint32 Level, uint32 Class, uint32 AACount, uint32 Timezone, uint32 TimePosted)
|
||||
{
|
||||
@@ -38,7 +38,7 @@ bool LFGuildManager::LoadDatabase()
|
||||
std::string query = "SELECT `type`,`name`,`comment`, "
|
||||
"`fromlevel`, `tolevel`, `classes`, "
|
||||
"`aacount`, `timezone`, `timeposted` FROM `lfguild`";
|
||||
auto results = database.QueryDatabase(query);
|
||||
auto results = qs_database.QueryDatabase(query);
|
||||
if (!results.Success()) {
|
||||
return false;
|
||||
}
|
||||
@@ -239,7 +239,7 @@ void LFGuildManager::TogglePlayer(uint32 FromZoneID, uint32 FromInstanceID, char
|
||||
}
|
||||
|
||||
std::string query = StringFormat("DELETE FROM `lfguild` WHERE `type` = 0 AND `name` = '%s'", From);
|
||||
auto results = database.QueryDatabase(query);
|
||||
auto results = qs_database.QueryDatabase(query);
|
||||
|
||||
uint32 Now = time(nullptr);
|
||||
|
||||
@@ -252,7 +252,7 @@ void LFGuildManager::TogglePlayer(uint32 FromZoneID, uint32 FromInstanceID, char
|
||||
"`classes`, `aacount`, `timezone`, `timeposted`) "
|
||||
"VALUES (0, '%s', '%s', %u, 0, %u, %u, %u, %u)",
|
||||
From, Comments, Level, Class, AAPoints, TimeZone, Now);
|
||||
auto results = database.QueryDatabase(query);
|
||||
auto results = qs_database.QueryDatabase(query);
|
||||
}
|
||||
|
||||
ServerPacket *pack = new ServerPacket(ServerOP_QueryServGeneric, strlen(From) + strlen(Comments) + 30);
|
||||
@@ -281,7 +281,7 @@ void LFGuildManager::ToggleGuild(uint32 FromZoneID, uint32 FromInstanceID, char
|
||||
}
|
||||
|
||||
std::string query = StringFormat("DELETE FROM `lfguild` WHERE `type` = 1 AND `name` = '%s'", GuildName);
|
||||
auto results = database.QueryDatabase(query);
|
||||
auto results = qs_database.QueryDatabase(query);
|
||||
|
||||
uint32 Now = time(nullptr);
|
||||
|
||||
@@ -296,7 +296,7 @@ void LFGuildManager::ToggleGuild(uint32 FromZoneID, uint32 FromInstanceID, char
|
||||
"VALUES (1, '%s', '%s', %u, %u, %u, %u, %u, %u)",
|
||||
GuildName, Comments, FromLevel, ToLevel,
|
||||
Classes, AACount, TimeZone, Now);
|
||||
auto results = database.QueryDatabase(query);
|
||||
auto results = qs_database.QueryDatabase(query);
|
||||
|
||||
}
|
||||
|
||||
@@ -324,7 +324,7 @@ void LFGuildManager::ExpireEntries()
|
||||
continue;
|
||||
|
||||
std::string query = StringFormat("DELETE from `lfguild` WHERE `type` = 0 AND `name` = '%s'", (*it).Name.c_str());
|
||||
auto results = database.QueryDatabase(query);
|
||||
auto results = qs_database.QueryDatabase(query);
|
||||
if(!results.Success())
|
||||
|
||||
it = Players.erase(it);
|
||||
@@ -336,7 +336,7 @@ void LFGuildManager::ExpireEntries()
|
||||
continue;
|
||||
|
||||
std::string query = StringFormat("DELETE from `lfguild` WHERE `type` = 1 AND `name` = '%s'", (*it2).Name.c_str());
|
||||
auto results = database.QueryDatabase(query);
|
||||
auto results = qs_database.QueryDatabase(query);
|
||||
if(!results.Success())
|
||||
|
||||
it2 = Guilds.erase(it2);
|
||||
|
||||
Reference in New Issue
Block a user