From 10ab80685911757dff466e1b9de5cfd40689849b Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sat, 24 Jan 2015 22:51:49 -0600 Subject: [PATCH] Cleanup Database::GetInstanceID --- common/database.cpp | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index 9e5d579f8..750dfba8b 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -3895,11 +3895,24 @@ uint16 Database::GetInstanceVersion(uint16 instance_id) { return atoi(row[0]); } -uint16 Database::GetInstanceID(const char* zone, uint32 charid, int16 version) { +uint16 Database::GetInstanceID(const char* zone, uint32 character_id, int16 version) { - 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); + 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, + character_id + ); auto results = QueryDatabase(query); if (!results.Success())