From 88a3344c49a7bd7fdca40639e2cd2245a9c209cd Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sat, 28 Jun 2014 23:25:48 +0200 Subject: Core: Fix more warnings --- src/server/game/Grids/Notifiers/GridNotifiers.h | 6 +++--- src/server/scripts/Spells/spell_mage.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index 313240a2391..42f08bfa762 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -174,13 +174,13 @@ namespace Trinity template struct WorldObjectSearcher { - uint32 i_mapTypeMask; - WorldObject*& i_object; WorldObject const* _searcher; + WorldObject*& i_object; + uint32 i_mapTypeMask; Check &i_check; WorldObjectSearcher(WorldObject const* searcher, WorldObject* & result, Check& check, uint32 mapTypeMask = GRID_MAP_TYPE_MASK_ALL) - : i_mapTypeMask(mapTypeMask), _searcher(searcher), i_object(result), i_check(check) { } + : _searcher(searcher), i_object(result), i_check(check), i_mapTypeMask(mapTypeMask) { } void Visit(GameObjectMapType &m); void Visit(PlayerMapType &m); diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 9ba53308ef1..d69978875f8 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -775,7 +775,7 @@ class spell_mage_ice_barrier : public SpellScriptLoader { PrepareAuraScript(spell_mage_ice_barrier_AuraScript); - void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated) + void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) { canBeRecalculated = false; if (Unit* caster = GetCaster()) -- cgit v1.2.3