Various Cleanups (game N-O)

src/game/NPCHandler.cpp

@@ -561,7 +561,8 @@ void WorldSession::SendStablePet( ObjectGuid guid )
             data << uint8(2);                               // 1 = current, 2/3 = in stable (any from 4,5,... create problems with proper show)
 
             ++num;
-        }while( result->NextRow() );
+        }
+        while (result->NextRow());
 
         delete result;
     }
@@ -652,7 +653,8 @@ void WorldSession::HandleStablePet( WorldPacket & recv_data )
 
             // this slot not free, skip
             ++free_slot;
-        }while( result->NextRow() );
+        }
+        while (result->NextRow());
 
         delete result;
     }

src/game/ObjectMgr.cpp

@@ -283,7 +283,8 @@ void ObjectMgr::LoadCreatureLocales()
                 }
             }
         }
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -373,7 +374,8 @@ void ObjectMgr::LoadGossipMenuItemsLocales()
                 }
             }
         }
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -430,7 +432,8 @@ void ObjectMgr::LoadPointOfInterestLocales()
                 data.IconName[idx] = str;
             }
         }
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -1336,7 +1339,8 @@ void ObjectMgr::LoadCreatures()
 
         ++count;
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -1530,7 +1534,8 @@ void ObjectMgr::LoadGameObjects()
 
         ++count;
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -1756,7 +1761,8 @@ void ObjectMgr::LoadItemLocales()
                 }
             }
         }
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -2416,7 +2422,8 @@ void ObjectMgr::LoadItemConverts()
         m_ItemConvert[itemEntry] = itemTargetId;
 
         ++count;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -2477,7 +2484,8 @@ void ObjectMgr::LoadItemExpireConverts()
         m_ItemExpireConvert[itemEntry] = itemTargetId;
 
         ++count;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -2579,7 +2587,8 @@ void ObjectMgr::LoadItemRequiredTarget()
         m_ItemRequiredTarget.insert(ItemRequiredTargetMap::value_type(uiItemId,ItemRequiredTarget(ItemRequiredTargetType(uiType),uiTargetEntry)));
 
         ++count;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -3437,7 +3446,8 @@ void ObjectMgr::LoadArenaTeams()
             continue;
         }
         AddArenaTeam(newArenaTeam);
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
     delete arenaTeamMembersResult;
@@ -3479,7 +3489,8 @@ void ObjectMgr::LoadGroups()
             continue;
         }
         AddGroup(group);
-    }while( result->NextRow() );
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -3529,7 +3540,8 @@ void ObjectMgr::LoadGroups()
                                 memberGuid.GetString().c_str(), groupId);
                 CharacterDatabase.PExecute("DELETE FROM group_member WHERE memberGuid = '%u'", memberGuidlow);
             }
-        }while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
     }
 
@@ -3606,7 +3618,8 @@ void ObjectMgr::LoadGroups()
 
             DungeonPersistentState* state = (DungeonPersistentState*)sMapPersistentStateMgr.AddPersistentState(mapEntry, fields[2].GetUInt32(), Difficulty(diff), (time_t)fields[5].GetUInt64(), (fields[6].GetUInt32() == 0), true, true, fields[8].GetUInt32());
             group->BindToInstance(state, fields[3].GetBool(), true);
-        }while( result->NextRow() );
+        }
+        while (result->NextRow());
         delete result;
     }
 
@@ -3692,7 +3705,8 @@ void ObjectMgr::LoadQuests()
 
         Quest* newQuest = new Quest(fields);
         mQuestTemplates[newQuest->GetQuestId()] = newQuest;
-    } while( result->NextRow() );
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -4446,7 +4460,8 @@ void ObjectMgr::LoadQuestLocales()
                 }
             }
         }
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -4548,7 +4563,8 @@ void ObjectMgr::LoadPageTextLocales()
             }
         }
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -4621,7 +4637,8 @@ void ObjectMgr::LoadInstanceEncounters()
 
         m_DungeonEncounters.insert(DungeonEncounterMap::value_type(creditEntry, new DungeonEncounter(dungeonEncounter, EncounterCreditType(creditType), creditEntry, lastEncounterDungeon)));
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -4812,7 +4829,8 @@ void ObjectMgr::LoadGossipText()
                 gText.Options[i].Emotes[j]._Emote  = fields[cic++].GetUInt32();
             }
         }
-    } while(result->NextRow());
+    }
+    while (result->NextRow());
 
     sLog.outString();
     sLog.outString(">> Loaded %u npc texts", count);
@@ -4892,7 +4910,8 @@ void ObjectMgr::LoadGossipTextLocales()
                 }
             }
         }
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -4949,7 +4968,8 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
         if (serverUp)
             pl = GetPlayer(m->receiverGuid);
         if (pl)
-        {                                                   //this code will run very improbably (the time is between 4 and 5 am, in game is online a player, who has old mail
+        {
+            //this code will run very improbably (the time is between 4 and 5 am, in game is online a player, who has old mail
             //his in mailbox and he has already listed his mails )
             delete m;
             continue;
@@ -5001,7 +5021,8 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
         CharacterDatabase.PExecute("DELETE FROM mail WHERE id = '%u'", m->messageID);
         delete m;
         ++count;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
     delete result;
 
     sLog.outString();
@@ -5064,7 +5085,8 @@ void ObjectMgr::LoadQuestAreaTriggers()
 
         mQuestAreaTriggerMap[trigger_ID] = quest_ID;
 
-    } while( result->NextRow() );
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -5109,7 +5131,8 @@ void ObjectMgr::LoadTavernAreaTriggers()
         }
 
         mTavernAreaTriggerSet.insert(Trigger_ID);
-    } while( result->NextRow() );
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -5277,7 +5300,8 @@ void ObjectMgr::LoadGraveyardZones()
 
         if (!AddGraveYardLink(safeLocId, zoneId, Team(team), false))
             sLog.outErrorDb("Table `game_graveyard_zone` has a duplicate record for Graveyard (ID: %u) and Zone (ID: %u), skipped.", safeLocId, zoneId);
-    } while( result->NextRow() );
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -5581,7 +5605,8 @@ void ObjectMgr::LoadAreaTriggerTeleports()
 
         mAreaTriggers[Trigger_ID] = at;
 
-    } while( result->NextRow() );
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -5856,7 +5881,8 @@ void ObjectMgr::LoadGameObjectLocales()
             }
         }
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -6438,7 +6464,8 @@ void ObjectMgr::LoadReputationOnKill()
         mRepOnKill[creature_id] = repOnKill;
 
         ++count;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -6612,7 +6639,8 @@ void ObjectMgr::LoadPointsOfInterest()
         mPointsOfInterest[point_id] = POI;
 
         ++count;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -6661,7 +6689,8 @@ void ObjectMgr::LoadQuestPOI()
         mQuestPOIMap[questId].push_back(POI);
 
         ++count;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -6689,7 +6718,8 @@ void ObjectMgr::LoadQuestPOI()
                 itr->points.push_back(point);
                 break;
             }
-        } while (points->NextRow());
+        }
+        while (points->NextRow());
 
         delete points;
     }
@@ -6780,7 +6810,8 @@ void ObjectMgr::LoadNPCSpellClickSpells()
         const_cast<CreatureInfo*>(cInfo)->npcflag |= UNIT_NPC_FLAG_SPELLCLICK;
 
         ++count;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -6896,7 +6927,8 @@ void ObjectMgr::LoadWeatherZoneChances()
         }
 
         ++count;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -6976,7 +7008,8 @@ void ObjectMgr::LoadQuestRelationsHelper(QuestRelationsMap& map, char const* tab
         map.insert(QuestRelationsMap::value_type(id, quest));
 
         ++count;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -7078,7 +7111,8 @@ void ObjectMgr::LoadReservedPlayersNames()
 
         m_ReservedNames.insert(wstr);
         ++count;
-    } while ( result->NextRow() );
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -7451,7 +7485,8 @@ bool ObjectMgr::LoadMangosStrings(DatabaseType& db, char const* table, int32 min
                 }
             }
         }
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
 
@@ -8502,7 +8537,8 @@ void ObjectMgr::LoadTrainers(char const* tableName, bool isTemplates)
 
         ++count;
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
     delete result;
 
     sLog.outString();
@@ -8582,7 +8618,8 @@ void ObjectMgr::LoadVendors(char const* tableName, bool isTemplates)
         vList.AddItem(item_id, maxcount, incrtime, ExtendedCost);
         ++count;
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
     delete result;
 
     sLog.outString();
@@ -8662,7 +8699,8 @@ void ObjectMgr::LoadNpcGossips()
         m_mCacheNpcTextIdMap[guid] = textid ;
         ++count;
 
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
     delete result;
 
     sLog.outString();

src/game/ObjectMgr.h

@@ -337,7 +337,8 @@ typedef std::multimap<uint32 /*zoneId*/, GraveYardData> GraveYardMap;
 typedef std::pair<GraveYardMap::const_iterator, GraveYardMap::const_iterator> GraveYardMapBounds;
 
 enum ConditionType
-{                                                           // value1       value2  for the Condition enumed
+{
+    // value1       value2  for the Condition enumed
     CONDITION_NOT                   = -3,                   // cond-id-1    0          returns !cond-id-1
     CONDITION_OR                    = -2,                   // cond-id-1    cond-id-2  returns cond-id-1 OR cond-id-2
     CONDITION_AND                   = -1,                   // cond-id-1    cond-id-2  returns cond-id-1 AND cond-id-2