aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2011-12-28 11:00:27 +0100
committerSpp <spp@jorge.gr>2011-12-28 11:00:27 +0100
commitc1513b2c05910b3450daa65723b47c8e462f521a (patch)
tree02e53e6f3bb77f61e6bdba036b5caf1f5ab98f41 /src
parent3792b470e003adf9df3bcd380bf039b250832639 (diff)
Warning fixes
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Entities/Object/Object.cpp2
-rw-r--r--src/server/scripts/World/areatrigger_scripts.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index d4679928d82..2fc4d8493f4 100755
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -1222,7 +1222,7 @@ void MovementInfo::OutDebug()
}
WorldObject::WorldObject(bool isWorldObject): WorldLocation(),
-m_isWorldObject(isWorldObject), m_name(""), m_isActive(false), m_zoneScript(NULL),
+m_name(""), m_isActive(false), m_isWorldObject(isWorldObject), m_zoneScript(NULL),
m_transport(NULL), m_currMap(NULL), m_InstanceId(0),
m_phaseMask(PHASEMASK_NORMAL), m_notifyflags(0), m_executed_notifies(0)
{
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
index 9e3e64f1860..7d1ed17ed29 100644
--- a/src/server/scripts/World/areatrigger_scripts.cpp
+++ b/src/server/scripts/World/areatrigger_scripts.cpp
@@ -276,7 +276,7 @@ class AreaTrigger_at_nats_landing : public AreaTriggerScript
public:
AreaTrigger_at_nats_landing() : AreaTriggerScript("at_nats_landing") { }
- bool OnTrigger(Player* player, AreaTriggerEntry const* trigger)
+ bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/)
{
if (!player->isAlive() || !player->HasAura(SPELL_FISH_PASTE))
return false;