From 0850b1edad08e5864830d326bb9a0bf865bd3260 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Tue, 8 Jul 2014 20:18:09 -0700 Subject: [PATCH] LoadZoneNames converted to use string --- common/database.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index 0953ee753..2c10a2947 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -1061,17 +1061,15 @@ bool Database::GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zon } bool Database::LoadZoneNames() { - char *query = nullptr; + std::string query("SELECT zoneidnumber, short_name FROM zone"); - auto results = QueryDatabase(query,MakeAnyLenString(&query, "SELECT zoneidnumber, short_name FROM zone")); + auto results = QueryDatabase(query); if (!results.Success()) { std::cerr << "Error in LoadZoneNames query '" << query << "' " << results.ErrorMessage() << std::endl; - safe_delete_array(query); return false; } - safe_delete_array(query); for (auto row= results.begin();row != results.end();++row) {