*Fix milling.
*Fix Divine Shield. --HG-- branch : trunk
This commit is contained in:
+10
-1
@@ -74,6 +74,7 @@ SpellMgr::SpellMgr()
|
|||||||
case SPELL_EFFECT_DISENCHANT:
|
case SPELL_EFFECT_DISENCHANT:
|
||||||
case SPELL_EFFECT_FEED_PET:
|
case SPELL_EFFECT_FEED_PET:
|
||||||
case SPELL_EFFECT_PROSPECTING:
|
case SPELL_EFFECT_PROSPECTING:
|
||||||
|
case SPELL_EFFECT_MILLING:
|
||||||
EffectTargetType[i] = SPELL_REQUIRE_ITEM;
|
EffectTargetType[i] = SPELL_REQUIRE_ITEM;
|
||||||
break;
|
break;
|
||||||
//caster must be pushed otherwise no sound
|
//caster must be pushed otherwise no sound
|
||||||
@@ -529,7 +530,15 @@ bool IsPositiveEffect(uint32 spellId, uint32 effIndex, bool deep)
|
|||||||
case 34700: // Allergic Reaction
|
case 34700: // Allergic Reaction
|
||||||
case 31719: // Suspension
|
case 31719: // Suspension
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
switch(spellproto->Mechanic)
|
||||||
|
{
|
||||||
|
case MECHANIC_SHIELD:
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
switch(spellproto->Effect[effIndex])
|
switch(spellproto->Effect[effIndex])
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -34,10 +34,10 @@ class TRINITY_DLL_SPEC Config
|
|||||||
|
|
||||||
bool SetSource(const char *file, bool ignorecase = true);
|
bool SetSource(const char *file, bool ignorecase = true);
|
||||||
bool Reload();
|
bool Reload();
|
||||||
|
|
||||||
std::string GetStringDefault(const char * name, std::string def);
|
std::string GetStringDefault(const char * name, std::string def);
|
||||||
bool GetBoolDefault(const char * name, const bool def);
|
bool GetBoolDefault(const char * name, const bool def);
|
||||||
int32 GetIntDefault(const char * name, const int32 def);
|
int32 GetIntDefault(const char * name, const int32 def);
|
||||||
float GetFloatDefault(const char * name, const float def);
|
float GetFloatDefault(const char * name, const float def);
|
||||||
|
|
||||||
std::string GetFilename() const { return mFilename; }
|
std::string GetFilename() const { return mFilename; }
|
||||||
|
|||||||
Reference in New Issue
Block a user