aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
authorAokromes <Aokromes@users.noreply.github.com>2016-03-05 19:50:57 +0100
committerAokromes <Aokromes@users.noreply.github.com>2016-03-05 19:50:57 +0100
commitec62a02f5763b7ed39a9441f5989e109c72e4c2a (patch)
treedbfdd9570357c9d18497e1cf2a50179d475fee3a /src/server/game/Globals/ObjectMgr.cpp
parentce5def332fa12ea4b2f3223fbaa4e41750da9cfb (diff)
parent3a7f311547bd4301abd102eb785c050d5436dce9 (diff)
Merge pull request #16716 from ariel-/conditionleak
Core/Conditions: fix a memory leak
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 43c76564ae4..e23f3f0c06c 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -8967,9 +8967,7 @@ void ObjectMgr::LoadTerrainSwapDefaults()
continue;
}
- PhaseInfoStruct defaultSwap;
- defaultSwap.Id = terrainSwap;
- _terrainMapDefaultStore[mapId].push_back(defaultSwap);
+ _terrainMapDefaultStore[mapId].push_back(terrainSwap);
++count;
} while (result->NextRow());
@@ -9006,8 +9004,7 @@ void ObjectMgr::LoadTerrainPhaseInfo()
continue;
}
- PhaseInfoStruct terrainSwap;
- terrainSwap.Id = fields[1].GetUInt32();
+ uint32 terrainSwap = fields[1].GetUInt32();
_terrainPhaseInfoStore[phaseId].push_back(terrainSwap);