From 6bc4ecf390f45c1d18ede826af0dd9cd0df9aac1 Mon Sep 17 00:00:00 2001
From: "Michael Cook (mackal)" <mcook@mackal.net>
Date: Thu, 11 Sep 2014 16:56:15 -0400
Subject: [PATCH] Revert "LoadFactionValues converted to QueryDatabase"

This reverts commit 2df823d2dbb96ac159f14243070834b5927b33d2.
---
 zone/zonedb.cpp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp
index 263e34a29..d789cbdeb 100644
--- a/zone/zonedb.cpp
+++ b/zone/zonedb.cpp
@@ -2336,18 +2336,21 @@ bool ZoneDatabase::GetFactionData(FactionMods* fm, uint32 class_mod, uint32 race
 	return true;
 }
 
-bool ZoneDatabase::LoadFactionValues(uint32 char_id, faction_map& val_list) {
-
-	std::string query = StringFormat("SELECT faction_id,current_value "
-                                    "FROM faction_values "
-                                    "WHERE char_id = %i", char_id);
-    auto results = QueryDatabase(query);
-    if (!results.Success()) {
-        std::cerr << "Error in LoadFactionValues query '" << query << "' " << results.ErrorMessage() << std::endl;
-        return false;
-    }
-
-    return LoadFactionValues_result(std::move(results), val_list);
+bool ZoneDatabase::LoadFactionValues(uint32 char_id, faction_map & val_list) {
+	char errbuf[MYSQL_ERRMSG_SIZE];
+	char *query = 0;
+	MYSQL_RES *result;
+	if (RunQuery(query, MakeAnyLenString(&query, "SELECT faction_id,current_value FROM faction_values WHERE char_id = %i",char_id), errbuf, &result)) {
+		safe_delete_array(query);
+		bool ret = LoadFactionValues_result(result, val_list);
+		mysql_free_result(result);
+		return ret;
+	}
+	else {
+		std::cerr << "Error in LoadFactionValues query '" << query << "' " << errbuf << std::endl;
+		safe_delete_array(query);
+	}
+	return false;
 }
 
 bool ZoneDatabase::LoadFactionValues_result(MYSQL_RES* result, faction_map & val_list) {