This commit is contained in:
Paul 2001-04-09 20:08:56 +00:00
parent 639ebd08b5
commit 9b31368d0d
5 changed files with 26 additions and 7 deletions

View File

@ -214,7 +214,7 @@ CPlayerMode *CPlayer::s_playerModes[NUM_PLAYERMODES]=
&PLAYERMODEFLY, // PLAYER_MODE_FLY &PLAYERMODEFLY, // PLAYER_MODE_FLY
}; };
int sbanimspeed=1; int sbanimspeed=0;
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------

View File

@ -32,6 +32,10 @@
/* Data /* Data
---- */ ---- */
#ifndef __ANIM_SPONGEBOB_HEADER__
#include <ACTOR_SPONGEBOB_ANIM.h>
#endif
#ifndef __SPR_INGAMEFX_H__ #ifndef __SPR_INGAMEFX_H__
#include <ingamefx.h> #include <ingamefx.h>
#endif #endif
@ -121,5 +125,22 @@ const struct PlayerMetrics *CPlayerModeBalloon::getPlayerMetrics()
return &s_playerMetrics; 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 */ end */

View File

@ -43,6 +43,9 @@ public:
virtual int canFallForever() {return true;} virtual int canFallForever() {return true;}
virtual const struct PlayerMetrics *getPlayerMetrics(); virtual const struct PlayerMetrics *getPlayerMetrics();
virtual void setAnimNo(int _animNo);
}; };

View File

@ -44,8 +44,6 @@ public:
virtual void setAnimNo(int _animNo); virtual void setAnimNo(int _animNo);
virtual void setAnimFrame(int _animFrame); virtual void setAnimFrame(int _animFrame);
void giveBubbleAmmo(int _amount) {m_bubbleCount+=_amount;}
private: private:
enum enum
{ {
@ -59,8 +57,6 @@ private:
int m_blowing; int m_blowing;
int m_bubbleDelay; int m_bubbleDelay;
int m_bubbleCount;
}; };

View File

@ -177,8 +177,7 @@ void CPlayerModeNet::think()
break; break;
} }
//!!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE); m_player->setAnimNo(ANIM_SPONGEBOB_SWIPE);
m_player->setAnimNo(ANIM_SPONGEBOB_IDLEBREATH);
m_player->setAnimFrame(m_netFrame); m_player->setAnimFrame(m_netFrame);
m_netFrame++; m_netFrame++;
if(m_netFrame>=m_player->getAnimFrameCount()) if(m_netFrame>=m_player->getAnimFrameCount())