From 84499e43dd0a1cb08c84ae87f3efae5fae8284d8 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Tue, 8 Jul 2014 20:42:10 -0700 Subject: [PATCH] MoveCharacterToZone converted to StringFormat --- common/database.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index 6b15f5356..49d1775d2 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -1352,17 +1352,15 @@ bool Database::MoveCharacterToZone(const char* charname, const char* zonename) { } bool Database::MoveCharacterToZone(uint32 iCharID, const char* iZonename) { - char *query = nullptr; - auto results = QueryDatabase(query, MakeAnyLenString(&query, "UPDATE character_ SET zonename = '%s', zoneid=%i, x=-1, y=-1, z=-1 WHERE id=%i", iZonename, GetZoneID(iZonename), iCharID)); + std::string query = StringFormat("UPDATE character_ SET zonename = '%s', zoneid=%i, x=-1, y=-1, z=-1 WHERE id=%i", iZonename, GetZoneID(iZonename), iCharID); + auto results = QueryDatabase(query); if (!results.Success()) { std::cerr << "Error in MoveCharacterToZone(id) query '" << query << "' " << results.ErrorMessage() << std::endl; - safe_delete_array(query); return false; } - safe_delete_array(query); return results.RowsAffected() != 0; }