diff options
| author | click <none@none> | 2010-12-13 22:37:56 +0100 |
|---|---|---|
| committer | click <none@none> | 2010-12-13 22:37:56 +0100 |
| commit | 26428943423d14e8672682ab1f19925b76c2aa35 (patch) | |
| tree | 1c6d80c03cbf566879e5c899533a2dea5a73dd4c /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 89a33bbf612fcd0d5cea8e1fc5deff87e53aa67e (diff) | |
Core: Add new system for parallelizing client packet processing. Handle WorldSession updates in Map::Update() where we are safe to proceed. Patch by Ambal.
(And clean up tabs and whitespace while rummaging around in there)
Closes issue 5084.
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rwxr-xr-x | src/server/game/Globals/ObjectMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 11739172214..89c849ef331 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -360,7 +360,7 @@ void ObjectMgr::AddGuild(Guild* pGuild) // Allocate space if necessary if (guildId >= uint32(mGuildMap.size())) // Reserve a bit more space than necessary. - // 16 is intentional and it will allow creation of next 16 guilds happen + // 16 is intentional and it will allow creation of next 16 guilds happen // without reallocation. mGuildMap.resize(guildId + 16); mGuildMap[guildId] = pGuild; @@ -2076,7 +2076,7 @@ void ObjectMgr::LoadItemPrototypes() if (proto->InventoryType != dbcitem->InventoryType) { sLog.outErrorDb("Item (Entry: %u) does not have a correct inventory type (%u), must be %u .", i, proto->InventoryType, dbcitem->InventoryType); - if (enforceDBCAttributes) + if (enforceDBCAttributes) const_cast<ItemPrototype*>(proto)->InventoryType = dbcitem->InventoryType; } if (proto->DisplayInfoID != dbcitem->DisplayId) @@ -5183,7 +5183,7 @@ void ObjectMgr::LoadWaypointScripts() QueryResult result = WorldDatabase.PQuery("SELECT DISTINCT(`action`) FROM waypoint_data"); if (result) { - do + do { Field *fields = result->Fetch(); uint32 action = fields[0].GetUInt32(); |
