From d606d8f4f27e61b62649daabcbc92569f696a118 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Thu, 10 Jul 2014 17:48:17 -0700 Subject: [PATCH] GetInstanceID converted to StringFormat --- common/database.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index 3bce78f13..9c22e5f61 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -2295,12 +2295,10 @@ uint16 Database::GetInstanceID(uint32 zone, uint32 charid, int16 version) if(!zone) return 0; - 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;", zone, version, 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;", zone, version, charid); + auto results = QueryDatabase(query); if (!results.Success()) return 0;