From 96c4b283fa09d35b1b949857562fc42abc4374dc Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Sun, 6 Jul 2014 13:50:42 -0700
Subject: [PATCH] VerifyZoneInstance converted to QueryDatabase

---
 common/database.cpp | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/common/database.cpp b/common/database.cpp
index 2cdc294d4..660c933d4 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -2114,9 +2114,7 @@ bool Database::VerifyInstanceAlive(uint16 instance_id, uint32 char_id)
 {
 	//we are not saved to this instance so set our instance to 0
 	if(!GlobalInstance(instance_id) && !CharacterInInstanceGroup(instance_id, char_id))
-	{
 		return false;
-	}
 
 	if(CheckInstanceExpired(instance_id))
 	{
@@ -2129,31 +2127,18 @@ bool Database::VerifyInstanceAlive(uint16 instance_id, uint32 char_id)
 
 bool Database::VerifyZoneInstance(uint32 zone_id, uint16 instance_id)
 {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	MYSQL_RES *result;
+	char *query = nullptr;
 
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT id FROM instance_list where id=%u AND zone=%u",
-		instance_id, zone_id), errbuf, &result))
-	{
-		safe_delete_array(query);
-		if (mysql_num_rows(result) != 0)
-		{
-			mysql_free_result(result);
-			return true;
-		}
-		else
-		{
-			mysql_free_result(result);
-			return false;
-		}
-	}
-	else
-	{
-		safe_delete_array(query);
+	auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT id FROM instance_list where id=%u AND zone=%u",instance_id, zone_id));
+	safe_delete_array(query);
+
+	if (!results.Success())
 		return false;
-	}
-	return false;
+
+	if (results.RowCount() == 0)
+		return false;
+
+	return true;
 }
 
 bool Database::CharacterInInstanceGroup(uint16 instance_id, uint32 char_id)