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-31 19:20:19 +00:00
parent 12955a7a5f
commit fe30698db8
6 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/enemy/nclam.cpp
View file

@ -314,8 +314,11 @@ void CNpcStaticClamEnemy::collidedWith( CThing *_thisThing )
{
if ( m_frame >= ( 5 << 8 ) )
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
if ( m_controlFunc != NPC_CONTROL_COLLISION )
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
}
}
}
}

14
source/enemy/ndogfish.cpp
View file

@ -430,8 +430,11 @@ void CNpcIronDogfishEnemy::processAttackCollision()
{
// only detect collision if in attack mode
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
if ( m_controlFunc != NPC_CONTROL_COLLISION )
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
}
break;
}
@ -514,8 +517,11 @@ void CNpcIronDogfishEnemy::collidedWith( CThing *_thisThing )
case DETECT_ALL_COLLISION:
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
if ( m_controlFunc != NPC_CONTROL_COLLISION )
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
}
break;
}

7
source/enemy/nfdutch.cpp
View file

@ -735,8 +735,11 @@ void CNpcFlyingDutchmanEnemy::collidedWith(CThing *_thisThing)
case DETECT_ALL_COLLISION:
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
if ( m_controlFunc != NPC_CONTROL_COLLISION )
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
}
processUserCollision( _thisThing );

7
source/enemy/nmjfish.cpp
View file

@ -841,8 +841,11 @@ void CNpcMotherJellyfishEnemy::collidedWith(CThing *_thisThing)
case DETECT_ALL_COLLISION:
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
if ( m_controlFunc != NPC_CONTROL_COLLISION )
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
}
processUserCollision( _thisThing );

7
source/enemy/npc.cpp
View file

@ -916,8 +916,11 @@ void CNpcEnemy::collidedWith( CThing *_thisThing )
case DETECT_ALL_COLLISION:
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
if ( m_controlFunc != NPC_CONTROL_COLLISION )
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
}
processUserCollision( _thisThing );

7
source/enemy/nsj2back.cpp
View file

@ -123,8 +123,11 @@ void CNpcSmallJellyfish2BackgroundEnemy::collidedWith( CThing *_thisThing )
case DETECT_ALL_COLLISION:
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
if ( m_controlFunc != NPC_CONTROL_COLLISION )
{
m_oldControlFunc = m_controlFunc;
m_controlFunc = NPC_CONTROL_COLLISION;
}
processUserCollision( _thisThing );