diff options
| author | megamage <none@none> | 2009-01-29 20:43:59 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-29 20:43:59 -0600 |
| commit | 440f5ed90c83c12b3d569672eec9f6dc20320435 (patch) | |
| tree | ce98045e26e2b6c43637ae4173bce44bb328e2f7 | |
| parent | b0bf621a139aaa6e620098fc7a4411a800fda43d (diff) | |
*Fix build.
--HG--
branch : trunk
| -rw-r--r-- | src/game/Player.cpp | 6 | ||||
| -rw-r--r-- | src/game/SpellAuras.cpp | 2 | ||||
| -rw-r--r-- | src/shared/revision.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 52e16a4c396..7bf2deff3e8 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -20189,11 +20189,11 @@ bool Player::IsAllowUseFlyMountsHere() const { case 0: case 1: - if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_AZEROTH)) + //if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_AZEROTH)) return false; break; case 530: - if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_OUTLAND)) + //if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_OUTLAND)) return false; break; case 571: @@ -20201,7 +20201,7 @@ bool Player::IsAllowUseFlyMountsHere() const return false; break; default: - if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_OTHERS)) + //if (!sWorld.getConfig(CONFIG_FLYING_MOUNTS_OTHERS)) return false; break; } diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 47bee213e21..fdb8fe316f5 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -5512,7 +5512,7 @@ void Aura::PeriodicTick() } } else - pdamage = uint32(m_target->GetMaxHealth()*amount/100); + pdamage = uint32(m_target->GetMaxHealth()*pdamage/100); //As of 2.2 resilience reduces damage from DoT ticks as much as the chance to not be critically hit // Reduce dot damage from resilience for players diff --git a/src/shared/revision.h b/src/shared/revision.h index 1d590b1e7c0..e60dcfdb657 100644 --- a/src/shared/revision.h +++ b/src/shared/revision.h @@ -1,7 +1,7 @@ #ifndef __REVISION_H__ #define __REVISION_H__ - #define _REVISION "1091" - #define _HASH "88c4b2b6b9a2" + #define _REVISION "1116" + #define _HASH "81edc7393bc6" #define _REVISION_DATE "*" #define _REVISION_TIME "*" #endif // __REVISION_H__ |