aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2016-01-19 13:01:43 +0000
committerDDuarte <dnpd.dd@gmail.com>2016-01-19 13:01:43 +0000
commit954323d9cb13d4ab3d478bcb51eeb157009d8853 (patch)
treeb51da5308d84b3ad271bd7ad4893a01c6bab9b74 /src
parent7d454c66f70c19c8ff402fd126392e27700398ba (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)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Instances/InstanceScript.cpp4
-rw-r--r--src/server/game/Instances/InstanceScript.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp
index 2422ea1c533..39ba02321b0 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 8f80f00c1ca..ce83061e162 100644
--- a/src/server/game/Instances/InstanceScript.h
+++ b/src/server/game/Instances/InstanceScript.h
@@ -75,9 +75,10 @@ struct DoorData
struct BossBoundaryEntry
{
- uint32 const bossId;
- AreaBoundary const* const boundary;
+ uint32 BossId;
+ AreaBoundary const* Boundary;
};
+
struct BossBoundaryData
{
typedef std::vector<BossBoundaryEntry> StorageType;