This commit is contained in:
Paul 2001-07-02 23:50:22 +00:00
parent ca1f7aa3f9
commit 3cb5a083fa
5 changed files with 92 additions and 92 deletions

View File

@ -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

View File

@ -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",
};

View File

@ -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)

View File

@ -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,
},
};

View File

@ -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);