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-05-14 18:48:54 +00:00
parent 45e993fffa
commit 2ef77639d3
6 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/enemy/nanemone.cpp
View file

@ -485,7 +485,7 @@ void CNpcAnemone2Enemy::processClose( int _frames )
m_controlFunc = NPC_CONTROL_MOVEMENT;
m_timerFunc = NPC_TIMER_ATTACK_DONE;
m_timerTimer = GameState::getOneSecondInFrames();
m_timerTimer = 4 * GameState::getOneSecondInFrames();
m_sensorFunc = NPC_SENSOR_NONE;
}
}

12
source/enemy/npc.cpp
View file

@ -1455,7 +1455,17 @@ void CNpcEnemy::processEnemyCollision( CThing *thisThing )
}
Pos.vx += otherDelta.vx;
Pos.vy += otherDelta.vy;
s32 groundHeight = m_layerCollision->getHeightFromGround( Pos.vx, Pos.vy, 16 );
if ( groundHeight < 8 )
{
Pos.vy += groundHeight;
}
else
{
Pos.vy += otherDelta.vy;
}
m_heading = headingFromTarget;