From a862d9a06d823fd6b79b0b43dd577a7cfeaab1d4 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Thu, 10 Jul 2014 17:47:25 -0700 Subject: [PATCH] GetInstanceID converted to StringFormat --- common/database.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index ed296e34a..3bce78f13 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -2274,12 +2274,11 @@ uint16 Database::GetInstanceVersion(uint16 instance_id) uint16 Database::GetInstanceID(const char* zone, uint32 charid, int16 version) { - char *query = nullptr; - auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT instance_list.id FROM instance_list, instance_list_player " - "WHERE instance_list.zone=%u AND instance_list.version=%u AND instance_list.id=instance_list_player.id AND " - "instance_list_player.charid=%u LIMIT 1;", GetZoneID(zone), version, charid, charid)); - safe_delete_array(query); + std::string query = StringFormat("SELECT instance_list.id FROM instance_list, instance_list_player " + "WHERE instance_list.zone=%u AND instance_list.version=%u AND instance_list.id=instance_list_player.id AND " + "instance_list_player.charid=%u LIMIT 1;", GetZoneID(zone), version, charid, charid); + auto results = QueryDatabase(query); if (!results.Success()) return 0;