This commit is contained in:
parent
ee258586bb
commit
8adaf9dd17
9 changed files with 2 additions and 15 deletions
|
@ -14,7 +14,6 @@ TeeterFront
|
||||||
Swipe
|
Swipe
|
||||||
DeathForwards
|
DeathForwards
|
||||||
DeathSquash
|
DeathSquash
|
||||||
DeathSpin
|
|
||||||
DeathDry
|
DeathDry
|
||||||
balloonJump
|
balloonJump
|
||||||
blowbubble
|
blowbubble
|
||||||
|
|
|
@ -11,7 +11,6 @@ TeeterBack
|
||||||
TeeterFront
|
TeeterFront
|
||||||
Walk
|
Walk
|
||||||
DeathForwards
|
DeathForwards
|
||||||
DeathSpin
|
|
||||||
DeathSquash
|
DeathSquash
|
||||||
GetHit
|
GetHit
|
||||||
CrouchDown
|
CrouchDown
|
||||||
|
|
|
@ -12,7 +12,6 @@ RunStart
|
||||||
TeeterBack
|
TeeterBack
|
||||||
TeeterFront
|
TeeterFront
|
||||||
Swipe
|
Swipe
|
||||||
DeathSpin
|
|
||||||
DeathSquash
|
DeathSquash
|
||||||
DeathForwards
|
DeathForwards
|
||||||
GetHit
|
GetHit
|
||||||
|
|
|
@ -13,7 +13,6 @@ RunStop
|
||||||
RunStart
|
RunStart
|
||||||
TeeterBack
|
TeeterBack
|
||||||
TeeterFront
|
TeeterFront
|
||||||
DeathSpin
|
|
||||||
DeathSquash
|
DeathSquash
|
||||||
DeathForwards
|
DeathForwards
|
||||||
GetHit
|
GetHit
|
||||||
|
|
|
@ -14,7 +14,6 @@ TeeterFront
|
||||||
Swipe
|
Swipe
|
||||||
DeathForwards
|
DeathForwards
|
||||||
DeathSquash
|
DeathSquash
|
||||||
DeathSpin
|
|
||||||
GetHit
|
GetHit
|
||||||
CrouchDown
|
CrouchDown
|
||||||
CrouchUp
|
CrouchUp
|
||||||
|
|
|
@ -15,7 +15,6 @@ TeeterBack
|
||||||
TeeterFront
|
TeeterFront
|
||||||
DeathForwards
|
DeathForwards
|
||||||
DeathSquash
|
DeathSquash
|
||||||
DeathSpin
|
|
||||||
GetHit
|
GetHit
|
||||||
CrouchDown
|
CrouchDown
|
||||||
CrouchUp
|
CrouchUp
|
|
@ -95,7 +95,6 @@ static const char *s_animNames[NUM_ANIM_SPONGEBOB]=
|
||||||
"ANIM_SPONGEBOB_SWIPE",
|
"ANIM_SPONGEBOB_SWIPE",
|
||||||
"ANIM_SPONGEBOB_DEATHFORWARDS",
|
"ANIM_SPONGEBOB_DEATHFORWARDS",
|
||||||
"ANIM_SPONGEBOB_DEATHSQUASH",
|
"ANIM_SPONGEBOB_DEATHSQUASH",
|
||||||
"ANIM_SPONGEBOB_DEATHSPIN",
|
|
||||||
"ANIM_SPONGEBOB_DEATHDRY",
|
"ANIM_SPONGEBOB_DEATHDRY",
|
||||||
"ANIM_SPONGEBOB_BALLOONJUMP",
|
"ANIM_SPONGEBOB_BALLOONJUMP",
|
||||||
"ANIM_SPONGEBOB_BLOWBUBBLE",
|
"ANIM_SPONGEBOB_BLOWBUBBLE",
|
||||||
|
|
|
@ -331,7 +331,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||||
ANIM_SPONGEBOB_NET_SWIPE, // ANIM_SPONGEBOB_SWIPE,
|
ANIM_SPONGEBOB_NET_SWIPE, // ANIM_SPONGEBOB_SWIPE,
|
||||||
ANIM_SPONGEBOB_NET_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS,
|
ANIM_SPONGEBOB_NET_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS,
|
||||||
ANIM_SPONGEBOB_NET_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH,
|
ANIM_SPONGEBOB_NET_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH,
|
||||||
ANIM_SPONGEBOB_NET_DEATHSPIN, // ANIM_SPONGEBOB_DEATHSPIN,
|
|
||||||
-1, // ANIM_SPONGEBOB_DEATHDRY
|
-1, // ANIM_SPONGEBOB_DEATHDRY
|
||||||
-1, // ANIM_SPONGEBOB_BALLOONJUMP,
|
-1, // ANIM_SPONGEBOB_BALLOONJUMP,
|
||||||
-1, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
-1, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
||||||
|
@ -375,7 +374,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||||
-1, // ANIM_SPONGEBOB_SWIPE,
|
-1, // ANIM_SPONGEBOB_SWIPE,
|
||||||
ANIM_SPONGEBOB_CORALBLOWER_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS,
|
ANIM_SPONGEBOB_CORALBLOWER_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS,
|
||||||
ANIM_SPONGEBOB_CORALBLOWER_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH,
|
ANIM_SPONGEBOB_CORALBLOWER_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH,
|
||||||
ANIM_SPONGEBOB_CORALBLOWER_DEATHSPIN, // ANIM_SPONGEBOB_DEATHSPIN,
|
|
||||||
-1, // ANIM_SPONGEBOB_DEATHDRY
|
-1, // ANIM_SPONGEBOB_DEATHDRY
|
||||||
-1, // ANIM_SPONGEBOB_BALLOONJUMP,
|
-1, // ANIM_SPONGEBOB_BALLOONJUMP,
|
||||||
-1, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
-1, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
||||||
|
@ -419,7 +417,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||||
-1, // ANIM_SPONGEBOB_SWIPE,
|
-1, // ANIM_SPONGEBOB_SWIPE,
|
||||||
ANIM_SPONGEBOB_JELLYLAUNCHER_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS,
|
ANIM_SPONGEBOB_JELLYLAUNCHER_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS,
|
||||||
ANIM_SPONGEBOB_JELLYLAUNCHER_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH,
|
ANIM_SPONGEBOB_JELLYLAUNCHER_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH,
|
||||||
ANIM_SPONGEBOB_JELLYLAUNCHER_DEATHSPIN, // ANIM_SPONGEBOB_DEATHSPIN,
|
|
||||||
-1, // ANIM_SPONGEBOB_DEATHDRY
|
-1, // ANIM_SPONGEBOB_DEATHDRY
|
||||||
-1, // ANIM_SPONGEBOB_BALLOONJUMP,
|
-1, // ANIM_SPONGEBOB_BALLOONJUMP,
|
||||||
-1, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
-1, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
||||||
|
@ -463,7 +460,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||||
-1, // ANIM_SPONGEBOB_SWIPE,
|
-1, // ANIM_SPONGEBOB_SWIPE,
|
||||||
ANIM_SPONGEBOB_WAND_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS,
|
ANIM_SPONGEBOB_WAND_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS,
|
||||||
ANIM_SPONGEBOB_WAND_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH,
|
ANIM_SPONGEBOB_WAND_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH,
|
||||||
ANIM_SPONGEBOB_WAND_DEATHSPIN, // ANIM_SPONGEBOB_DEATHSPIN,
|
|
||||||
-1, // ANIM_SPONGEBOB_DEATHDRY
|
-1, // ANIM_SPONGEBOB_DEATHDRY
|
||||||
-1, // ANIM_SPONGEBOB_BALLOONJUMP,
|
-1, // ANIM_SPONGEBOB_BALLOONJUMP,
|
||||||
ANIM_SPONGEBOB_WAND_BLOWBUBBLE, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
ANIM_SPONGEBOB_WAND_BLOWBUBBLE, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
||||||
|
@ -507,7 +503,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||||
ANIM_SPONGEBOB_JELLYFISH_SWIPE, // ANIM_SPONGEBOB_SWIPE,
|
ANIM_SPONGEBOB_JELLYFISH_SWIPE, // ANIM_SPONGEBOB_SWIPE,
|
||||||
ANIM_SPONGEBOB_JELLYFISH_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS,
|
ANIM_SPONGEBOB_JELLYFISH_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS,
|
||||||
ANIM_SPONGEBOB_JELLYFISH_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH,
|
ANIM_SPONGEBOB_JELLYFISH_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH,
|
||||||
ANIM_SPONGEBOB_JELLYFISH_DEATHSPIN, // ANIM_SPONGEBOB_DEATHSPIN,
|
|
||||||
-1, // ANIM_SPONGEBOB_DEATHDRY
|
-1, // ANIM_SPONGEBOB_DEATHDRY
|
||||||
-1, // ANIM_SPONGEBOB_BALLOONJUMP,
|
-1, // ANIM_SPONGEBOB_BALLOONJUMP,
|
||||||
-1, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
-1, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
||||||
|
@ -551,7 +546,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||||
-1, // ANIM_SPONGEBOB_SWIPE,
|
-1, // ANIM_SPONGEBOB_SWIPE,
|
||||||
-1, // ANIM_SPONGEBOB_DEATHFORWARDS,
|
-1, // ANIM_SPONGEBOB_DEATHFORWARDS,
|
||||||
-1, // ANIM_SPONGEBOB_DEATHSQUASH,
|
-1, // ANIM_SPONGEBOB_DEATHSQUASH,
|
||||||
-1, // ANIM_SPONGEBOB_DEATHSPIN,
|
|
||||||
-1, // ANIM_SPONGEBOB_DEATHDRY
|
-1, // ANIM_SPONGEBOB_DEATHDRY
|
||||||
-1, // ANIM_SPONGEBOB_BALLOONJUMP,
|
-1, // ANIM_SPONGEBOB_BALLOONJUMP,
|
||||||
-1, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
-1, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
||||||
|
|
|
@ -65,7 +65,7 @@ void CPlayerModeDead::enter()
|
||||||
{
|
{
|
||||||
default:
|
default:
|
||||||
case DEATHTYPE__NORMAL:
|
case DEATHTYPE__NORMAL:
|
||||||
deathAnim=ANIM_SPONGEBOB_DEATHSPIN;
|
deathAnim=ANIM_SPONGEBOB_DEATHFORWARDS;
|
||||||
break;
|
break;
|
||||||
case DEATHTYPE__DRYUP:
|
case DEATHTYPE__DRYUP:
|
||||||
deathAnim=ANIM_SPONGEBOB_DEATHDRY;
|
deathAnim=ANIM_SPONGEBOB_DEATHDRY;
|
||||||
|
@ -74,7 +74,7 @@ void CPlayerModeDead::enter()
|
||||||
deathAnim=ANIM_SPONGEBOB_DEATHSQUASH;
|
deathAnim=ANIM_SPONGEBOB_DEATHSQUASH;
|
||||||
break;
|
break;
|
||||||
case DEATHTYPE__LIQUID:
|
case DEATHTYPE__LIQUID:
|
||||||
deathAnim=ANIM_SPONGEBOB_DEATHSPIN;
|
deathAnim=ANIM_SPONGEBOB_DEATHFORWARDS;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
m_player->setAnimNo(deathAnim);
|
m_player->setAnimNo(deathAnim);
|
||||||
|
|
Loading…
Add table
Reference in a new issue