diff options
author | DDuarte <dnpd.dd@gmail.com> | 2016-01-19 13:01:43 +0000 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2016-03-22 23:41:10 +0100 |
commit | cb7238e9839b003e685c9a0464494baaf5c5b45a (patch) | |
tree | fd0ffe846f01b71a5903a738d5aaee142b4d3241 /src | |
parent | aad5eb01e3e4ec8157fec88ba907fc36b8a2e335 (diff) |
Core/Instances: Fix build in older VS versions
Relax const uses in BossBoundaryEntry so the compiler can generate proper
copy assignment operator (error C2582: 'operator =' function is unavailable in 'BossBoundaryEntry')
Also renamed its members to match our coding standards
(public members should be UpperCamelCase)
(cherry picked from commit 954323d9cb13d4ab3d478bcb51eeb157009d8853)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Instances/InstanceScript.cpp | 4 | ||||
-rw-r--r-- | src/server/game/Instances/InstanceScript.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index f9b43293bb9..df0a6a11a1e 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -105,8 +105,8 @@ void InstanceScript::SetHeaders(std::string const& dataHeaders) void InstanceScript::LoadBossBoundaries(const BossBoundaryData& data) { for (BossBoundaryEntry const& entry : data) - if (entry.bossId < bosses.size()) - bosses[entry.bossId].boundary.insert(entry.boundary); + if (entry.BossId < bosses.size()) + bosses[entry.bossId].boundary.insert(entry.Boundary); } void InstanceScript::LoadMinionData(const MinionData* data) diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index 44bbe91ea36..e2620c85504 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -79,9 +79,10 @@ struct DoorData struct BossBoundaryEntry { - uint32 const bossId; - AreaBoundary const* const boundary; + uint32 BossId; + AreaBoundary const* Boundary; }; + struct BossBoundaryData { typedef std::vector<BossBoundaryEntry> StorageType; |