From c6f707d95c39db03953c7e054d596e3f905dec60 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Sat, 5 Jul 2014 10:49:07 -0700 Subject: [PATCH] GetZoneID nullptr and formatting clean up --- common/database.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index 8fe75aa8d..0e29c41bb 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -1165,13 +1165,14 @@ bool Database::LoadZoneNames() { } uint32 Database::GetZoneID(const char* zonename) { - if (zonename == 0) + + if (zonename == nullptr) return 0; - for (auto iter = zonename_array.begin(); iter != zonename_array.end(); ++iter) { - if (strcasecmp(iter->second.c_str(), zonename) == 0) { + + for (auto iter = zonename_array.begin(); iter != zonename_array.end(); ++iter) + if (strcasecmp(iter->second.c_str(), zonename) == 0) return iter->first; - } - } + return 0; }