From 8525d819c1e9c81dad2933b6c1f97fcd13cb775f Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Wed, 20 Aug 2014 23:13:59 -0700
Subject: [PATCH] GetZoneTZ converted to QueryDatabase

---
 zone/zonedb.cpp | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp
index 0a10e1401..7718dbda4 100644
--- a/zone/zonedb.cpp
+++ b/zone/zonedb.cpp
@@ -1698,27 +1698,21 @@ uint8 ZoneDatabase::GetUseCFGSafeCoords()
 
 //New functions for timezone
 uint32 ZoneDatabase::GetZoneTZ(uint32 zoneid, uint32 version) {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	MYSQL_RES *result;
-	MYSQL_ROW row;
 
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT timezone FROM zone WHERE zoneidnumber=%i AND (version=%i OR version=0) ORDER BY version DESC", zoneid, version), errbuf, &result))
-	{
-		safe_delete_array(query);
-		if (mysql_num_rows(result) > 0) {
-			row = mysql_fetch_row(result);
-			uint32 tmp = atoi(row[0]);
-			mysql_free_result(result);
-			return tmp;
-		}
-		mysql_free_result(result);
-	}
-	else {
-		std::cerr << "Error in GetZoneTZ query '" << query << "' " << errbuf << std::endl;
-		safe_delete_array(query);
-	}
-	return 0;
+	std::string query = StringFormat("SELECT timezone FROM zone WHERE zoneidnumber = %i "
+                                    "AND (version = %i OR version = 0) ORDER BY version DESC",
+                                    zoneid, version);
+    auto results = QueryDatabase(query);
+    if (!results.Success()) {
+        std::cerr << "Error in GetZoneTZ query '" << query << "' " << results.ErrorMessage() << std::endl;
+        return 0;
+    }
+
+    if (results.RowCount() == 0)
+        return 0;
+
+    auto row = results.begin();
+    return atoi(row[0]);
 }
 
 bool ZoneDatabase::SetZoneTZ(uint32 zoneid, uint32 version, uint32 tz) {