games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

* fix for bug 272, 176 and (probably) 273 (creatures cannot be attacked with catapult, position of explosion of catapult shot seems to be fixed for non 800x600 resolutions)

Browse Source
This commit is contained in:
mateuszb
2009-12-20 13:35:59 +00:00
parent 08c7541076
commit 4780bcd1a6
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/CBattleInterface.cpp
View File

@ -1020,8 +1020,8 @@ CShootingAnim::CShootingAnim(CBattleInterface * _owner, int attacker, int _dest,
if(catapult) //catapult attack
{
owner->addNewAnim( new CSpellEffectAnim(owner, "SGEXPL.DEF",
-130 + 22 * ( ((dest/BFIELD_WIDTH) + 1)%2 ) + 44 * (dest % BFIELD_WIDTH),
-50 + 42 * (dest/BFIELD_WIDTH) ));
-130 + 22 * ( ((dest/BFIELD_WIDTH) + 1)%2 ) + 44 * (dest % BFIELD_WIDTH) + owner->pos.x,
-50 + 42 * (dest/BFIELD_WIDTH) + owner->pos.y ));
}
}

3
lib/CGameState.cpp
View File

@ -2833,6 +2833,9 @@ bool CGameState::battleCanShoot(int ID, int dest)
if(our->hasFeatureOfType(StackFeature::FORGETFULL)) //forgetfulness
return false;
if(our->creature->idNumber == 145 && dst) //catapult cannot attack creatures
return false;
if(our->hasFeatureOfType(StackFeature::SHOOTER)//it's shooter
&& our->owner != dst->owner
&& dst->alive()