Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-06-13 19:13:55 +00:00
parent 515f8f9aeb
commit 09af13c077
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/enemy/ngen.cpp
View File

@ -48,10 +48,7 @@ void CNpcEnemyGenerator::think(int _frames)
m_movementTimer = 3 * GameState::getOneSecondInFrames(); m_movementTimer = 3 * GameState::getOneSecondInFrames();
CNpcEnemy *enemy; CNpcEnemy *enemy;
enemy = new( "spider crab" ) CNpcSpiderCrabEnemy; enemy=CNpcEnemy::Create( CNpcEnemy::NPC_SPIDER_CRAB );
ASSERT(enemy);
enemy->setType( CNpcEnemy::NPC_SPIDER_CRAB );
enemy->init();
enemy->setStartPos( Pos.vx >> 4, Pos.vy >> 4 ); enemy->setStartPos( Pos.vx >> 4, Pos.vy >> 4 );
u16 *waypointPtr = m_npcPath.getWaypointPtr(); u16 *waypointPtr = m_npcPath.getWaypointPtr();
@ -64,8 +61,8 @@ void CNpcEnemyGenerator::think(int _frames)
enemy->setWaypointPtr( waypointPtr ); enemy->setWaypointPtr( waypointPtr );
enemy->setPathType( m_npcPath.getPathType() ); enemy->setPathType( m_npcPath.getPathType() );
enemy->postInit(); enemy->postInit();
enemy->updateCollisionArea();
addChild( enemy ); addChild( enemy );
} }

6
source/enemy/nworm.cpp
View File

@ -704,9 +704,6 @@ void CNpcParasiticWormEnemy::processShot( int _frames )
case NPC_GENERIC_HIT_DEATH_START: case NPC_GENERIC_HIT_DEATH_START:
{ {
m_animPlaying = true;
m_animNo = m_data[m_type].dieAnim;
m_frame = 0;
m_state = NPC_GENERIC_HIT_DEATH_END; m_state = NPC_GENERIC_HIT_DEATH_END;
if ( m_data[m_type].deathSfx < CSoundMediator::NUM_SFXIDS ) if ( m_data[m_type].deathSfx < CSoundMediator::NUM_SFXIDS )
@ -727,9 +724,6 @@ void CNpcParasiticWormEnemy::processShot( int _frames )
case NPC_GENERIC_HIT_DEATH_END: case NPC_GENERIC_HIT_DEATH_END:
{ {
m_drawRotation += 64 * _frames;
m_drawRotation &= 4095;
Pos.vy += m_speed * _frames; Pos.vy += m_speed * _frames;
// go through segments // go through segments

2
source/jellfish/jellfish.cpp
View File

@ -122,8 +122,6 @@ void CJellyfishGenerator::think( int _frames, CLevel *level )
} }
} }
//enemy->init();
DVECTOR offset = CLevel::getCameraPos(); DVECTOR offset = CLevel::getCameraPos();
DVECTOR startPos; DVECTOR startPos;