diff --git a/source/player/pmbubble.cpp b/source/player/pmbubble.cpp index 00206fe96..a0305d591 100644 --- a/source/player/pmbubble.cpp +++ b/source/player/pmbubble.cpp @@ -124,7 +124,7 @@ void CPlayerModeBubbleMixture::think() if(m_blowing) { //!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE); - m_player->setAnimNo(ANIM_SPONGEBOB_FIRE); + m_player->setAnimNo(ANIM_SPONGEBOB_IDLEBREATH); m_player->setAnimFrame(m_blowFrame); m_blowFrame++; if(m_blowFrame>=m_player->getAnimFrameCount()) diff --git a/source/player/pmjelly.cpp b/source/player/pmjelly.cpp index cc2e417a8..7b93efc68 100644 --- a/source/player/pmjelly.cpp +++ b/source/player/pmjelly.cpp @@ -83,7 +83,7 @@ void CPlayerModeJellyLauncher::enter() Params: Returns: ---------------------------------------------------------------------- */ -DVECTOR jellyLaunchPos={20,-40}; +DVECTOR jellyLaunchPos={-20,-40}; void CPlayerModeJellyLauncher::think() { CPlayerModeBase::think(); @@ -106,12 +106,12 @@ void CPlayerModeJellyLauncher::think() { m_firingTime++; } - m_player->setAnimNo(ANIM_SPONGEBOB_FIRE); + m_player->setAnimNo(ANIM_SPONGEBOB_IDLEBREATH); } else { m_firingState=FIRING_STATE__FIRING; - m_player->setAnimNo(ANIM_SPONGEBOB_FIRE); + m_player->setAnimNo(ANIM_SPONGEBOB_IDLEBREATH); } break; case FIRING_STATE__FIRING: @@ -120,6 +120,8 @@ void CPlayerModeJellyLauncher::think() { int playerFacing; DVECTOR launchPos; + int fireHeading; + CPlayerProjectile *projectile; playerFacing=m_player->getFacing(); launchPos=getPlayerPos(); @@ -128,9 +130,7 @@ void CPlayerModeJellyLauncher::think() if(m_firingTime==TIMEOUT_FOR_BIG_SHOT&&m_player->getJellyAmmo()>=AMMO_AMOUNT_FOR_BIG_SHOT) { // Powered up, big shot - int fireHeading; - CPlayerProjectile *projectile; - int i; + int i; fireHeading=1024+(1024*playerFacing)-512; for(i=0;i<3;i++) @@ -148,9 +148,6 @@ void CPlayerModeJellyLauncher::think() else { // Normal, small shot - int fireHeading; - CPlayerProjectile *projectile; - fireHeading=1024+(1024*m_player->getFacing()); projectile=new("JellyProjectile") CPlayerProjectile; projectile->init(launchPos, diff --git a/source/player/pmnet.cpp b/source/player/pmnet.cpp index 53158cfab..6a8c7ed6f 100644 --- a/source/player/pmnet.cpp +++ b/source/player/pmnet.cpp @@ -178,7 +178,7 @@ void CPlayerModeNet::think() } //!!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE); - m_player->setAnimNo(ANIM_SPONGEBOB_FIRE); + m_player->setAnimNo(ANIM_SPONGEBOB_IDLEBREATH); m_player->setAnimFrame(m_netFrame); m_netFrame++; if(m_netFrame>=m_player->getAnimFrameCount())