From 3db115b52faff1bec03e60c53c1c60c1044f2b5b Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Sun, 6 Jul 2014 13:51:21 -0700 Subject: [PATCH] CharacterInInstanceGroup converted to QueryDatabase --- common/database.cpp | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index 660c933d4..ce31a74ee 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -2143,26 +2143,18 @@ bool Database::VerifyZoneInstance(uint32 zone_id, uint16 instance_id) bool Database::CharacterInInstanceGroup(uint16 instance_id, uint32 char_id) { - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - bool lockout_instance_player = false; + char *query = nullptr; - if (RunQuery(query, MakeAnyLenString(&query, "SELECT charid FROM instance_list_player where id=%u AND charid=%u", - instance_id, char_id), errbuf, &result)) - { - safe_delete_array(query); - if (mysql_num_rows(result) == 1) - { - lockout_instance_player = true; - } - mysql_free_result(result); - } - else - { - safe_delete_array(query); - } - return lockout_instance_player; + auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT charid FROM instance_list_player where id=%u AND charid=%u",instance_id, char_id)); + safe_delete_array(query); + + if (!results.Success()) + return false; + + if (results.RowCount() != 1) + return false; + + return true; } void Database::DeleteInstance(uint16 instance_id)