Various Cleanups (game F-K)

src/game/GMTicketMgr.cpp

@@ -72,7 +72,8 @@ void GMTicketMgr::LoadGMTickets()
         ticket.Init(guid, fields[1].GetCppString(), fields[2].GetCppString(), time_t(fields[3].GetUInt64()));
         m_GMTicketListByCreatingOrder.push_back(&ticket);
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
     delete result;
 
     sLog.outString();

src/game/GameEventMgr.cpp

@@ -168,7 +168,8 @@ void GameEventMgr::LoadFromDB()
 
             pGameEvent.description  = fields[6].GetCppString();
 
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         sLog.outString();
@@ -253,7 +254,8 @@ void GameEventMgr::LoadFromDB()
             GuidList& crelist = mGameEventCreatureGuids[internal_event_id];
             crelist.push_back(guid);
 
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         sLog.outString();
@@ -331,7 +333,8 @@ void GameEventMgr::LoadFromDB()
             GuidList& golist = mGameEventGameobjectGuids[internal_event_id];
             golist.push_back(guid);
 
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         sLog.outString();
@@ -425,7 +428,8 @@ void GameEventMgr::LoadFromDB()
             equiplist.push_back(GameEventCreatureDataPair(guid, newData));
             mGameEventCreatureDataPerGuid.insert(GameEventCreatureDataPerGuidMap::value_type(guid, event_id));
 
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         sLog.outString();
@@ -485,7 +489,8 @@ void GameEventMgr::LoadFromDB()
             QuestList& questlist = mGameEventQuests[event_id];
             questlist.push_back(quest);
 
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         sLog.outString();
@@ -565,7 +570,8 @@ void GameEventMgr::LoadFromDB()
             MailList& maillist = mGameEventMails[internal_event_id];
             maillist.push_back(mail);
 
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         sLog.outString();
@@ -586,7 +592,8 @@ uint32 GameEventMgr::Initialize()                           // return the next e
             Field* fields = result->Fetch();
             uint16 event_id = fields[0].GetUInt16();
             activeAtShutdown.insert(event_id);
-        } while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
 
         CharacterDatabase.Execute("TRUNCATE game_event_status");

src/game/GameObject.cpp

@@ -1622,7 +1622,8 @@ struct QuaternionCompressed
     QuaternionCompressed(int64 val) : m_raw(val) {}
     QuaternionCompressed(const Quat& quat) { Set(quat); }
 
-    enum{
+    enum
+    {
         PACK_COEFF_YZ = 1 << 20,
         PACK_COEFF_X = 1 << 21,
     };

src/game/Guild.cpp

@@ -364,7 +364,8 @@ bool Guild::LoadRanksFromDB(QueryResult *guildRanksResult)
             rankRights |= GR_RIGHT_ALL;
 
         AddRank(rankName, rankRights, rankMoney);
-    } while( guildRanksResult->NextRow() );
+    }
+    while (guildRanksResult->NextRow());
 
     if (m_Ranks.size() < GUILD_RANKS_MIN_COUNT)             // if too few ranks, renew them
     {
@@ -464,7 +465,8 @@ bool Guild::LoadMembersFromDB(QueryResult *guildMembersResult)
 
         members[lowguid]      = newmember;
 
-    } while (guildMembersResult->NextRow());
+    }
+    while (guildMembersResult->NextRow());
 
     if (members.empty())
         return false;
@@ -897,7 +899,8 @@ void Guild::LoadGuildEventLogFromDB()
         // Add entry to list
         m_GuildEventLog.push_front(NewEvent);
 
-    } while( result->NextRow() );
+    }
+    while (result->NextRow());
     delete result;
 }
 
@@ -1147,7 +1150,8 @@ void Guild::LoadGuildBankFromDB()
         NewTab->Text = fields[3].GetCppString();
 
         m_TabListMap[tabId] = NewTab;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -1196,7 +1200,8 @@ void Guild::LoadGuildBankFromDB()
 
         pItem->AddToWorld();
         m_TabListMap[TabId]->Slots[SlotId] = pItem;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 }
@@ -1423,7 +1428,8 @@ bool Guild::LoadBankRightsFromDB(QueryResult *guildBankTabRightsResult)
 
         SetBankRightsAndSlots(rankId, TabId, right, SlotPerDay, false);
 
-    } while (guildBankTabRightsResult->NextRow());
+    }
+    while (guildBankTabRightsResult->NextRow());
 
     return true;
 }
@@ -1476,7 +1482,8 @@ void Guild::LoadGuildBankEventLogFromDB()
                 // we don't have to do m_GuildBankEventLogNextGuid_Item[tabId] %= configCount; - it will be done when creating new record
                 isNextLogGuidSet = true;
             }
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
         delete result;
     }
 
@@ -1513,7 +1520,8 @@ void Guild::LoadGuildBankEventLogFromDB()
             // events are ordered from oldest (in beginning) to latest (in the end)
             m_GuildBankEventLog_Money.push_front(NewEvent);
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
     delete result;
 }
 
@@ -1960,7 +1968,8 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT
     }
 
     if (SplitedAmount)
-    {                                                   // Bank -> Bank item split (in empty or non empty slot
+    {
+        // Bank -> Bank item split (in empty or non empty slot
         GuildItemPosCountVec dest;
         InventoryResult msg = CanStoreItem(BankTabDst, BankTabSlotDst, dest, SplitedAmount, pItemSrc, false);
         if (msg != EQUIP_ERR_OK)
@@ -2068,7 +2077,8 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
         SplitedAmount = 0;                              // no split
 
     if (SplitedAmount)
-    {                                                   // Bank -> Char split to slot (patly move)
+    {
+        // Bank -> Char split to slot (patly move)
         Item* pNewItem = pItemBank->CloneItem(SplitedAmount);
         if (!pNewItem)
         {
@@ -2226,7 +2236,8 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
         SplitedAmount = 0;                                  // no split
 
     if (SplitedAmount)
-    {                                                       // Char -> Bank split to empty or non-empty slot (partly move)
+    {
+        // Char -> Bank split to empty or non-empty slot (partly move)
         GuildItemPosCountVec dest;
         InventoryResult msg = CanStoreItem(BankTab, BankTabSlot, dest, SplitedAmount, pItemChar, false);
         if (msg != EQUIP_ERR_OK)

src/game/GuildMgr.cpp

@@ -149,7 +149,8 @@ void GuildMgr::LoadGuilds()
         newGuild->LoadGuildBankEventLogFromDB();
         newGuild->LoadGuildBankFromDB();
         AddGuild(newGuild);
-    } while(result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
     delete guildRanksResult;

src/game/ItemEnchantmentMgr.cpp

@@ -72,7 +72,8 @@ void LoadRandomEnchantmentsTable()
                 RandomItemEnch[entry].push_back(EnchStoreItem(ench, chance));
 
             ++count;
-        } while (result->NextRow());
+        }
+        while (result->NextRow());
 
         delete result;