From 99baba47620ceddd3f6f3b26c01cee87f34030c0 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Mon, 19 Jan 2015 05:38:23 -0600 Subject: [PATCH] More cleanup of some QueryDatabase references that no longer need auto results --- zone/petitions.cpp | 2 -- zone/pets.cpp | 3 +-- zone/tasks.cpp | 3 +-- zone/tradeskills.cpp | 2 -- zone/trading.cpp | 4 +--- zone/waypoints.cpp | 6 ------ 6 files changed, 3 insertions(+), 17 deletions(-) diff --git a/zone/petitions.cpp b/zone/petitions.cpp index bcca6aabf..3e8a836e2 100644 --- a/zone/petitions.cpp +++ b/zone/petitions.cpp @@ -223,8 +223,6 @@ void ZoneDatabase::UpdatePetitionToDB(Petition* wpet) { wpet->GetCheckouts(), wpet->GetUnavails(), wpet->CheckedOut() ? 1: 0, wpet->GetID()); auto results = QueryDatabase(query); - if (!results.Success()) - } void ZoneDatabase::InsertPetitionToDB(Petition* wpet) diff --git a/zone/pets.cpp b/zone/pets.cpp index 8415dbe9d..22fa379ce 100644 --- a/zone/pets.cpp +++ b/zone/pets.cpp @@ -669,8 +669,7 @@ bool ZoneDatabase::GetBasePetItems(int32 equipmentset, uint32 *items) { query = StringFormat("SELECT slot, item_id FROM pets_equipmentset_entries WHERE set_id='%s'", curset); results = QueryDatabase(query); - if (!results.Success()) - else { + if (results.Success()){ for (row = results.begin(); row != results.end(); ++row) { slot = atoi(row[0]); diff --git a/zone/tasks.cpp b/zone/tasks.cpp index fbc5ae3b5..203950104 100644 --- a/zone/tasks.cpp +++ b/zone/tasks.cpp @@ -769,8 +769,7 @@ void ClientTaskState::DisableTask(int charID, int taskCount, int *taskList) { queryStream << ")"; std::string query = queryStream.str(); Log.Out(Logs::General, Logs::Tasks, "[UPDATE] Executing query %s", query.c_str()); - auto results = database.QueryDatabase(query); - if(!results.Success()) + database.QueryDatabase(query); } bool ClientTaskState::IsTaskEnabled(int TaskID) { diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index a973f9a97..07ae6d2a5 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -1494,8 +1494,6 @@ void Client::LearnRecipe(uint32 recipeID) "ON DUPLICATE KEY UPDATE madecount = madecount;", recipeID, CharacterID()); results = database.QueryDatabase(query); - if (!results.Success()) - } bool Client::CanIncreaseTradeskill(SkillUseTypes tradeskill) { diff --git a/zone/trading.cpp b/zone/trading.cpp index d06cf2f9d..24215248e 100644 --- a/zone/trading.cpp +++ b/zone/trading.cpp @@ -1476,9 +1476,7 @@ static void BazaarAuditTrail(const char *seller, const char *buyer, const char * "(`time`, `seller`, `buyer`, `itemname`, `quantity`, `totalcost`, `trantype`) " "VALUES (NOW(), '%s', '%s', '%s', %i, %i, %i)", seller, buyer, itemName, quantity, totalCost, tranType); - auto results = database.QueryDatabase(query); - if(!results.Success()) - + database.QueryDatabase(query); } diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp index e2c72c1bf..1214fa243 100644 --- a/zone/waypoints.cpp +++ b/zone/waypoints.cpp @@ -1165,15 +1165,9 @@ void ZoneDatabase::ModifyGrid(Client *client, bool remove, uint32 id, uint8 type std::string query = StringFormat("DELETE FROM grid where id=%i", id); auto results = QueryDatabase(query); - if (!results.Success()) - else if(client) - client->LogSQL(query.c_str()); query = StringFormat("DELETE FROM grid_entries WHERE zoneid = %i AND gridid = %i", zoneid, id); results = QueryDatabase(query); - if(!results.Success()) - else if(client) - client->LogSQL(query.c_str()); }