diff --git a/source/player/player.cpp b/source/player/player.cpp index f97b7c04c..98e3a0b61 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -214,7 +214,7 @@ CPlayerMode *CPlayer::s_playerModes[NUM_PLAYERMODES]= &PLAYERMODEFLY, // PLAYER_MODE_FLY }; -int sbanimspeed=1; +int sbanimspeed=0; /*---------------------------------------------------------------------- diff --git a/source/player/pmbloon.cpp b/source/player/pmbloon.cpp index 844b24aae..c1f413c87 100644 --- a/source/player/pmbloon.cpp +++ b/source/player/pmbloon.cpp @@ -32,6 +32,10 @@ /* Data ---- */ +#ifndef __ANIM_SPONGEBOB_HEADER__ +#include +#endif + #ifndef __SPR_INGAMEFX_H__ #include #endif @@ -121,5 +125,22 @@ const struct PlayerMetrics *CPlayerModeBalloon::getPlayerMetrics() return &s_playerMetrics; } +/*---------------------------------------------------------------------- + Function: + Purpose: + Params: + Returns: + ---------------------------------------------------------------------- */ +void CPlayerModeBalloon::setAnimNo(int _animNo) +{ + // I think I'll overload the JUMP anim to the BALLOONJUMP here.. + // Just 'cos I can :) + if(_animNo==ANIM_SPONGEBOB_JUMP) + { + _animNo=ANIM_SPONGEBOB_BALLOONJUMP; + } + CPlayerModeBase::setAnimNo(_animNo); +} + /*=========================================================================== end */ diff --git a/source/player/pmbloon.h b/source/player/pmbloon.h index 7686bc394..686f765c0 100644 --- a/source/player/pmbloon.h +++ b/source/player/pmbloon.h @@ -43,6 +43,9 @@ public: virtual int canFallForever() {return true;} virtual const struct PlayerMetrics *getPlayerMetrics(); + + virtual void setAnimNo(int _animNo); + }; diff --git a/source/player/pmbubble.h b/source/player/pmbubble.h index ab8841eeb..8efc0afe3 100644 --- a/source/player/pmbubble.h +++ b/source/player/pmbubble.h @@ -44,8 +44,6 @@ public: virtual void setAnimNo(int _animNo); virtual void setAnimFrame(int _animFrame); - void giveBubbleAmmo(int _amount) {m_bubbleCount+=_amount;} - private: enum { @@ -59,8 +57,6 @@ private: int m_blowing; int m_bubbleDelay; - int m_bubbleCount; - }; diff --git a/source/player/pmnet.cpp b/source/player/pmnet.cpp index 6a8c7ed6f..5c4fe0d27 100644 --- a/source/player/pmnet.cpp +++ b/source/player/pmnet.cpp @@ -177,8 +177,7 @@ void CPlayerModeNet::think() break; } - //!!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE); - m_player->setAnimNo(ANIM_SPONGEBOB_IDLEBREATH); + m_player->setAnimNo(ANIM_SPONGEBOB_SWIPE); m_player->setAnimFrame(m_netFrame); m_netFrame++; if(m_netFrame>=m_player->getAnimFrameCount())