This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
void Unit::CalculateAuraPeriodicTime(SpellEntry const* spellProto, uint32* periodicTime) | |
{ | |
bool applyHaste = (spellProto->AttributesEx5 & SPELL_ATTR_EX5_AFFECTED_BY_HASTE) != 0; | |
if (!applyHaste) | |
{ | |
Unit::AuraList const& mModByHaste = GetAurasByType(SPELL_AURA_MOD_PERIODIC_HASTE); | |
for (Unit::AuraList::const_iterator itr = mModByHaste.begin(); itr != mModByHaste.end(); ++itr) | |
{ | |
if ((*itr)->isAffectedOnSpell(spellProto)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp | |
index 8d2e26f..ad17048 100644 | |
--- a/src/game/Unit.cpp | |
+++ b/src/game/Unit.cpp | |
@@ -12333,7 +12333,7 @@ void Unit::SetVehicleId(uint32 entry) | |
} | |
} | |
-uint32 Unit::CalculateAuraPeriodicTimeWithHaste(SpellEntry const* spellProto, uint32 oldPeriodicTime, SpellEffectIndex eff_idx) | |
+uint32 Unit::CalculateAuraPeriodicTimeWithHaste(SpellEntry const* spellProto, uint32 oldPeriodicTime) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp | |
index 171632d..7e99476 100644 | |
--- a/src/game/SpellAuras.cpp | |
+++ b/src/game/SpellAuras.cpp | |
@@ -428,7 +428,7 @@ m_isPersistent(false), m_in_use(0), m_spellAuraHolder(holder) | |
if (modOwner && m_modifier.periodictime) | |
{ | |
modOwner->ApplySpellMod(spellproto->Id, SPELLMOD_ACTIVATION_TIME, m_modifier.periodictime); | |
- uint32 newperiodictime = modOwner->CalculateAuraPeriodicTimeWithHaste(spellproto, m_modifier.periodictime, eff); | |
+ uint32 newperiodictime = modOwner->CalculateAuraPeriodicTimeWithHaste(spellproto, m_modifier.periodictime); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 2fdbb32800724e79d2a2c1eb02b150e1629cfc1f Mon Sep 17 00:00:00 2001 | |
From: SeT <set@wowacadem.ru> | |
Date: Sun, 12 Jun 2011 14:12:50 +0700 | |
Subject: [PATCH 1/2] Strange | |
--- | |
base/BSW_instance.cpp | 8 +++----- | |
1 files changed, 3 insertions(+), 5 deletions(-) | |
diff --git a/base/BSW_instance.cpp b/base/BSW_instance.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 6177d88fd4f9c1d1b85874202afe00a57e26aa36 Mon Sep 17 00:00:00 2001 | |
From: SeT <set@wowacadem.ru> | |
Date: Sun, 12 Jun 2011 14:16:30 +0700 | |
Subject: [PATCH 2/2] Fix log | |
--- | |
base/BSW_instance.cpp | 4 ++-- | |
1 files changed, 2 insertions(+), 2 deletions(-) | |
diff --git a/base/BSW_instance.cpp b/base/BSW_instance.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
src/game/Player.cpp | 36 ++++++++++++++++++++++++++---------- | |
1 files changed, 26 insertions(+), 10 deletions(-) | |
diff --git a/src/game/Player.cpp b/src/game/Player.cpp | |
index 6471861..d5dcf34 100644 | |
--- a/src/game/Player.cpp | |
+++ b/src/game/Player.cpp | |
@@ -3560,10 +3560,26 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo | |
{ | |
PlayerSpellMap::iterator itr = m_spells.find(spell_id); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
catalog/view/theme/malian/stylesheet/stylesheet.css | 12 ++++++------ | |
1 file changed, 6 insertions(+), 6 deletions(-) | |
diff --git a/catalog/view/theme/malian/stylesheet/stylesheet.css b/catalog/view/theme/malian/stylesheet/stylesheet.css | |
index 43fe9ea..13d6021 100644 | |
--- a/catalog/view/theme/malian/stylesheet/stylesheet.css | |
+++ b/catalog/view/theme/malian/stylesheet/stylesheet.css | |
@@ -183,10 +183,10 @@ a.btn-detail span { text-indent:-9999px; float:left; } | |
.box .box-content1 { padding:0px; -webkit-border-bottom-left-radius: 5px; -moz-border-bottom-left-radius: 5px; -khtml-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; -webkit-border-bottom-right-radius: 5px; -moz-border-bottom-right-radius: 5px; -khtml-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; } | |
.box .box-heading-related{ font-size:17px; padding:7px 0px; margin-bottom:10px; color:#333;background: url(../image/heading-line.png) bottom repeat-x;} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
if (SpellInfo const* transformSpellInfo = sSpellMgr->GetSpellInfo(getTransForm())) | |
if (transformSpellInfo->Attributes & SPELL_ATTR0_CASTABLE_WHILE_MOUNTED) | |
return false; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Unit/Unit.cpp | |
index aafef41809..64dcf13ecd 100644 | |
--- src/server/game/Entities/Unit/Unit.cpp | |
+++ src/server/game/Entities/Unit/Unit.cpp | |
@@ -14438,3 +14438,36 @@ float Unit::GetCollisionHeight() const | |
float const collisionHeight = scaleMod * modelData->CollisionHeight * modelData->Scale * displayInfo->scale; | |
return collisionHeight == 0.0f ? DEFAULT_COLLISION_HEIGHT : collisionHeight; | |
} | |
+ | |
+std::pair<float, float> Unit::GetAheadDistance() |