From 3cb5a083fa1324b06cbbe8fccebae09d64ed8a70 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 2 Jul 2001 23:50:22 +0000 Subject: [PATCH] --- Graphics/characters/SpongeBob/AnimList.Txt | 20 ++-- source/paul/animtest.cpp | 20 ++-- source/player/panimsfx.cpp | 4 +- source/player/player.cpp | 120 ++++++++++----------- source/player/psidle.cpp | 20 ++-- 5 files changed, 92 insertions(+), 92 deletions(-) diff --git a/Graphics/characters/SpongeBob/AnimList.Txt b/Graphics/characters/SpongeBob/AnimList.Txt index 18fb991ef..b5e7635b5 100644 --- a/Graphics/characters/SpongeBob/AnimList.Txt +++ b/Graphics/characters/SpongeBob/AnimList.Txt @@ -27,14 +27,14 @@ GetHit CrouchDown CrouchUp LookUp -IdleBigEye -IdleFaceUpSideDown -IdleBandAid -IdleEyePop -IdleInHat -IdleMature -IdleMoustache -IdleNoFace -IdleNet -IdleZorro +#IdleBigEye +#IdleFaceUpSideDown +#IdleBandAid +#IdleEyePop +#IdleInHat +#IdleMature +#IdleMoustache +#IdleNoFace +#IdleNet +#IdleZorro Celebrate \ No newline at end of file diff --git a/source/paul/animtest.cpp b/source/paul/animtest.cpp index 1d97df7ce..ebddeaab9 100644 --- a/source/paul/animtest.cpp +++ b/source/paul/animtest.cpp @@ -108,16 +108,16 @@ static const char *s_animNames[NUM_ANIM_SPONGEBOB]= "ANIM_SPONGEBOB_CROUCHDOWN", "ANIM_SPONGEBOB_CROUCHUP", "ANIM_SPONGEBOB_LOOKUP", - "ANIM_SPONGEBOB_IDLEBIGEYE", - "ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN", - "ANIM_SPONGEBOB_IDLEBANDAID", - "ANIM_SPONGEBOB_IDLEEYEPOP", - "ANIM_SPONGEBOB_IDLEINHAT", - "ANIM_SPONGEBOB_IDLEMATURE", - "ANIM_SPONGEBOB_IDLEMOUSTACHE", - "ANIM_SPONGEBOB_IDLENOFACE", - "ANIM_SPONGEBOB_IDLENET", - "ANIM_SPONGEBOB_IDLEZORRO", +//NOIDLE "ANIM_SPONGEBOB_IDLEBIGEYE", +//NOIDLE "ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN", +//NOIDLE "ANIM_SPONGEBOB_IDLEBANDAID", +//NOIDLE "ANIM_SPONGEBOB_IDLEEYEPOP", +//NOIDLE "ANIM_SPONGEBOB_IDLEINHAT", +//NOIDLE "ANIM_SPONGEBOB_IDLEMATURE", +//NOIDLE "ANIM_SPONGEBOB_IDLEMOUSTACHE", +//NOIDLE "ANIM_SPONGEBOB_IDLENOFACE", +//NOIDLE "ANIM_SPONGEBOB_IDLENET", +//NOIDLE "ANIM_SPONGEBOB_IDLEZORRO", "ANIM_SPONGEBOB_CELEBRATE", }; diff --git a/source/player/panimsfx.cpp b/source/player/panimsfx.cpp index 3b85348ab..0e7ba25e0 100644 --- a/source/player/panimsfx.cpp +++ b/source/player/panimsfx.cpp @@ -175,8 +175,8 @@ const CPlayer::AnimSfx CPlayer::s_animSfx[]= { ANIM_SPONGEBOB_RUNSTOP, s_runStopCount, s_runStopSfx }, { ANIM_SPONGEBOB_WALK, s_walkCount, s_walkSfx }, { ANIM_SPONGEBOB_SWIPE, s_swipeCount, s_swipeSfx }, - { ANIM_SPONGEBOB_IDLEBIGEYE, s_idleBigEyeCount, s_idleBigEyeSfx }, - { ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN, s_idleFaceUpsideDownCount, s_idleFaceUpsideDownSfx }, +//NOIDLE { ANIM_SPONGEBOB_IDLEBIGEYE, s_idleBigEyeCount, s_idleBigEyeSfx }, +//NOIDLE { ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN, s_idleFaceUpsideDownCount, s_idleFaceUpsideDownSfx }, }; const int CPlayer::s_numAnimSfx=12; // Grrrrrrrr! (pkg) diff --git a/source/player/player.cpp b/source/player/player.cpp index c53db9f69..db53d1e3c 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -336,16 +336,16 @@ 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 - -1, // ANIM_SPONGEBOB_IDLEBIGEYE - -1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN - -1, // ANIM_SPONGEBOB_IDLEBANDAID, - -1, // ANIM_SPONGEBOB_IDLEEYEPOP, - -1, // ANIM_SPONGEBOB_IDLEINHAT, - -1, // ANIM_SPONGEBOB_IDLEMATURE, - -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, - -1, // ANIM_SPONGEBOB_IDLENOFACE, - ANIM_SPONGEBOB_NET_IDLENET, // ANIM_SPONGEBOB_IDLENET, - -1, // ANIM_SPONGEBOB_IDLEZORRO, +//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, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLENOFACE, +//NOIDLE ANIM_SPONGEBOB_NET_IDLENET, // ANIM_SPONGEBOB_IDLENET, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_CELEBRATE, }, @@ -380,16 +380,16 @@ 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 - -1, // ANIM_SPONGEBOB_IDLEBIGEYE - -1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN - -1, // ANIM_SPONGEBOB_IDLEBANDAID, - -1, // ANIM_SPONGEBOB_IDLEEYEPOP, - -1, // ANIM_SPONGEBOB_IDLEINHAT, - -1, // ANIM_SPONGEBOB_IDLEMATURE, - -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, - -1, // ANIM_SPONGEBOB_IDLENOFACE, - -1, // ANIM_SPONGEBOB_IDLENET, - -1, // ANIM_SPONGEBOB_IDLEZORRO, +//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, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLENOFACE, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLENET, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_CELEBRATE, }, @@ -424,16 +424,16 @@ 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 - -1, // ANIM_SPONGEBOB_IDLEBIGEYE - -1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN - -1, // ANIM_SPONGEBOB_IDLEBANDAID, - -1, // ANIM_SPONGEBOB_IDLEEYEPOP, - -1, // ANIM_SPONGEBOB_IDLEINHAT, - -1, // ANIM_SPONGEBOB_IDLEMATURE, - -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, - -1, // ANIM_SPONGEBOB_IDLENOFACE, - -1, // ANIM_SPONGEBOB_IDLENET, - -1, // ANIM_SPONGEBOB_IDLEZORRO, +//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, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLENOFACE, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLENET, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_CELEBRATE, }, @@ -468,16 +468,16 @@ 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 - -1, // ANIM_SPONGEBOB_IDLEBIGEYE - -1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN - -1, // ANIM_SPONGEBOB_IDLEBANDAID, - -1, // ANIM_SPONGEBOB_IDLEEYEPOP, - -1, // ANIM_SPONGEBOB_IDLEINHAT, - -1, // ANIM_SPONGEBOB_IDLEMATURE, - -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, - -1, // ANIM_SPONGEBOB_IDLENOFACE, - -1, // ANIM_SPONGEBOB_IDLENET, - -1, // ANIM_SPONGEBOB_IDLEZORRO, +//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, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLENOFACE, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLENET, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_CELEBRATE, }, @@ -512,16 +512,16 @@ 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 - -1, // ANIM_SPONGEBOB_IDLEBIGEYE - -1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN - -1, // ANIM_SPONGEBOB_IDLEBANDAID, - -1, // ANIM_SPONGEBOB_IDLEEYEPOP, - -1, // ANIM_SPONGEBOB_IDLEINHAT, - -1, // ANIM_SPONGEBOB_IDLEMATURE, - -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, - -1, // ANIM_SPONGEBOB_IDLENOFACE, - ANIM_SPONGEBOB_JELLYFISH_IDLENET, // ANIM_SPONGEBOB_IDLENET, - -1, // ANIM_SPONGEBOB_IDLEZORRO, +//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, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLENOFACE, +//NOIDLE ANIM_SPONGEBOB_JELLYFISH_IDLENET, // ANIM_SPONGEBOB_IDLENET, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_CELEBRATE, }, @@ -556,16 +556,16 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_CROUCHDOWN -1, // ANIM_SPONGEBOB_CROUCHUP -1, // ANIM_SPONGEBOB_LOOKUP - -1, // ANIM_SPONGEBOB_IDLEBIGEYE - -1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN - -1, // ANIM_SPONGEBOB_IDLEBANDAID, - -1, // ANIM_SPONGEBOB_IDLEEYEPOP, - -1, // ANIM_SPONGEBOB_IDLEINHAT, - -1, // ANIM_SPONGEBOB_IDLEMATURE, - -1, // ANIM_SPONGEBOB_IDLEMOUSTACHE, - -1, // ANIM_SPONGEBOB_IDLENOFACE, - -1, // ANIM_SPONGEBOB_IDLENET, - -1, // ANIM_SPONGEBOB_IDLEZORRO, +//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, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLENOFACE, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLENET, +//NOIDLE -1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_CELEBRATE, }, }; diff --git a/source/player/psidle.cpp b/source/player/psidle.cpp index b166a4e11..b04fa4961 100644 --- a/source/player/psidle.cpp +++ b/source/player/psidle.cpp @@ -294,15 +294,15 @@ 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*/ }, - { -1, ANIM_SPONGEBOB_IDLEBIGEYE, -1, 1 }, - { -1, ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN, -1, 1 }, - { -1, ANIM_SPONGEBOB_IDLEBANDAID, -1, 1 }, - { -1, ANIM_SPONGEBOB_IDLEEYEPOP, -1, 1 }, - { -1, ANIM_SPONGEBOB_IDLEINHAT, -1, 1 }, - { -1, ANIM_SPONGEBOB_IDLEMATURE, -1, 1 }, - { -1, ANIM_SPONGEBOB_IDLEMOUSTACHE, -1, 1 }, - { -1, ANIM_SPONGEBOB_IDLENOFACE, -1, 1 }, - { -1, ANIM_SPONGEBOB_IDLEZORRO, -1, 1 }, +//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 }, +//NOIDLE { -1, ANIM_SPONGEBOB_IDLENOFACE, -1, 1 }, +//NOIDLE { -1, ANIM_SPONGEBOB_IDLEZORRO, -1, 1 }, }; static int s_numUnarmedIdleAnims=sizeof(s_unarmedIdleAnims)/sizeof(IdleAnims); IdleAnims *CPlayerStateUnarmedIdle::getIdleAnimsDb(int _animNo) @@ -354,7 +354,7 @@ static IdleAnims s_netIdleAnims[]= { -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*/ }, - { -1, ANIM_SPONGEBOB_IDLENET, -1, 1 }, +//NOIDLE { -1, ANIM_SPONGEBOB_IDLENET, -1, 1 }, { -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 }, }; static int s_numNetIdleAnims=sizeof(s_netIdleAnims)/sizeof(IdleAnims);