From 254aa996950302d0fde25c6e46074e9fa4379770 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 16 Jul 2001 21:53:59 +0000 Subject: [PATCH] --- source/enemy/npcdata.cpp | 2 +- source/platform/pfishhk.h | 1 + source/platform/platform.cpp | 12 +++++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/source/enemy/npcdata.cpp b/source/enemy/npcdata.cpp index fdc9286aa..71e7264dd 100644 --- a/source/enemy/npcdata.cpp +++ b/source/enemy/npcdata.cpp @@ -355,7 +355,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = NPC_CLOSE_NONE, NPC_TIMER_NONE, false, - 2, + 3, 2048, DETECT_ALL_COLLISION, DAMAGE__HIT_ENEMY, diff --git a/source/platform/pfishhk.h b/source/platform/pfishhk.h index cec5a963f..71973ae8b 100644 --- a/source/platform/pfishhk.h +++ b/source/platform/pfishhk.h @@ -24,6 +24,7 @@ public: virtual void postInit(); void render(); CRECT const *getThinkBBox(); + bool alwaysThink() {return(false);} protected: void processLifetime( int _frames ); void processMovement( int _frames ); diff --git a/source/platform/platform.cpp b/source/platform/platform.cpp index 9ae9bb2bd..14773ba84 100644 --- a/source/platform/platform.cpp +++ b/source/platform/platform.cpp @@ -1381,5 +1381,15 @@ bool CNpcPlatform::alwaysThink() int chapter=GameScene.getChapterNumber(); int level=GameScene.getLevelNumber(); - return( chapter == 1 && level == 5 ); + if ( chapter == 1 ) + { + if ( level == 5 ) + { + return( true ); + } + } + + return( false ); + + //return( ( chapter == 1 ) && ( level == 5 ) ); }