From 8adaf9dd1777226e18a557fdb0f7272d09461dba Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 4 Jul 2001 15:01:20 +0000 Subject: [PATCH] --- Graphics/characters/SpongeBob/AnimList.Txt | 1 - Graphics/characters/SpongeBob_CoralBlower/AnimList.Txt | 1 - Graphics/characters/SpongeBob_JellyFish/AnimList.Txt | 1 - Graphics/characters/SpongeBob_JellyLauncher/AnimList.Txt | 1 - Graphics/characters/SpongeBob_Net/AnimList.Txt | 1 - Graphics/characters/SpongeBob_Wand/AnimList.Txt | 1 - source/paul/animtest.cpp | 1 - source/player/player.cpp | 6 ------ source/player/pmdead.cpp | 4 ++-- 9 files changed, 2 insertions(+), 15 deletions(-) diff --git a/Graphics/characters/SpongeBob/AnimList.Txt b/Graphics/characters/SpongeBob/AnimList.Txt index b5e7635b5..b4d643ecb 100644 --- a/Graphics/characters/SpongeBob/AnimList.Txt +++ b/Graphics/characters/SpongeBob/AnimList.Txt @@ -14,7 +14,6 @@ TeeterFront Swipe DeathForwards DeathSquash -DeathSpin DeathDry balloonJump blowbubble diff --git a/Graphics/characters/SpongeBob_CoralBlower/AnimList.Txt b/Graphics/characters/SpongeBob_CoralBlower/AnimList.Txt index a4171c84b..30a93d7b2 100644 --- a/Graphics/characters/SpongeBob_CoralBlower/AnimList.Txt +++ b/Graphics/characters/SpongeBob_CoralBlower/AnimList.Txt @@ -11,7 +11,6 @@ TeeterBack TeeterFront Walk DeathForwards -DeathSpin DeathSquash GetHit CrouchDown diff --git a/Graphics/characters/SpongeBob_JellyFish/AnimList.Txt b/Graphics/characters/SpongeBob_JellyFish/AnimList.Txt index ac17f6140..bfdcfaa94 100644 --- a/Graphics/characters/SpongeBob_JellyFish/AnimList.Txt +++ b/Graphics/characters/SpongeBob_JellyFish/AnimList.Txt @@ -12,7 +12,6 @@ RunStart TeeterBack TeeterFront Swipe -DeathSpin DeathSquash DeathForwards GetHit diff --git a/Graphics/characters/SpongeBob_JellyLauncher/AnimList.Txt b/Graphics/characters/SpongeBob_JellyLauncher/AnimList.Txt index 4dff1e108..f1bf0c728 100644 --- a/Graphics/characters/SpongeBob_JellyLauncher/AnimList.Txt +++ b/Graphics/characters/SpongeBob_JellyLauncher/AnimList.Txt @@ -13,7 +13,6 @@ RunStop RunStart TeeterBack TeeterFront -DeathSpin DeathSquash DeathForwards GetHit diff --git a/Graphics/characters/SpongeBob_Net/AnimList.Txt b/Graphics/characters/SpongeBob_Net/AnimList.Txt index e34ff7830..ac6edd97f 100644 --- a/Graphics/characters/SpongeBob_Net/AnimList.Txt +++ b/Graphics/characters/SpongeBob_Net/AnimList.Txt @@ -14,7 +14,6 @@ TeeterFront Swipe DeathForwards DeathSquash -DeathSpin GetHit CrouchDown CrouchUp diff --git a/Graphics/characters/SpongeBob_Wand/AnimList.Txt b/Graphics/characters/SpongeBob_Wand/AnimList.Txt index 7c617a209..9e090095d 100644 --- a/Graphics/characters/SpongeBob_Wand/AnimList.Txt +++ b/Graphics/characters/SpongeBob_Wand/AnimList.Txt @@ -15,7 +15,6 @@ TeeterBack TeeterFront DeathForwards DeathSquash -DeathSpin GetHit CrouchDown CrouchUp \ No newline at end of file diff --git a/source/paul/animtest.cpp b/source/paul/animtest.cpp index ebddeaab9..7345b22e8 100644 --- a/source/paul/animtest.cpp +++ b/source/paul/animtest.cpp @@ -95,7 +95,6 @@ static const char *s_animNames[NUM_ANIM_SPONGEBOB]= "ANIM_SPONGEBOB_SWIPE", "ANIM_SPONGEBOB_DEATHFORWARDS", "ANIM_SPONGEBOB_DEATHSQUASH", - "ANIM_SPONGEBOB_DEATHSPIN", "ANIM_SPONGEBOB_DEATHDRY", "ANIM_SPONGEBOB_BALLOONJUMP", "ANIM_SPONGEBOB_BLOWBUBBLE", diff --git a/source/player/player.cpp b/source/player/player.cpp index 3996639c3..3b0c10396 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -331,7 +331,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= ANIM_SPONGEBOB_NET_SWIPE, // ANIM_SPONGEBOB_SWIPE, ANIM_SPONGEBOB_NET_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS, ANIM_SPONGEBOB_NET_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH, - ANIM_SPONGEBOB_NET_DEATHSPIN, // ANIM_SPONGEBOB_DEATHSPIN, -1, // ANIM_SPONGEBOB_DEATHDRY -1, // ANIM_SPONGEBOB_BALLOONJUMP, -1, // ANIM_SPONGEBOB_BLOWBUBBLE, @@ -375,7 +374,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_SWIPE, ANIM_SPONGEBOB_CORALBLOWER_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS, ANIM_SPONGEBOB_CORALBLOWER_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH, - ANIM_SPONGEBOB_CORALBLOWER_DEATHSPIN, // ANIM_SPONGEBOB_DEATHSPIN, -1, // ANIM_SPONGEBOB_DEATHDRY -1, // ANIM_SPONGEBOB_BALLOONJUMP, -1, // ANIM_SPONGEBOB_BLOWBUBBLE, @@ -419,7 +417,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_SWIPE, ANIM_SPONGEBOB_JELLYLAUNCHER_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS, ANIM_SPONGEBOB_JELLYLAUNCHER_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH, - ANIM_SPONGEBOB_JELLYLAUNCHER_DEATHSPIN, // ANIM_SPONGEBOB_DEATHSPIN, -1, // ANIM_SPONGEBOB_DEATHDRY -1, // ANIM_SPONGEBOB_BALLOONJUMP, -1, // ANIM_SPONGEBOB_BLOWBUBBLE, @@ -463,7 +460,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_SWIPE, ANIM_SPONGEBOB_WAND_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS, ANIM_SPONGEBOB_WAND_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH, - ANIM_SPONGEBOB_WAND_DEATHSPIN, // ANIM_SPONGEBOB_DEATHSPIN, -1, // ANIM_SPONGEBOB_DEATHDRY -1, // ANIM_SPONGEBOB_BALLOONJUMP, 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_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS, ANIM_SPONGEBOB_JELLYFISH_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH, - ANIM_SPONGEBOB_JELLYFISH_DEATHSPIN, // ANIM_SPONGEBOB_DEATHSPIN, -1, // ANIM_SPONGEBOB_DEATHDRY -1, // ANIM_SPONGEBOB_BALLOONJUMP, -1, // ANIM_SPONGEBOB_BLOWBUBBLE, @@ -551,7 +546,6 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_SWIPE, -1, // ANIM_SPONGEBOB_DEATHFORWARDS, -1, // ANIM_SPONGEBOB_DEATHSQUASH, - -1, // ANIM_SPONGEBOB_DEATHSPIN, -1, // ANIM_SPONGEBOB_DEATHDRY -1, // ANIM_SPONGEBOB_BALLOONJUMP, -1, // ANIM_SPONGEBOB_BLOWBUBBLE, diff --git a/source/player/pmdead.cpp b/source/player/pmdead.cpp index 1fc895a4d..a7b852f65 100644 --- a/source/player/pmdead.cpp +++ b/source/player/pmdead.cpp @@ -65,7 +65,7 @@ void CPlayerModeDead::enter() { default: case DEATHTYPE__NORMAL: - deathAnim=ANIM_SPONGEBOB_DEATHSPIN; + deathAnim=ANIM_SPONGEBOB_DEATHFORWARDS; break; case DEATHTYPE__DRYUP: deathAnim=ANIM_SPONGEBOB_DEATHDRY; @@ -74,7 +74,7 @@ void CPlayerModeDead::enter() deathAnim=ANIM_SPONGEBOB_DEATHSQUASH; break; case DEATHTYPE__LIQUID: - deathAnim=ANIM_SPONGEBOB_DEATHSPIN; + deathAnim=ANIM_SPONGEBOB_DEATHFORWARDS; break; } m_player->setAnimNo(deathAnim);