This commit is contained in:
parent
3401c0d0ac
commit
aa9b709247
4 changed files with 14 additions and 2 deletions
|
@ -22,6 +22,7 @@ class CNpcDropPlatform : public CNpcPlatform
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void postInit();
|
void postInit();
|
||||||
|
bool alwaysThink() {return(true);}
|
||||||
protected:
|
protected:
|
||||||
void processMovement( int _frames );
|
void processMovement( int _frames );
|
||||||
|
|
||||||
|
|
|
@ -1373,3 +1373,13 @@ CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::getTypeFromMapEdit( u16 newTy
|
||||||
{
|
{
|
||||||
return( mapEditConvertTable[newType] );
|
return( mapEditConvertTable[newType] );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
bool CNpcPlatform::alwaysThink()
|
||||||
|
{
|
||||||
|
int chapter=GameScene.getChapterNumber();
|
||||||
|
int level=GameScene.getLevelNumber();
|
||||||
|
|
||||||
|
return( chapter == 1 && level == 5 );
|
||||||
|
}
|
||||||
|
|
|
@ -136,6 +136,7 @@ public:
|
||||||
static CNpcPlatform *Create(sThingPlatform *ThisPlatform);
|
static CNpcPlatform *Create(sThingPlatform *ThisPlatform);
|
||||||
|
|
||||||
virtual void setSpeed( s16 newSpeed ) {m_speed = newSpeed;}
|
virtual void setSpeed( s16 newSpeed ) {m_speed = newSpeed;}
|
||||||
|
virtual bool alwaysThink();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// NPC data structure definitions //
|
// NPC data structure definitions //
|
||||||
|
|
|
@ -91,7 +91,7 @@ void CGaryStopTrigger::collidedWith(CThing *_thisThing)
|
||||||
|
|
||||||
if ( !m_dropped )
|
if ( !m_dropped )
|
||||||
{
|
{
|
||||||
if ( GameScene.getChapterNumber() != 6 )
|
if ( GameScene.getChapterNumber() != 1 )
|
||||||
{
|
{
|
||||||
DVECTOR newPos = Pos;
|
DVECTOR newPos = Pos;
|
||||||
newPos.vy -= 8;
|
newPos.vy -= 8;
|
||||||
|
|
Loading…
Add table
Reference in a new issue