From 049a0bf787e4f98b8a3a31e4a047940ef4a05b01 Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Wed, 3 Sep 2014 18:41:21 -0700
Subject: [PATCH] LoadGuildMembership converted to QueryDatabase

---
 zone/bot.cpp | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/zone/bot.cpp b/zone/bot.cpp
index c8e93d735..3a475c5ce 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -8573,33 +8573,23 @@ void Bot::SetBotGuildMembership(uint32 botId, uint32 guildid, uint8 rank) {
 }
 
 void Bot::LoadGuildMembership(uint32* guildId, uint8* guildRank, std::string* guildName) {
-	if(guildId && guildRank && guildName) {
-		std::string errorMessage;
-		char* Query = 0;
-		char TempErrorMessageBuffer[MYSQL_ERRMSG_SIZE];
-		MYSQL_RES* DatasetResult;
-		MYSQL_ROW DataRow;
 
-		if(!database.RunQuery(Query, MakeAnyLenString(&Query, "SELECT gm.guild_id, gm.rank, g.name FROM vwGuildMembers AS gm JOIN guilds AS g ON gm.guild_id = g.id WHERE gm.char_id = %u AND gm.mobtype = 'B';", GetBotID()), TempErrorMessageBuffer, &DatasetResult)) {
-			errorMessage = std::string(TempErrorMessageBuffer);
-		}
-		else {
-			while(DataRow = mysql_fetch_row(DatasetResult)) {
-				*guildId = atoi(DataRow[0]);
-				*guildRank = atoi(DataRow[1]);
-				*guildName = std::string(DataRow[2]);
-				break;
-			}
+	if(guildId == nullptr || guildRank == nullptr || guildName == nullptr)
+        return;
 
-			mysql_free_result(DatasetResult);
-		}
+    std::string query = StringFormat("SELECT gm.guild_id, gm.rank, g.name "
+                                    "FROM vwGuildMembers AS gm JOIN guilds AS g "
+                                    "ON gm.guild_id = g.id "
+                                    "WHERE gm.char_id = %u AND gm.mobtype = 'B';",
+                                    GetBotID());
+    auto results = database.QueryDatabase(query);
+    if(!results.Success() || results.RowCount() == 0)
+        return;
 
-		safe_delete(Query);
-
-		if(!errorMessage.empty()) {
-			// TODO: Record this error message to zone error log
-		}
-	}
+    auto row = results.begin();
+    *guildId = atoi(row[0]);
+    *guildRank = atoi(row[1]);
+    *guildName = std::string(row[2]);
 }
 
 int32 Bot::CalcMaxMana() {