aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-06-01 15:39:49 -0500
committermegamage <none@none>2009-06-01 15:39:49 -0500
commit751665248146001f45c30924037bb200a2821d60 (patch)
tree6cbc507c8c09317c8eac648ac913d7e5523c2d2b /src
parent6e4a8e1ea9c090bf2c33e28534f7875c3fa89d19 (diff)
parentae5f9ac22728f7f844becc6cc1b71cd4b901c79c (diff)
*Skip. Conflicts with TC2. I do not know how to merge it.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Player.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index d90183f2a0c..cf66f09f11e 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -6937,6 +6937,7 @@ void Player::CastItemCombatSpell(Item *item, CalcDamageInfo *damageInfo, ItemPro
// Can do effect if any damage done to target
if (damageInfo->damage)
+ //if (damageInfo->procVictim & PROC_FLAG_TAKEN_ANY_DAMAGE)
{
for (int i = 0; i < 5; i++)
{
@@ -7001,6 +7002,7 @@ void Player::CastItemCombatSpell(Item *item, CalcDamageInfo *damageInfo, ItemPro
{
// Can do effect if any damage done to target
if (!(damageInfo->damage))
+ //if (!(damageInfo->procVictim & PROC_FLAG_TAKEN_ANY_DAMAGE))
continue;
}