From 515fe8d9e58efa343cbf7f0e7f04392bb56cf48e Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Wed, 3 Sep 2014 16:29:47 -0700
Subject: [PATCH] DeleteBot converted to QueryDatabase

---
 zone/bot.cpp | 61 +++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/zone/bot.cpp b/zone/bot.cpp
index c7f1ef9e2..72aae3089 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -4067,44 +4067,41 @@ void Bot::Depop() {
 }
 
 bool Bot::DeleteBot(std::string* errorMessage) {
-	bool Result = false;
-	int TempCounter = 0;
+	bool hadError = false;
 
-	if(this->GetBotID() > 0) {
-		char* Query = 0;
-		char TempErrorMessageBuffer[MYSQL_ERRMSG_SIZE];
+	if(this->GetBotID() == 0)
+        return false;
 
-		// TODO: These queries need to be ran together as a transaction.. ie, if one or more fail then they all will fail to commit to the database.
+    // TODO: These queries need to be ran together as a transaction.. ie, if one or more fail then they all will fail to commit to the database.
+    std::string query = StringFormat("DELETE FROM botinventory WHERE botid = '%u'", this->GetBotID());
+    auto results = database.QueryDatabase(query);
+    if(!results.Success()) {
+        *errorMessage = std::string(results.ErrorMessage());
+        hadError = true;
+    }
 
-		if(!database.RunQuery(Query, MakeAnyLenString(&Query, "DELETE FROM botinventory WHERE botid = '%u'", this->GetBotID()), TempErrorMessageBuffer)) {
-			*errorMessage = std::string(TempErrorMessageBuffer);
-		}
-		else
-			TempCounter++;
+    query = StringFormat("DELETE FROM botbuffs WHERE botid = '%u'", this->GetBotID());
+    results = database.QueryDatabase(query);
+    if(!results.Success()) {
+        *errorMessage = std::string(results.ErrorMessage());
+        hadError = true;
+    }
 
-		if(!database.RunQuery(Query, MakeAnyLenString(&Query, "DELETE FROM botbuffs WHERE botid = '%u'", this->GetBotID()), TempErrorMessageBuffer)) {
-			*errorMessage = std::string(TempErrorMessageBuffer);
-		}
-		else
-			TempCounter++;
+    query = StringFormat("DELETE FROM botstances WHERE BotID = '%u'", this->GetBotID());
+    results = database.QueryDatabase(query);
+    if(!results.Success()) {
+        *errorMessage = std::string(results.ErrorMessage());
+        hadError = true;
+    }
 
-		if(!database.RunQuery(Query, MakeAnyLenString(&Query, "DELETE FROM botstances WHERE BotID = '%u'", this->GetBotID()), TempErrorMessageBuffer)) {
-			*errorMessage = std::string(TempErrorMessageBuffer);
-		}
-		else
-			TempCounter++;
+    query = StringFormat("DELETE FROM bots WHERE BotID = '%u'", this->GetBotID());
+    results = database.QueryDatabase(query);
+    if(!results.Success()) {
+        *errorMessage = std::string(results.ErrorMessage());
+        hadError = true;
+    }
 
-		if(!database.RunQuery(Query, MakeAnyLenString(&Query, "DELETE FROM bots WHERE BotID = '%u'", this->GetBotID()), TempErrorMessageBuffer)) {
-			*errorMessage = std::string(TempErrorMessageBuffer);
-		}
-		else
-			TempCounter++;
-
-		if(TempCounter == 4)
-			Result = true;
-	}
-
-	return Result;
+	return !hadError;
 }
 
 void Bot::Spawn(Client* botCharacterOwner, std::string* errorMessage) {