From 7a5afd8597c3c814cd7a21fc7be3694b63d6a8b4 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Sat, 5 Jul 2014 10:50:08 -0700 Subject: [PATCH] GetZoneName formatting cleanup. much easier to read --- common/database.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index 0e29c41bb..d268ac13c 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -1179,15 +1179,12 @@ uint32 Database::GetZoneID(const char* zonename) { const char* Database::GetZoneName(uint32 zoneID, bool ErrorUnknown) { auto iter = zonename_array.find(zoneID); - if (iter != zonename_array.end()) { + if (iter != zonename_array.end()) return iter->second.c_str(); - } - else { - if (ErrorUnknown) - return "UNKNOWN"; - else - return 0; - } + + if (ErrorUnknown) + return "UNKNOWN"; + return 0; }