Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Paul 2001-04-08 20:19:53 +00:00
parent 324dd50d94
commit cfa0d08f9e
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/player/pmbubble.cpp
View File

@ -124,7 +124,7 @@ void CPlayerModeBubbleMixture::think()
if(m_blowing) if(m_blowing)
{ {
//!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE); //!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
m_player->setAnimNo(ANIM_SPONGEBOB_FIRE); m_player->setAnimNo(ANIM_SPONGEBOB_IDLEBREATH);
m_player->setAnimFrame(m_blowFrame); m_player->setAnimFrame(m_blowFrame);
m_blowFrame++; m_blowFrame++;
if(m_blowFrame>=m_player->getAnimFrameCount()) if(m_blowFrame>=m_player->getAnimFrameCount())

15
source/player/pmjelly.cpp
View File

@ -83,7 +83,7 @@ void CPlayerModeJellyLauncher::enter()
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
DVECTOR jellyLaunchPos={20,-40}; DVECTOR jellyLaunchPos={-20,-40};
void CPlayerModeJellyLauncher::think() void CPlayerModeJellyLauncher::think()
{ {
CPlayerModeBase::think(); CPlayerModeBase::think();
@ -106,12 +106,12 @@ void CPlayerModeJellyLauncher::think()
{ {
m_firingTime++; m_firingTime++;
} }
m_player->setAnimNo(ANIM_SPONGEBOB_FIRE); m_player->setAnimNo(ANIM_SPONGEBOB_IDLEBREATH);
} }
else else
{ {
m_firingState=FIRING_STATE__FIRING; m_firingState=FIRING_STATE__FIRING;
m_player->setAnimNo(ANIM_SPONGEBOB_FIRE); m_player->setAnimNo(ANIM_SPONGEBOB_IDLEBREATH);
} }
break; break;
case FIRING_STATE__FIRING: case FIRING_STATE__FIRING:
@ -120,6 +120,8 @@ void CPlayerModeJellyLauncher::think()
{ {
int playerFacing; int playerFacing;
DVECTOR launchPos; DVECTOR launchPos;
int fireHeading;
CPlayerProjectile *projectile;
playerFacing=m_player->getFacing(); playerFacing=m_player->getFacing();
launchPos=getPlayerPos(); launchPos=getPlayerPos();
@ -128,9 +130,7 @@ void CPlayerModeJellyLauncher::think()
if(m_firingTime==TIMEOUT_FOR_BIG_SHOT&&m_player->getJellyAmmo()>=AMMO_AMOUNT_FOR_BIG_SHOT) if(m_firingTime==TIMEOUT_FOR_BIG_SHOT&&m_player->getJellyAmmo()>=AMMO_AMOUNT_FOR_BIG_SHOT)
{ {
// Powered up, big shot // Powered up, big shot
int fireHeading; int i;
CPlayerProjectile *projectile;
int i;
fireHeading=1024+(1024*playerFacing)-512; fireHeading=1024+(1024*playerFacing)-512;
for(i=0;i<3;i++) for(i=0;i<3;i++)
@ -148,9 +148,6 @@ void CPlayerModeJellyLauncher::think()
else else
{ {
// Normal, small shot // Normal, small shot
int fireHeading;
CPlayerProjectile *projectile;
fireHeading=1024+(1024*m_player->getFacing()); fireHeading=1024+(1024*m_player->getFacing());
projectile=new("JellyProjectile") CPlayerProjectile; projectile=new("JellyProjectile") CPlayerProjectile;
projectile->init(launchPos, projectile->init(launchPos,

2
source/player/pmnet.cpp
View File

@ -178,7 +178,7 @@ void CPlayerModeNet::think()
} }
//!!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE); //!!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
m_player->setAnimNo(ANIM_SPONGEBOB_FIRE); 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())