aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-06-28 23:25:48 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2014-06-28 23:25:48 +0200
commit88a3344c49a7bd7fdca40639e2cd2245a9c209cd (patch)
tree02708f4b5d65f18a6ccce653abbd416687fd5f69 /src
parenta3e34f562141e272fd64b44272fa58ea729bcffa (diff)
Core: Fix more warnings
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Grids/Notifiers/GridNotifiers.h6
-rw-r--r--src/server/scripts/Spells/spell_mage.cpp2
2 files changed, 4 insertions, 4 deletions
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<class Check>
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())