zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-04-26 21:29:44 +00:00
parent 8744b10af4
commit 7fa8e5a852
10 changed files with 81 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
source/enemy/npc.cpp
View file

@ -804,8 +804,6 @@ void CNpcEnemy::shutdown()
if (m_actorGfx) delete m_actorGfx;
deleteAllChild();
CEnemyThing::shutdown();
}
@ -985,7 +983,12 @@ void CNpcEnemy::collidedWith( CThing *_thisThing )
case TYPE_ENEMY:
{
processEnemyCollision( _thisThing );
CNpcEnemy *enemy = (CNpcEnemy *) _thisThing;
if ( enemy->canCollideWithEnemy() )
{
processEnemyCollision( _thisThing );
}
break;
}
@ -1517,11 +1520,11 @@ void CNpcEnemy::processEnemyCollision( CThing *thisThing )
if ( yDist > 0 )
{
Pos.vy += 6;
Pos.vy += 3;
}
else
{
Pos.vy -= 6;
Pos.vy -= 3;
}
Pos.vx += otherDelta.vx;