diff options
| author | megamage <none@none> | 2009-05-02 13:30:55 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-05-02 13:30:55 -0500 |
| commit | 9f0f239e60e2c7f0b8d36d1984f459102022164e (patch) | |
| tree | 45e7629371e903fdd429a1bf449c9c53bf46d9ec /src/bindings/scripts/include | |
| parent | 8a05a5b91cf884c87c9ada5b0bd0ab872a3167e0 (diff) | |
| parent | f303ee08c5888170ad1509b89413af1e2a321f5c (diff) | |
*Merge.
*Also fix build in VC7 and VC8.
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts/include')
| -rw-r--r-- | src/bindings/scripts/include/sc_creature.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index 6d1fbc73dd5..1942fdadd71 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -552,49 +552,49 @@ void FillSpellSummary() for (int j=0; j<3; j++) { //Spell targets self - if ( TempSpell->EffectImplicitTargetA[j] == TARGET_SELF ) + if ( TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_CASTER ) SpellSummary[i].Targets |= 1 << (SELECT_TARGET_SELF-1); //Spell targets a single enemy - if ( TempSpell->EffectImplicitTargetA[j] == TARGET_CHAIN_DAMAGE || - TempSpell->EffectImplicitTargetA[j] == TARGET_CURRENT_ENEMY_COORDINATES ) + if ( TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_TARGET_ENEMY || + TempSpell->EffectImplicitTargetA[j] == TARGET_DST_TARGET_ENEMY ) SpellSummary[i].Targets |= 1 << (SELECT_TARGET_SINGLE_ENEMY-1); //Spell targets AoE at enemy - if ( TempSpell->EffectImplicitTargetA[j] == TARGET_ALL_ENEMY_IN_AREA || - TempSpell->EffectImplicitTargetA[j] == TARGET_ALL_ENEMY_IN_AREA_INSTANT || - TempSpell->EffectImplicitTargetA[j] == TARGET_DEST_CASTER || + if ( TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_AREA_ENEMY_SRC || + TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_AREA_ENEMY_DST || + TempSpell->EffectImplicitTargetA[j] == TARGET_SRC_CASTER || TempSpell->EffectImplicitTargetA[j] == TARGET_DEST_DYNOBJ_ENEMY ) SpellSummary[i].Targets |= 1 << (SELECT_TARGET_AOE_ENEMY-1); //Spell targets an enemy - if ( TempSpell->EffectImplicitTargetA[j] == TARGET_CHAIN_DAMAGE || - TempSpell->EffectImplicitTargetA[j] == TARGET_CURRENT_ENEMY_COORDINATES || - TempSpell->EffectImplicitTargetA[j] == TARGET_ALL_ENEMY_IN_AREA || - TempSpell->EffectImplicitTargetA[j] == TARGET_ALL_ENEMY_IN_AREA_INSTANT || - TempSpell->EffectImplicitTargetA[j] == TARGET_DEST_CASTER || + if ( TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_TARGET_ENEMY || + TempSpell->EffectImplicitTargetA[j] == TARGET_DST_TARGET_ENEMY || + TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_AREA_ENEMY_SRC || + TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_AREA_ENEMY_DST || + TempSpell->EffectImplicitTargetA[j] == TARGET_SRC_CASTER || TempSpell->EffectImplicitTargetA[j] == TARGET_DEST_DYNOBJ_ENEMY ) SpellSummary[i].Targets |= 1 << (SELECT_TARGET_ANY_ENEMY-1); //Spell targets a single friend(or self) - if ( TempSpell->EffectImplicitTargetA[j] == TARGET_SELF || - TempSpell->EffectImplicitTargetA[j] == TARGET_SINGLE_FRIEND || - TempSpell->EffectImplicitTargetA[j] == TARGET_SINGLE_PARTY ) + if ( TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_CASTER || + TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_TARGET_ALLY || + TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_TARGET_PARTY ) SpellSummary[i].Targets |= 1 << (SELECT_TARGET_SINGLE_FRIEND-1); //Spell targets aoe friends - if ( TempSpell->EffectImplicitTargetA[j] == TARGET_ALL_PARTY_AROUND_CASTER || - TempSpell->EffectImplicitTargetA[j] == TARGET_AREAEFFECT_PARTY || - TempSpell->EffectImplicitTargetA[j] == TARGET_DEST_CASTER) + if ( TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_PARTY_CASTER || + TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_PARTY_TARGET || + TempSpell->EffectImplicitTargetA[j] == TARGET_SRC_CASTER) SpellSummary[i].Targets |= 1 << (SELECT_TARGET_AOE_FRIEND-1); //Spell targets any friend(or self) - if ( TempSpell->EffectImplicitTargetA[j] == TARGET_SELF || - TempSpell->EffectImplicitTargetA[j] == TARGET_SINGLE_FRIEND || - TempSpell->EffectImplicitTargetA[j] == TARGET_SINGLE_PARTY || - TempSpell->EffectImplicitTargetA[j] == TARGET_ALL_PARTY_AROUND_CASTER || - TempSpell->EffectImplicitTargetA[j] == TARGET_AREAEFFECT_PARTY || - TempSpell->EffectImplicitTargetA[j] == TARGET_DEST_CASTER) + if ( TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_CASTER || + TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_TARGET_ALLY || + TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_TARGET_PARTY || + TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_PARTY_CASTER || + TempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_PARTY_TARGET || + TempSpell->EffectImplicitTargetA[j] == TARGET_SRC_CASTER) SpellSummary[i].Targets |= 1 << (SELECT_TARGET_ANY_FRIEND-1); //Make sure that this spell includes a damage effect |