Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-05-30 18:31:57 +00:00
parent 415a7d7f4f
commit f821541cf3
5 changed files with 213 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/enemy/nsdart.cpp
View File

@ -185,7 +185,7 @@ void CNpcSquidDartEnemy::processClose( int _frames )
}
else
{
if ( yAim )
if ( abs( yAim ) > 20 )
{
movement = yAim;

122
source/platform/pconveyr.cpp
View File

@ -27,6 +27,11 @@
#include "platform\pfallnor.h"
#endif
#ifndef __VID_HEADER_
#include "system\vid.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcConveyorPlatformGenerator::collidedWith(CThing *_thisThing)
@ -102,6 +107,9 @@ void CNpcConveyorPlatform::postInit()
CNpcPlatform::postInit();
m_npcPath.setPathType( CNpcPath::SINGLE_USE_PATH );
m_spinFinish = false;
m_rotation = 0;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -112,40 +120,59 @@ void CNpcConveyorPlatform::processMovement( int _frames )
s32 distX, distY;
bool pathComplete, waypointChange;
m_npcPath.think( Pos, &pathComplete, &waypointChange, &distX, &distY );
if ( pathComplete )
if ( m_spinFinish )
{
setToShutdown();
m_rotation += 64 * _frames;
m_rotation &= 4095;
DVECTOR offset = CLevel::getCameraPos();
Pos.vy += 3 * _frames;
s32 yPos = Pos.vy - offset.vy;
if ( yPos > VidGetScrH() )
{
setToShutdown();
}
}
else
{
if ( distX )
{
moveX = distX;
m_npcPath.think( Pos, &pathComplete, &waypointChange, &distX, &distY );
if ( moveX > 1 )
{
moveX = 1;
}
else if ( moveX < -1 )
{
moveX = -1;
}
if ( pathComplete )
{
m_spinFinish = true;
}
else
{
moveY = distY;
s32 verticalMovement = 3 * _frames;
if ( moveY > verticalMovement )
if ( distX )
{
moveY = verticalMovement;
moveX = distX;
if ( moveX > 1 )
{
moveX = 1;
}
else if ( moveX < -1 )
{
moveX = -1;
}
}
else if ( moveY < -verticalMovement )
else
{
moveY = -verticalMovement;
moveY = distY;
s32 verticalMovement = 3 * _frames;
if ( moveY > verticalMovement )
{
moveY = verticalMovement;
}
else if ( moveY < -verticalMovement )
{
moveY = -verticalMovement;
}
}
}
}
@ -225,9 +252,10 @@ void CNpcConveyorPlatform::collidedWith( CThing *_thisThing )
case TYPE_HAZARD:
{
// needs to explode or something
setToShutdown();
if ( !m_spinFinish )
{
m_spinFinish = true;
}
break;
}
@ -237,3 +265,45 @@ void CNpcConveyorPlatform::collidedWith( CThing *_thisThing )
break;
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcConveyorPlatform::render()
{
if ( m_isActive )
{
CPlatformThing::render();
// Render
if (canRender())
{
DVECTOR &renderPos=getRenderPos();
SVECTOR rotation;
rotation.vx = 0;
rotation.vy = 0;
rotation.vz = m_rotation;
VECTOR scale;
scale.vx = ONE;
scale.vy = ONE;
scale.vz = ONE;
m_modelGfx->Render(renderPos,&rotation,&scale);
}
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
int CNpcConveyorPlatform::checkCollisionAgainst(CThing *_thisThing, int _frames)
{
if ( m_spinFinish )
{
return( false );
}
else
{
return( CNpcPlatform::checkCollisionAgainst( _thisThing, _frames ) );
}
}

5
source/platform/pconveyr.h
View File

@ -23,9 +23,14 @@ class CNpcConveyorPlatform : public CNpcPlatform
public:
virtual void postInit();
virtual CRECT const *getThinkBBox();
virtual void render();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
protected:
virtual void processMovement( int _frames );
virtual void collidedWith(CThing *_thisThing);
u8 m_spinFinish;
s16 m_rotation;
};
class CNpcConveyorPlatformGenerator : public CNpcPlatform

125
source/platform/pfallnor.cpp
View File

@ -23,6 +23,11 @@
#include "utils\utils.h"
#endif
#ifndef __VID_HEADER_
#include "system\vid.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcFallingNoRespawnPlatform::postInit()
@ -30,46 +35,84 @@ void CNpcFallingNoRespawnPlatform::postInit()
CNpcPlatform::postInit();
m_npcPath.setPathType( CNpcPath::SINGLE_USE_PATH );
m_spinFinish = false;
m_rotation = 0;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcFallingNoRespawnPlatform::processMovement( int _frames )
{
s32 moveX, moveY;
s32 moveX = 0, moveY = 0;
s32 distX, distY, heading;
bool pathComplete;
m_npcPath.thinkVertical( Pos, &pathComplete, &distX, &distY, &heading );
if ( pathComplete )
if ( m_spinFinish )
{
setToShutdown();
m_rotation += 64 * _frames;
m_rotation &= 4095;
DVECTOR offset = CLevel::getCameraPos();
if ( m_bounceDir )
{
Pos.vx += 2 * _frames;
}
else
{
Pos.vx -= 2 * _frames;
}
Pos.vy += m_speed * _frames;
if ( m_speed < 3 )
{
m_speed++;
}
s32 yPos = Pos.vy - offset.vy;
if ( yPos > VidGetScrH() )
{
setToShutdown();
}
}
else
{
moveX = 0;
moveY = m_speed * _frames;
m_npcPath.thinkVertical( Pos, &pathComplete, &distX, &distY, &heading );
if ( heading == 3072 )
if ( pathComplete )
{
moveY = -moveY;
m_spinFinish = true;
m_speed = -5;
m_bounceDir = getRnd() % 2;
}
s32 groundHeight = CGameScene::getCollision()->getHeightFromGround( Pos.vx + moveX, Pos.vy + moveY, 16 );
if ( groundHeight < moveY )
else
{
if ( ( CGameScene::getCollision()->getCollisionBlock( Pos.vx, Pos.vy + groundHeight + 8 ) & COLLISION_TYPE_MASK ) != COLLISION_TYPE_FLAG_DEATH_FALL )
moveX = 0;
moveY = m_speed * _frames;
if ( heading == 3072 )
{
moveY = groundHeight;
moveX = 2 * _frames;
moveY = -moveY;
}
s32 groundHeight = CGameScene::getCollision()->getHeightFromGround( Pos.vx + moveX, Pos.vy + moveY, 16 );
if ( groundHeight < moveY )
{
if ( ( CGameScene::getCollision()->getCollisionBlock( Pos.vx, Pos.vy + groundHeight + 8 ) & COLLISION_TYPE_MASK ) != COLLISION_TYPE_FLAG_DEATH_FALL )
{
moveY = groundHeight;
moveX = 2 * _frames;
}
}
}
Pos.vx += moveX;
Pos.vy += moveY;
}
Pos.vx += moveX;
Pos.vy += moveY;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -85,4 +128,46 @@ const CRECT *CNpcFallingNoRespawnPlatform::getThinkBBox()
objThinkBox.y2 = thinkBBox.YMax;
return &objThinkBox;
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcFallingNoRespawnPlatform::render()
{
if ( m_isActive )
{
CPlatformThing::render();
// Render
if (canRender())
{
DVECTOR &renderPos=getRenderPos();
SVECTOR rotation;
rotation.vx = 0;
rotation.vy = 0;
rotation.vz = m_rotation;
VECTOR scale;
scale.vx = ONE;
scale.vy = ONE;
scale.vz = ONE;
m_modelGfx->Render(renderPos,&rotation,&scale);
}
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
int CNpcFallingNoRespawnPlatform::checkCollisionAgainst(CThing *_thisThing, int _frames)
{
if ( m_spinFinish )
{
return( false );
}
else
{
return( CNpcPlatform::checkCollisionAgainst( _thisThing, _frames ) );
}
}

6
source/platform/pfallnor.h
View File

@ -23,8 +23,14 @@ class CNpcFallingNoRespawnPlatform : public CNpcPlatform
public:
virtual void postInit();
virtual CRECT const *getThinkBBox();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
protected:
virtual void render();
virtual void processMovement( int _frames );
u8 m_spinFinish;
s16 m_rotation;
u8 m_bounceDir;
};
#endif