This commit is contained in:
parent
3fc4da1be9
commit
196962c1b1
3 changed files with 7 additions and 2 deletions
|
@ -297,7 +297,7 @@ void CPlayerModeCoralBlower::think()
|
||||||
projectile = CEnemyAsSpriteProjectile::Create();
|
projectile = CEnemyAsSpriteProjectile::Create();
|
||||||
projectile->init( launchPos,
|
projectile->init( launchPos,
|
||||||
launchHeading,//1024+(1024*facing),
|
launchHeading,//1024+(1024*facing),
|
||||||
CPlayerProjectile::PLAYER_PROJECTILE_DUMBFIRE,
|
CPlayerProjectile::PLAYER_PROJECTILE_DUMBFIRE_CORAL,
|
||||||
CPlayerProjectile::PLAYER_PROJECTILE_FINITE_LIFE,
|
CPlayerProjectile::PLAYER_PROJECTILE_FINITE_LIFE,
|
||||||
5*60);
|
5*60);
|
||||||
|
|
||||||
|
|
|
@ -692,6 +692,7 @@ void CPlayerProjectile::think(int _frames)
|
||||||
}
|
}
|
||||||
|
|
||||||
case PLAYER_PROJECTILE_DUMBFIRE:
|
case PLAYER_PROJECTILE_DUMBFIRE:
|
||||||
|
case PLAYER_PROJECTILE_DUMBFIRE_CORAL:
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
if ( CGameScene::getCollision()->Get( Pos.vx >> 4, Pos.vy >> 4 ) )
|
if ( CGameScene::getCollision()->Get( Pos.vx >> 4, Pos.vy >> 4 ) )
|
||||||
|
@ -700,7 +701,10 @@ void CPlayerProjectile::think(int _frames)
|
||||||
|
|
||||||
CLevel &level = GameScene.GetLevel();
|
CLevel &level = GameScene.GetLevel();
|
||||||
|
|
||||||
|
if ( m_movementType == PLAYER_PROJECTILE_DUMBFIRE_CORAL )
|
||||||
|
{
|
||||||
level.destroyMapArea( Pos );
|
level.destroyMapArea( Pos );
|
||||||
|
}
|
||||||
|
|
||||||
setToShutdown();
|
setToShutdown();
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,6 +101,7 @@ public:
|
||||||
{
|
{
|
||||||
PLAYER_PROJECTILE_DUMBFIRE = 0,
|
PLAYER_PROJECTILE_DUMBFIRE = 0,
|
||||||
PLAYER_PROJECTILE_BOUNCING = 1,
|
PLAYER_PROJECTILE_BOUNCING = 1,
|
||||||
|
PLAYER_PROJECTILE_DUMBFIRE_CORAL,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum PLAYER_PROJECTILE_LIFETIME_TYPE
|
enum PLAYER_PROJECTILE_LIFETIME_TYPE
|
||||||
|
|
Loading…
Add table
Reference in a new issue