diff --git a/Graphics/characters/SpongeBob/AnimList.Txt b/Graphics/characters/SpongeBob/AnimList.Txt index b4d643ecb..c82e7d0f5 100644 --- a/Graphics/characters/SpongeBob/AnimList.Txt +++ b/Graphics/characters/SpongeBob/AnimList.Txt @@ -26,10 +26,8 @@ GetHit CrouchDown CrouchUp LookUp -#IdleBigEye #IdleFaceUpSideDown #IdleBandAid -#IdleEyePop #IdleInHat #IdleMature #IdleMoustache diff --git a/source/player/player.cpp b/source/player/player.cpp index 06cdb2f99..32b7a59be 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -343,10 +343,8 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= ANIM_SPONGEBOB_NET_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN ANIM_SPONGEBOB_NET_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP ANIM_SPONGEBOB_NET_LOOKUP, // ANIM_SPONGEBOB_LOOKUP -//NOIDLE -1, // ANIM_SPONGEBOB_IDLEBIGEYE //NOIDLE -1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN //NOIDLE -1, // ANIM_SPONGEBOB_IDLEBANDAID, -//NOIDLE -1, // ANIM_SPONGEBOB_IDLEEYEPOP, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEINHAT, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEMATURE, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, @@ -386,10 +384,8 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= ANIM_SPONGEBOB_CORALBLOWER_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN ANIM_SPONGEBOB_CORALBLOWER_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP ANIM_SPONGEBOB_CORALBLOWER_LOOKUP, // ANIM_SPONGEBOB_LOOKUP -//NOIDLE -1, // ANIM_SPONGEBOB_IDLEBIGEYE //NOIDLE -1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN //NOIDLE -1, // ANIM_SPONGEBOB_IDLEBANDAID, -//NOIDLE -1, // ANIM_SPONGEBOB_IDLEEYEPOP, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEINHAT, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEMATURE, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, @@ -429,10 +425,8 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= ANIM_SPONGEBOB_JELLYLAUNCHER_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN ANIM_SPONGEBOB_JELLYLAUNCHER_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP ANIM_SPONGEBOB_JELLYLAUNCHER_LOOKUP, // ANIM_SPONGEBOB_LOOKUP -//NOIDLE -1, // ANIM_SPONGEBOB_IDLEBIGEYE //NOIDLE -1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN //NOIDLE -1, // ANIM_SPONGEBOB_IDLEBANDAID, -//NOIDLE -1, // ANIM_SPONGEBOB_IDLEEYEPOP, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEINHAT, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEMATURE, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, @@ -472,10 +466,8 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= ANIM_SPONGEBOB_WAND_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN ANIM_SPONGEBOB_WAND_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP ANIM_SPONGEBOB_WAND_LOOKUP, // ANIM_SPONGEBOB_LOOKUP -//NOIDLE -1, // ANIM_SPONGEBOB_IDLEBIGEYE //NOIDLE -1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN //NOIDLE -1, // ANIM_SPONGEBOB_IDLEBANDAID, -//NOIDLE -1, // ANIM_SPONGEBOB_IDLEEYEPOP, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEINHAT, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEMATURE, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, @@ -515,10 +507,8 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= ANIM_SPONGEBOB_JELLYFISH_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN ANIM_SPONGEBOB_JELLYFISH_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP ANIM_SPONGEBOB_JELLYFISH_LOOKUP, // ANIM_SPONGEBOB_LOOKUP -//NOIDLE -1, // ANIM_SPONGEBOB_IDLEBIGEYE //NOIDLE -1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN //NOIDLE -1, // ANIM_SPONGEBOB_IDLEBANDAID, -//NOIDLE -1, // ANIM_SPONGEBOB_IDLEEYEPOP, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEINHAT, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEMATURE, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, @@ -558,10 +548,8 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_CROUCHDOWN -1, // ANIM_SPONGEBOB_CROUCHUP -1, // ANIM_SPONGEBOB_LOOKUP -//NOIDLE -1, // ANIM_SPONGEBOB_IDLEBIGEYE //NOIDLE -1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN //NOIDLE -1, // ANIM_SPONGEBOB_IDLEBANDAID, -//NOIDLE -1, // ANIM_SPONGEBOB_IDLEEYEPOP, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEINHAT, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEMATURE, //NOIDLE -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, diff --git a/source/player/psidle.cpp b/source/player/psidle.cpp index b04fa4961..27b84acc1 100644 --- a/source/player/psidle.cpp +++ b/source/player/psidle.cpp @@ -294,10 +294,8 @@ static IdleAnims s_unarmedIdleAnims[]= { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 10*6/*0*/ }, // default { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*6/*0*/ }, { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*6/*0*/ }, -//NOIDLE { -1, ANIM_SPONGEBOB_IDLEBIGEYE, -1, 1 }, //NOIDLE { -1, ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN, -1, 1 }, //NOIDLE { -1, ANIM_SPONGEBOB_IDLEBANDAID, -1, 1 }, -//NOIDLE { -1, ANIM_SPONGEBOB_IDLEEYEPOP, -1, 1 }, //NOIDLE { -1, ANIM_SPONGEBOB_IDLEINHAT, -1, 1 }, //NOIDLE { -1, ANIM_SPONGEBOB_IDLEMATURE, -1, 1 }, //NOIDLE { -1, ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, 1 },