Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-06-18 13:47:50 +00:00
parent c0cf19869f
commit de42770b92
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/enemy/nsshark.cpp
View File

@ -88,7 +88,7 @@ void CNpcSubSharkEnemy::processMovement( int _frames )
CProjectile *projectile;
projectile = CProjectile::Create();
projectile->init( Pos, 1024 );
projectile->init( Pos, 1024, CProjectile::PROJECTILE_MINE, CProjectile::PROJECTILE_FINITE_LIFE );
m_salvoCount--;

26
source/projectl/projectl.cpp
View File

@ -46,7 +46,9 @@
#ifndef __ENEMY_NPC_H__
#include "enemy\npc.h"
#endif
#include "gfx\otpos.h"
#include "fx\fx.h"
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -347,6 +349,20 @@ void CProjectile::think(int _frames)
break;
}
case PROJECTILE_MINE:
{
s32 moveY = _frames * m_speed;
s32 groundHeight = CGameScene::getCollision()->getHeightFromGround( Pos.vx, Pos.vy + moveY, 16 );
if ( groundHeight < 0 )
{
moveY = groundHeight;
}
Pos.vy += moveY;
}
case PROJECTILE_DUMBFIRE:
default:
{
@ -371,6 +387,11 @@ void CProjectile::think(int _frames)
if ( m_lifetime <= 0 )
{
setToShutdown();
if ( m_movementType == PROJECTILE_MINE )
{
CFX::Create( CFX::FX_TYPE_EXPLODE, Pos );
}
}
}
}
@ -434,6 +455,11 @@ void CProjectile::collidedWith(CThing *_thisThing)
if ( m_lifetimeType != PROJECTILE_INFINITE_LIFE )
{
setToShutdown();
if ( m_movementType == PROJECTILE_MINE )
{
CFX::Create( CFX::FX_TYPE_EXPLODE, Pos );
}
}
break;

1
source/projectl/projectl.h
View File

@ -29,6 +29,7 @@ public:
PROJECTILE_DUMBFIRE = 1,
PROJECTILE_USER_SEEK,
PROJECTILE_GAS_CLOUD,
PROJECTILE_MINE,
};
enum PROJECTILE_LIFETIME_TYPE