From 8f4e2e99db454a124a6ccaf9b31a476fbce41d21 Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Sun, 24 Aug 2014 12:00:45 -0700
Subject: [PATCH] GetDoorsCountPlusOne converted to QueryDatabase

---
 zone/doors.cpp | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/zone/doors.cpp b/zone/doors.cpp
index d3b9ec6ec..375b59be5 100644
--- a/zone/doors.cpp
+++ b/zone/doors.cpp
@@ -596,34 +596,24 @@ int32 ZoneDatabase::GetDoorsCount(uint32* oMaxID, const char *zone_name, int16 v
 }
 
 int32 ZoneDatabase::GetDoorsCountPlusOne(const char *zone_name, int16 version) {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	uint32 oMaxID = 0;
 
-	MYSQL_RES *result;
-	MYSQL_ROW row;
-	query = new char[256];
-	sprintf(query, "SELECT MAX(id) FROM doors WHERE zone='%s' AND version=%u", zone_name, version);
-	if (RunQuery(query, strlen(query), errbuf, &result)) {
-		safe_delete_array(query);
-		row = mysql_fetch_row(result);
-		if (row != nullptr && row[1] != 0) {
-				if (row[0])
-					oMaxID = atoi(row[0]) + 1;
-				else
-					oMaxID = 0;
-			mysql_free_result(result);
-			return oMaxID;
-		}
-		mysql_free_result(result);
-	}
-	else {
-		std::cerr << "Error in GetDoorsCountPlusOne query '" << query << "' " << errbuf << std::endl;
-		safe_delete_array(query);
+    std::string query = StringFormat("SELECT MAX(id) FROM doors "
+                                    "WHERE zone = '%s' AND version = %u", zone_name, version);
+    auto results = QueryDatabase(query);
+    if (!results.Success()) {
+        std::cerr << "Error in GetDoorsCountPlusOne query '" << query << "' " << results.ErrorMessage() << std::endl;
 		return -1;
-	}
+    }
 
-	return -1;
+	if (results.RowCount() != 1)
+        return -1;
+
+    auto row = results.begin();
+
+    if (!row[0])
+        return 0;
+
+    return atoi(row[0]) + 1;
 }
 
 int32 ZoneDatabase::GetDoorsDBCountPlusOne(const char *zone_name, int16 version) {