From 341121da32c9ff24133913c01491a4998012f75b Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Tue, 8 Jul 2014 20:07:02 -0700 Subject: [PATCH] GetSafePoints converted to StringFormat --- common/database.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/common/database.cpp b/common/database.cpp index 21c659311..a4431790a 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -938,12 +938,10 @@ uint32 Database::GetMiniLoginAccount(char* ip){ // Get zone starting points from DB bool Database::GetSafePoints(const char* short_name, uint32 version, float* safe_x, float* safe_y, float* safe_z, int16* minstatus, uint8* minlevel, char *flag_needed) { - char *query = nullptr; - - auto results = QueryDatabase(query, MakeAnyLenString(&query, - "SELECT safe_x, safe_y, safe_z, min_status, min_level, " - " flag_needed FROM zone " - " WHERE short_name='%s' AND (version=%i OR version=0) ORDER BY version DESC", short_name, version)); + + std::string query = StringFormat("SELECT safe_x, safe_y, safe_z, min_status, min_level, flag_needed FROM zone " + " WHERE short_name='%s' AND (version=%i OR version=0) ORDER BY version DESC", short_name, version); + auto results = QueryDatabase(query); if (!results.Success()) { @@ -952,13 +950,9 @@ bool Database::GetSafePoints(const char* short_name, uint32 version, float* safe std::cerr << "ALTER TABLE `zone` CHANGE `minium_level` `min_level` TINYINT(3) UNSIGNED DEFAULT \"0\" NOT NULL;\n"; std::cerr << "ALTER TABLE `zone` CHANGE `minium_status` `min_status` TINYINT(3) UNSIGNED DEFAULT \"0\" NOT NULL;\n"; std::cerr << "ALTER TABLE `zone` ADD flag_needed VARCHAR(128) NOT NULL DEFAULT '';\n"; - - safe_delete_array(query); return false; } - safe_delete_array(query); - if (results.RowCount() == 0) return false;