From 2e847815943ec146d95983cb3282f8a03655a129 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Thu, 21 Aug 2014 17:00:50 -0700 Subject: [PATCH] LoadFactionValues_result converted to MySQLRequestResult --- zone/zonedb.cpp | 8 ++++---- zone/zonedb.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index 184f7e5c8..3b8d45e6d 100644 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -2350,11 +2350,11 @@ bool ZoneDatabase::LoadFactionValues(uint32 char_id, faction_map & val_list) { return false; } -bool ZoneDatabase::LoadFactionValues_result(MYSQL_RES* result, faction_map & val_list) { - MYSQL_ROW row; - while((row = mysql_fetch_row(result))) { +bool ZoneDatabase::LoadFactionValues_result(MySQLRequestResult results, faction_map & val_list) { + + for (auto row = results.begin(); row != results.begin(); ++row) val_list[atoi(row[0])] = atoi(row[1]); - } + return true; } diff --git a/zone/zonedb.h b/zone/zonedb.h index cab3e84a9..dae8c6490 100644 --- a/zone/zonedb.h +++ b/zone/zonedb.h @@ -302,7 +302,7 @@ public: bool SetCharacterFactionLevel(uint32 char_id, int32 faction_id, int32 value, uint8 temp, faction_map &val_list); // rembrant, needed for factions Dec, 16 2001 bool LoadFactionData(); bool LoadFactionValues(uint32 char_id, faction_map & val_list); - bool LoadFactionValues_result(MYSQL_RES* result, faction_map & val_list); + bool LoadFactionValues_result(MySQLRequestResult result, faction_map & val_list); /* * AAs