This commit is contained in:
parent
4c93823479
commit
f701f34dc4
25 changed files with 264 additions and 276 deletions
|
@ -17,8 +17,8 @@
|
|||
|
||||
#include "player\pmbubble.h"
|
||||
|
||||
#ifndef __PLATFORM_PPLAYER_H__
|
||||
#include "platform\pplayer.h"
|
||||
#ifndef __PLATFORM_PLATFORM_H__
|
||||
#include "platform\platform.h"
|
||||
#endif
|
||||
|
||||
#ifndef __GFX_FONT_H__
|
||||
|
@ -103,12 +103,9 @@ void CPlayerModeBubbleMixture::think()
|
|||
if(!m_blowing&&getPadInputDown()&PI_FIRE&&canBlowBubbleFromThisState()&&m_player->getBubbleAmmo())
|
||||
{
|
||||
// Spawn the bubbly platform thingy..!
|
||||
CNpcPlayerBubblePlatform *bubble;
|
||||
CNpcPlatform *bubble;
|
||||
DVECTOR pos;
|
||||
bubble=new ("bubble platform") CNpcPlayerBubblePlatform;
|
||||
bubble->setThingSubType( CNpcPlatform::NPC_PLAYER_BUBBLE_PLATFORM );
|
||||
bubble->setGraphic( (u8) 0 );
|
||||
bubble->setTiltable( false );
|
||||
bubble = CNpcPlatform::Create( CNpcPlatform::NPC_PLAYER_BUBBLE_PLATFORM );
|
||||
pos=m_player->getPos();
|
||||
pos.vx+=buboff.vx*m_player->getFacing();
|
||||
pos.vy+=buboff.vy;
|
||||
|
|
|
@ -276,7 +276,7 @@ void CPlayerModeCoralBlower::think()
|
|||
launchHeading=(-((m_launchHeading+1024)*facing)-1024)&4095;
|
||||
|
||||
CEnemyAsSpriteProjectile *projectile;
|
||||
projectile = new( "blower projectile" ) CEnemyAsSpriteProjectile;
|
||||
projectile = CEnemyAsSpriteProjectile::Create();
|
||||
projectile->init( launchPos,
|
||||
launchHeading,//1024+(1024*facing),
|
||||
CPlayerProjectile::PLAYER_PROJECTILE_DUMBFIRE,
|
||||
|
|
|
@ -296,7 +296,7 @@ void CPlayerModeJellyLauncher::launchProjectile()
|
|||
fireHeading=1024+(1024*playerFacing)-512;
|
||||
for(i=0;i<3;i++)
|
||||
{
|
||||
projectile=new("JellyProjectile") CPlayerProjectile;
|
||||
projectile=CPlayerProjectile::Create();
|
||||
projectile->init(launchPos,
|
||||
fireHeading,
|
||||
CPlayerProjectile::PLAYER_PROJECTILE_DUMBFIRE,
|
||||
|
@ -312,7 +312,7 @@ void CPlayerModeJellyLauncher::launchProjectile()
|
|||
{
|
||||
// Normal, small shot
|
||||
fireHeading=1024+(1024*m_player->getFacing());
|
||||
projectile=new("JellyProjectile") CPlayerProjectile;
|
||||
projectile=CPlayerProjectile::Create();
|
||||
projectile->init(launchPos,
|
||||
fireHeading,
|
||||
CPlayerProjectile::PLAYER_PROJECTILE_DUMBFIRE,
|
||||
|
|
|
@ -229,7 +229,7 @@ void CPlayerModeNet::think()
|
|||
launchPos.vy+=netLaunchPos.vy;
|
||||
|
||||
|
||||
projectile = new( "user projectile" ) CPlayerProjectile;
|
||||
projectile = CPlayerProjectile::Create();
|
||||
|
||||
projectile->init( launchPos,
|
||||
fireHeading,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue