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-08 16:25:45 +00:00
parent 26d50aa503
commit 9beaeed67a
7 changed files with 88 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/hazard/hazard.cpp
View file

@ -282,6 +282,8 @@ void CNpcHazard::init()
m_extension = 0;
m_extendDir = 0;
m_heading = 0;
clearPlatform();
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -335,6 +337,8 @@ void CNpcHazard::think(int _frames)
{
processTimer( _frames );
}
clearPlatform();
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

6
source/hazard/hazard.h
View file

@ -65,6 +65,10 @@ public:
static NPC_HAZARD_UNIT_TYPE getTypeFromMapEdit( u16 newType );
static CNpcHazard *Create(sThingHazard *ThisHazard);
void setPlatform(CThing *_newPlatform) {m_platform = _newPlatform;}
void clearPlatform() {m_platform = NULL;}
CThing *isOnPlatform() {return m_platform;}
protected:
enum
{
@ -93,6 +97,8 @@ protected:
s32 m_heading;
CModelGfx *m_modelGfx;
CThing *m_platform;
static NPC_HAZARD_UNIT_TYPE mapEditConvertTable[NPC_HAZARD_TYPE_MAX];
};

65
source/hazard/hdbarrel.cpp
View file

@ -19,6 +19,10 @@
#include "level\layercollision.h"
#endif
#ifndef __PLATFORM_PLATFORM_H__
#include "platform\platform.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcDualPlatformBarrelHazard::init()
@ -45,42 +49,25 @@ void CNpcDualPlatformBarrelHazard::processMovement( int _frames )
bool pathComplete;
if ( m_npcPath.thinkFlat( Pos, &pathComplete, &distX, &distY, &m_heading ) )
m_npcPath.thinkFlat( Pos, &pathComplete, &distX, &distY, &m_heading );
if ( pathComplete )
{
if ( pathComplete )
{
// reset
// reset
Pos = m_base;
m_npcPath.resetPath();
Pos = m_base;
m_npcPath.resetPath();
return;
}
else
{
// check for vertical movement
groundHeight = m_layerCollision->getHeightFromGround( Pos.vx, Pos.vy, yMovement + 16 );
if ( groundHeight <= yMovement )
{
// groundHeight <= yMovement indicates either just above ground or on or below ground
moveY = groundHeight;
}
else
{
// fall
moveY = yMovement;
}
}
return;
}
else
{
// check for collision
distX = distX / abs( distX );
if ( distX )
{
distX = distX / abs( distX );
}
if ( m_layerCollision->getHeightFromGround( Pos.vx + ( distX * 3 * _frames ), Pos.vy ) < -maxHeight )
{
@ -103,9 +90,27 @@ void CNpcDualPlatformBarrelHazard::processMovement( int _frames )
}
else
{
// fall
CNpcPlatform *platform = (CNpcPlatform *) isOnPlatform();
moveY = yMovement;
if ( platform )
{
// stick to platform top
moveY = platform->getHeightFromPlatformAtPosition( Pos.vx, Pos.vy + yMovement );
if ( !platform->canDrop() )
{
// if platform cannot drop any further, move in X
moveX = distX * 3 * _frames;
}
}
else
{
// fall
moveY = yMovement;
}
}
}
}