diff --git a/source/platform/pdrop.h b/source/platform/pdrop.h index 3f2b57e86..25ff038e1 100644 --- a/source/platform/pdrop.h +++ b/source/platform/pdrop.h @@ -22,6 +22,7 @@ class CNpcDropPlatform : public CNpcPlatform { public: void postInit(); + bool alwaysThink() {return(true);} protected: void processMovement( int _frames ); diff --git a/source/platform/platform.cpp b/source/platform/platform.cpp index c9faeb8cf..9ae9bb2bd 100644 --- a/source/platform/platform.cpp +++ b/source/platform/platform.cpp @@ -1372,4 +1372,14 @@ int Type= mapEditConvertTable[newType]; CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::getTypeFromMapEdit( u16 newType ) { return( mapEditConvertTable[newType] ); -} \ No newline at end of file +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +bool CNpcPlatform::alwaysThink() +{ + int chapter=GameScene.getChapterNumber(); + int level=GameScene.getLevelNumber(); + + return( chapter == 1 && level == 5 ); +} diff --git a/source/platform/platform.h b/source/platform/platform.h index eae3b0147..4a1da15be 100644 --- a/source/platform/platform.h +++ b/source/platform/platform.h @@ -136,6 +136,7 @@ public: static CNpcPlatform *Create(sThingPlatform *ThisPlatform); virtual void setSpeed( s16 newSpeed ) {m_speed = newSpeed;} + virtual bool alwaysThink(); protected: // NPC data structure definitions // diff --git a/source/triggers/tgstop.cpp b/source/triggers/tgstop.cpp index 739cac2f8..f698fd743 100644 --- a/source/triggers/tgstop.cpp +++ b/source/triggers/tgstop.cpp @@ -91,7 +91,7 @@ void CGaryStopTrigger::collidedWith(CThing *_thisThing) if ( !m_dropped ) { - if ( GameScene.getChapterNumber() != 6 ) + if ( GameScene.getChapterNumber() != 1 ) { DVECTOR newPos = Pos; newPos.vy -= 8;