zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-07-27 16:54:28 +00:00
parent b6e83a687c
commit 2dafce2f20
4 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Graphics/characters/SpongeBob_Net/AnimList.Txt
View file

@ -18,6 +18,5 @@ GetHit
CrouchDown CrouchDown
CrouchUp CrouchUp
LookUp LookUp
IdleNet
IdleWeapon IdleWeapon
Celebrate Celebrate

6
source/player/player.cpp
View file

@ -353,7 +353,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
-1, // ANIM_SPONGEBOB_IDLEMATURE, -1, // ANIM_SPONGEBOB_IDLEMATURE,
-1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE,
-1, // ANIM_SPONGEBOB_IDLENOFACE, -1, // ANIM_SPONGEBOB_IDLENOFACE,
//NOIDLE ANIM_SPONGEBOB_NET_IDLENET, // ANIM_SPONGEBOB_IDLENET,
-1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_IDLEZORRO,
ANIM_SPONGEBOB_NET_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, ANIM_SPONGEBOB_NET_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
}, },
@ -394,7 +393,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
-1, // ANIM_SPONGEBOB_IDLEMATURE, -1, // ANIM_SPONGEBOB_IDLEMATURE,
-1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE,
-1, // ANIM_SPONGEBOB_IDLENOFACE, -1, // ANIM_SPONGEBOB_IDLENOFACE,
//NOIDLE -1, // ANIM_SPONGEBOB_IDLENET,
-1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_IDLEZORRO,
ANIM_SPONGEBOB_CORALBLOWER_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, ANIM_SPONGEBOB_CORALBLOWER_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
}, },
@ -435,7 +433,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
-1, // ANIM_SPONGEBOB_IDLEMATURE, -1, // ANIM_SPONGEBOB_IDLEMATURE,
-1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE,
-1, // ANIM_SPONGEBOB_IDLENOFACE, -1, // ANIM_SPONGEBOB_IDLENOFACE,
//NOIDLE -1, // ANIM_SPONGEBOB_IDLENET,
-1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_IDLEZORRO,
ANIM_SPONGEBOB_JELLYLAUNCHER_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, ANIM_SPONGEBOB_JELLYLAUNCHER_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
}, },
@ -476,7 +473,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
-1, // ANIM_SPONGEBOB_IDLEMATURE, -1, // ANIM_SPONGEBOB_IDLEMATURE,
-1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE,
-1, // ANIM_SPONGEBOB_IDLENOFACE, -1, // ANIM_SPONGEBOB_IDLENOFACE,
//NOIDLE -1, // ANIM_SPONGEBOB_IDLENET,
-1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_IDLEZORRO,
ANIM_SPONGEBOB_WAND_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, ANIM_SPONGEBOB_WAND_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
}, },
@ -517,7 +513,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
-1, // ANIM_SPONGEBOB_IDLEMATURE, -1, // ANIM_SPONGEBOB_IDLEMATURE,
-1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE,
-1, // ANIM_SPONGEBOB_IDLENOFACE, -1, // ANIM_SPONGEBOB_IDLENOFACE,
//NOIDLE ANIM_SPONGEBOB_JELLYFISH_IDLENET, // ANIM_SPONGEBOB_IDLENET,
-1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_IDLEZORRO,
ANIM_SPONGEBOB_JELLYFISH_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, ANIM_SPONGEBOB_JELLYFISH_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
}, },
@ -558,7 +553,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
-1, // ANIM_SPONGEBOB_IDLEMATURE, -1, // ANIM_SPONGEBOB_IDLEMATURE,
-1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE,
-1, // ANIM_SPONGEBOB_IDLENOFACE, -1, // ANIM_SPONGEBOB_IDLENOFACE,
//NOIDLE -1, // ANIM_SPONGEBOB_IDLENET,
-1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_IDLEZORRO,
-1, // ANIM_SPONGEBOB_CELEBRATE, -1, // ANIM_SPONGEBOB_CELEBRATE,
}, },

2
source/player/pmcoral.cpp
View file

@ -266,6 +266,7 @@ void CPlayerModeCoralBlower::think()
} }
CPadVibrationManager::setVibration(0,CPadVibrationManager::VIBE_CORAL_BLOWER_SUCK); CPadVibrationManager::setVibration(0,CPadVibrationManager::VIBE_CORAL_BLOWER_SUCK);
} }
setState(STATE_IDLE); // Re-enter idle state - stops idle anims happening :/
break; break;
case BLOWER_STATE__FULL: case BLOWER_STATE__FULL:
if(getPadInputDown()&PI_FIRE&&getState()==STATE_IDLE) if(getPadInputDown()&PI_FIRE&&getState()==STATE_IDLE)
@ -325,6 +326,7 @@ void CPlayerModeCoralBlower::think()
if(m_launchHeading>BLOWER_MAXIMUM_AIM_ANGLE)m_launchHeading=BLOWER_MAXIMUM_AIM_ANGLE; if(m_launchHeading>BLOWER_MAXIMUM_AIM_ANGLE)m_launchHeading=BLOWER_MAXIMUM_AIM_ANGLE;
} }
} }
setState(STATE_IDLE); // Re-enter idle state - stops idle anims happening :/
break; break;
} }
} }

10
source/player/psidle.cpp
View file

@ -243,7 +243,7 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayerModeBase *_playerMode)
if(finished) if(finished)
{ {
int animNo; int animNo;
if(m_idleTime<5) if(m_idleTime<2)
{ {
// Run the default idle anim a number of times before // Run the default idle anim a number of times before
// starting to do weird things.. // starting to do weird things..
@ -254,7 +254,7 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayerModeBase *_playerMode)
// Alternate random idle anims with the default one // Alternate random idle anims with the default one
if(m_currentIdleAnim==0&&getNumIdleAnims()>1) if(m_currentIdleAnim==0&&getNumIdleAnims()>1)
{ {
m_currentIdleAnim=getRndRange(getNumIdleAnims()); m_currentIdleAnim=getRndRange(getNumIdleAnims()-1)+1;
} }
else else
{ {
@ -293,7 +293,7 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayerModeBase *_playerMode)
static IdleAnims s_unarmedIdleAnims[]= static IdleAnims s_unarmedIdleAnims[]=
{ {
// start frame loop frame end frame loop count // start frame loop frame end frame loop count
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 10*60 }, // default { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 },
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 }, { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 },
{ -1, ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN, -1, 1 }, { -1, ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN, -1, 1 },
@ -324,7 +324,7 @@ int CPlayerStateUnarmedIdle::getNumIdleAnims()
static IdleAnims s_weaponIdleAnims[]= static IdleAnims s_weaponIdleAnims[]=
{ {
// start frame loop frame end frame loop count // start frame loop frame end frame loop count
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 10*60 }, // default { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 },
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 }, { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 },
{ -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 }, { -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 },
@ -350,7 +350,7 @@ int CPlayerStateWeaponIdle::getNumIdleAnims()
static IdleAnims s_netIdleAnims[]= static IdleAnims s_netIdleAnims[]=
{ {
// start frame loop frame end frame loop count // start frame loop frame end frame loop count
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 10*60 }, // default { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 },
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 }, { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 },
{ -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 }, { -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 },