Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed bug : FlameShield can now be cast on catapults and naval units

Browse source
This commit is contained in:
jsalmon3 2003-01-22 20:07:35 +00:00
parent a9bdf276ed
commit f65b4f5ac8
2 changed files with 9 additions and 3 deletions
doc
ChangeLog.html
src/stratagus
spells.cpp

2
doc/ChangeLog.html
View file

@ -1042,6 +1042,8 @@
<LI>Fixed bug #668971: Segfaults on game load (from Jimmy Salmon).
<LI>Fixed bug #672467: FlameShield is unable to hit air (from
Jimmy Salmon).
<LI>Fixed bug #672490: FlameShield can now be cast on catapults and naval
units (from Jimmy Salmon).
<LI>+++
</UL>
</UL>

10
src/stratagus/spells.cpp
View file

@ -640,8 +640,10 @@ global int CanCastSpell(const Unit* unit, const SpellType* spell,
return 0;
case SpellActionFlameShield:
// flame shield only on organic land units?
if (target && target->Type->Organic && target->Type->LandUnit
// flame shield only on land and sea units
if (target && !target->Type->Building
&& (target->Type->UnitType == UnitTypeLand
|| target->Type->UnitType == UnitTypeNaval)
&& target->FlameShield < spell->TTL ) {
return 1;
}
@ -876,7 +878,9 @@ global int SpellCast(Unit * unit, const SpellType * spell, Unit * target,
break;
case SpellActionFlameShield:
if (target && target->Type->Organic && target->Type->LandUnit
if (target && !target->Type->Building
&& (target->Type->UnitType == UnitTypeLand
|| target->Type->UnitType == UnitTypeNaval)
&& target->FlameShield < spell->TTL) {
Missile* mis;