This commit is contained in:
Charles 2001-05-05 19:08:02 +00:00
parent d8d896cdf4
commit 7943f99cbb
11 changed files with 114 additions and 2 deletions

View file

@ -15,6 +15,18 @@
#include "platform\pjellfsh.h"
#endif
#ifndef __LEVEL_LEVEL_H__
#include "level\level.h"
#endif
#ifndef __VID_HEADER_
#include "system\vid.h"
#endif
#ifndef __UTILS_HEADER__
#include "utils\utils.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

View file

@ -346,6 +346,19 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
NPC_PLATFORM_TIMER_NONE,
},
{ // NPC_JELLYFISH_PLATFORM
1,
//512,
2048,
true,
DAMAGE__NONE,
0,
4,
NPC_PLATFORM_INFINITE_LIFE,
0,
NPC_PLATFORM_TIMER_NONE,
},
{ // NPC_PLAYER_BUBBLE_PLATFORM
3,
128,

View file

@ -135,6 +135,9 @@
#include "platform\psbarrel.h"
#endif
#include "fx\fx.h"
#include "fx\fxjfish.h"
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -149,6 +152,7 @@ CNpcPlatform *CNpcPlatform::Create(sThingPlatform *ThisPlatform)
case NPC_LINEAR_PLATFORM:
{
platform = new ("linear platform") CNpcLinearPlatform;
break;
}
@ -471,6 +475,15 @@ void CNpcPlatform::postInit()
sBBox boundingBox = m_modelGfx->GetBBox();
setCollisionSize( ( boundingBox.XMax - boundingBox.XMin ), ( boundingBox.YMax - boundingBox.YMin ) );
setCollisionCentreOffset( ( boundingBox.XMax + boundingBox.XMin ) >> 1, ( boundingBox.YMax + boundingBox.YMin ) >> 1 );
if ( m_type == NPC_LINEAR_PLATFORM )
{
if ( CLevel::getCurrentChapter() != 5 && CLevel::getCurrentChapterLevel() != 4 )
{
CFXJellyFishLegs *T=(CFXJellyFishLegs*)CFX::Create(CFX::FX_TYPE_JELLYFISH_LEGS,this);
T->SetUp(64,4,8,8);
}
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -805,6 +818,13 @@ void CNpcPlatform::collidedWith( CThing *_thisThing )
break;
}
case TYPE_HAZARD:
{
m_contact = true;
break;
}
default:
ASSERT(0);
break;

View file

@ -79,6 +79,7 @@ public:
NPC_LEAF_PLATFORM,
NPC_BIG_WHEEL_PLATFORM,
NPC_STEERABLE_BARREL_PLATFORM,
NPC_JELLYFISH_PLATFORM,
NPC_PLAYER_BUBBLE_PLATFORM,
NPC_PLATFORM_TYPE_MAX,
};