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-07-26 19:18:11 +00:00
parent f05b09726f
commit b60cf260f5
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
source/enemy/ngeneric.cpp
View file

@ -375,6 +375,24 @@ void CNpcEnemy::processGenericFixedPathWalk( int _frames, s32 *moveX, s32 *moveY
} }
} }
} }
switch ( CGameScene::getCollision()->getCollisionBlock( Pos.vx + (*moveX), Pos.vy + (*moveY) + 1 ) & COLLISION_TYPE_MASK )
{
case COLLISION_TYPE_FLAG_DEATH_FALL:
case COLLISION_TYPE_FLAG_DEATH_INSTANT:
case COLLISION_TYPE_FLAG_DEATH_LIQUID:
case COLLISION_TYPE_FLAG_DAMAGE:
{
m_health = 0;
m_controlFunc = NPC_CONTROL_SHOT;
m_state = NPC_GENERIC_HIT_CHECK_HEALTH;
break;
}
default:
break;
}
} }
bool CNpcEnemy::isCollisionWithGround() bool CNpcEnemy::isCollisionWithGround()