This commit is contained in:
parent
f0dfe1ac95
commit
c3df1a873c
3 changed files with 25 additions and 14 deletions
|
@ -247,6 +247,14 @@ void CNpcPlatform::setGraphic( sThingPlatform *ThisPlatform )
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
void CNpcPlatform::setGraphic( u8 graphicNum )
|
||||||
|
{
|
||||||
|
m_modelGfx = new ("ModelGfx") CModelGfx;
|
||||||
|
m_modelGfx->SetModel( graphicNum );
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
void CNpcPlatform::init()
|
void CNpcPlatform::init()
|
||||||
{
|
{
|
||||||
CPlatformThing::init();
|
CPlatformThing::init();
|
||||||
|
|
|
@ -76,6 +76,7 @@ public:
|
||||||
void setTiltable( bool isTiltable );
|
void setTiltable( bool isTiltable );
|
||||||
void addWaypoint( s32 xPos, s32 yPos );
|
void addWaypoint( s32 xPos, s32 yPos );
|
||||||
void setGraphic( sThingPlatform *ThisPlatform );
|
void setGraphic( sThingPlatform *ThisPlatform );
|
||||||
|
void setGraphic( u8 graphicNum );
|
||||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||||
|
|
||||||
static NPC_PLATFORM_UNIT_TYPE getTypeFromMapEdit( u16 newType );
|
static NPC_PLATFORM_UNIT_TYPE getTypeFromMapEdit( u16 newType );
|
||||||
|
|
|
@ -106,6 +106,8 @@ void CPlayerModeBubbleMixture::think()
|
||||||
DVECTOR pos;
|
DVECTOR pos;
|
||||||
bubble=new ("bubble platform") CNpcPlayerBubblePlatform;
|
bubble=new ("bubble platform") CNpcPlayerBubblePlatform;
|
||||||
bubble->setType( CNpcPlatform::NPC_PLAYER_BUBBLE_PLATFORM );
|
bubble->setType( CNpcPlatform::NPC_PLAYER_BUBBLE_PLATFORM );
|
||||||
|
bubble->setGraphic( (u8) 0 );
|
||||||
|
bubble->setTiltable( false );
|
||||||
pos=m_player->getPos();
|
pos=m_player->getPos();
|
||||||
pos.vx+=buboff.vx*m_player->getFacing();
|
pos.vx+=buboff.vx*m_player->getFacing();
|
||||||
pos.vy+=buboff.vy;
|
pos.vy+=buboff.vy;
|
||||||
|
|
Loading…
Add table
Reference in a new issue