araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-18 14:10:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/scripts/Spells/spell_paladin.cpp
This commit is contained in:
Vincent_Michael
2014-01-27 18:44:07 +01:00
parent 7cc4828554 0d5c10d60e
commit df6f300542
24 changed files with 197 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Spells/spell_priest.cpp
+2 -2
View File
@@ -79,7 +79,7 @@ enum MiscSpells
class PowerCheck
{
public:
explicit PowerCheck(Powers power) : _power(power) { }
explicit PowerCheck(Powers const power) : _power(power) { }
bool operator()(WorldObject* obj) const
{
@@ -90,7 +90,7 @@ class PowerCheck
}
private:
Powers _power;
Powers const _power;
};
class RaidCheck