This commit is contained in:
parent
19e22c0709
commit
5d2d569864
@ -146,23 +146,39 @@ static const CPlayer::AnimFrameSfx s_swipeSfx[]=
|
||||
};
|
||||
static const int s_swipeCount=sizeof(s_swipeSfx)/sizeof(CPlayer::AnimFrameSfx);
|
||||
|
||||
// ANIM_SPONGEBOB_IDLEBIGEYE
|
||||
static const CPlayer::AnimFrameSfx s_idleBigEyeSfx[]=
|
||||
{
|
||||
{ 99, CSoundMediator::SFX_SPONGEBOB_BLINK, },
|
||||
};
|
||||
static const int s_idleBigEyeCount=sizeof(s_idleBigEyeSfx)/sizeof(CPlayer::AnimFrameSfx);
|
||||
|
||||
// ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN
|
||||
static const CPlayer::AnimFrameSfx s_idleFaceUpsideDownSfx[]=
|
||||
{
|
||||
{ 98, CSoundMediator::SFX_SPONGEBOB_BLINK, },
|
||||
};
|
||||
static const int s_idleFaceUpsideDownCount=sizeof(s_idleFaceUpsideDownSfx)/sizeof(CPlayer::AnimFrameSfx);
|
||||
|
||||
|
||||
|
||||
// This is the table that ties up anims to sfx
|
||||
const CPlayer::AnimSfx CPlayer::s_animSfx[]=
|
||||
{
|
||||
{ ANIM_SPONGEBOB_BALLOONJUMP, s_balloonJumpCount, s_balloonJumpSfx },
|
||||
{ ANIM_SPONGEBOB_BLOWBUBBLE, s_blowBubbleCount, s_blowBubbleSfx },
|
||||
{ ANIM_SPONGEBOB_BUTTBOUNCEEND, s_buttBounceEndCount, s_buttBounceEndSfx },
|
||||
{ ANIM_SPONGEBOB_HITGROUND, s_hitGroundCount, s_hitGroundSfx },
|
||||
{ ANIM_SPONGEBOB_JUMPEND, s_jumpEndCount, s_jumpEndSfx },
|
||||
{ ANIM_SPONGEBOB_KARATE, s_karateCount, s_karateSfx },
|
||||
{ ANIM_SPONGEBOB_RUN, s_runCount, s_runSfx },
|
||||
{ ANIM_SPONGEBOB_RUNSTOP, s_runStopCount, s_runStopSfx },
|
||||
{ ANIM_SPONGEBOB_WALK, s_walkCount, s_walkSfx },
|
||||
{ ANIM_SPONGEBOB_SWIPE, s_swipeCount, s_swipeSfx },
|
||||
{ ANIM_SPONGEBOB_BALLOONJUMP, s_balloonJumpCount, s_balloonJumpSfx },
|
||||
{ ANIM_SPONGEBOB_BLOWBUBBLE, s_blowBubbleCount, s_blowBubbleSfx },
|
||||
{ ANIM_SPONGEBOB_BUTTBOUNCEEND, s_buttBounceEndCount, s_buttBounceEndSfx },
|
||||
{ ANIM_SPONGEBOB_HITGROUND, s_hitGroundCount, s_hitGroundSfx },
|
||||
{ ANIM_SPONGEBOB_JUMPEND, s_jumpEndCount, s_jumpEndSfx },
|
||||
{ ANIM_SPONGEBOB_KARATE, s_karateCount, s_karateSfx },
|
||||
{ ANIM_SPONGEBOB_RUN, s_runCount, s_runSfx },
|
||||
{ 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 },
|
||||
};
|
||||
const int CPlayer::s_numAnimSfx=10; // Grrrrrrrr! (pkg)
|
||||
const int CPlayer::s_numAnimSfx=12; // Grrrrrrrr! (pkg)
|
||||
|
||||
|
||||
/*===========================================================================
|
||||
|
@ -342,6 +342,10 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||
ANIM_SPONGEBOB_NET_GETHIT, // ANIM_SPONGEBOB_GETHIT
|
||||
ANIM_SPONGEBOB_NET_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN
|
||||
ANIM_SPONGEBOB_NET_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP
|
||||
-1, // ANIM_SPONGEBOB_LOOKUP
|
||||
-1, // ANIM_SPONGEBOB_IDLEBIGEYE
|
||||
-1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN
|
||||
|
||||
},
|
||||
|
||||
// PLAYER_ADDON_CORALBLOWER,
|
||||
@ -375,6 +379,9 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||
ANIM_SPONGEBOB_CORALBLOWER_GETHIT, // ANIM_SPONGEBOB_GETHIT
|
||||
ANIM_SPONGEBOB_CORALBLOWER_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN
|
||||
ANIM_SPONGEBOB_CORALBLOWER_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP
|
||||
-1, // ANIM_SPONGEBOB_LOOKUP
|
||||
-1, // ANIM_SPONGEBOB_IDLEBIGEYE
|
||||
-1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN
|
||||
},
|
||||
|
||||
// PLAYER_ADDON_JELLYLAUNCHER,
|
||||
@ -408,6 +415,9 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||
ANIM_SPONGEBOB_JELLYLAUNCHER_GETHIT, // ANIM_SPONGEBOB_GETHIT
|
||||
ANIM_SPONGEBOB_JELLYLAUNCHER_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN
|
||||
ANIM_SPONGEBOB_JELLYLAUNCHER_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP
|
||||
-1, // ANIM_SPONGEBOB_LOOKUP
|
||||
-1, // ANIM_SPONGEBOB_IDLEBIGEYE
|
||||
-1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN
|
||||
},
|
||||
|
||||
// PLAYER_ADDON_GLASSES,
|
||||
@ -441,6 +451,9 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||
ANIM_SPONGEBOB_GLASSES_GETHIT, // ANIM_SPONGEBOB_GETHIT
|
||||
ANIM_SPONGEBOB_GLASSES_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN
|
||||
ANIM_SPONGEBOB_GLASSES_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP
|
||||
-1, // ANIM_SPONGEBOB_LOOKUP
|
||||
-1, // ANIM_SPONGEBOB_IDLEBIGEYE
|
||||
-1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN
|
||||
},
|
||||
|
||||
// PLAYER_ADDON_BUBBLEWAND,
|
||||
@ -474,6 +487,9 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||
ANIM_SPONGEBOB_WAND_GETHIT, // ANIM_SPONGEBOB_GETHIT
|
||||
ANIM_SPONGEBOB_WAND_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN
|
||||
ANIM_SPONGEBOB_WAND_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP
|
||||
-1, // ANIM_SPONGEBOB_LOOKUP
|
||||
-1, // ANIM_SPONGEBOB_IDLEBIGEYE
|
||||
-1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN
|
||||
},
|
||||
|
||||
// PLAYER_ADDON_JELLYFISHINNET
|
||||
@ -507,6 +523,9 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||
ANIM_SPONGEBOB_JELLYFISH_GETHIT, // ANIM_SPONGEBOB_GETHIT
|
||||
ANIM_SPONGEBOB_JELLYFISH_CROUCHDOWN, // ANIM_SPONGEBOB_CROUCHDOWN
|
||||
ANIM_SPONGEBOB_JELLYFISH_CROUCHUP, // ANIM_SPONGEBOB_CROUCHUP
|
||||
-1, // ANIM_SPONGEBOB_LOOKUP
|
||||
-1, // ANIM_SPONGEBOB_IDLEBIGEYE
|
||||
-1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN
|
||||
},
|
||||
|
||||
// PLAYER_ADDON_GLOVE
|
||||
@ -540,6 +559,9 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||
-1, // ANIM_SPONGEBOB_GETHIT
|
||||
-1, // ANIM_SPONGEBOB_CROUCHDOWN
|
||||
-1, // ANIM_SPONGEBOB_CROUCHUP
|
||||
-1, // ANIM_SPONGEBOB_LOOKUP
|
||||
-1, // ANIM_SPONGEBOB_IDLEBIGEYE
|
||||
-1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN
|
||||
},
|
||||
};
|
||||
|
||||
|
@ -256,11 +256,13 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayerModeBase *_playerMode)
|
||||
---------------------------------------------------------------------- */
|
||||
static IdleAnims s_unarmedIdleAnims[]=
|
||||
{
|
||||
// start frame loop frame end frame loop count
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 160 }, // default
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 160 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 80 },
|
||||
|
||||
// start frame loop frame end frame loop count
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 10*60 }, // default
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBIGEYE, -1, 1 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBIGEYE, -1, 1 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN, -1, 1 },
|
||||
};
|
||||
static int s_numUnarmedIdleAnims=sizeof(s_unarmedIdleAnims)/sizeof(IdleAnims);
|
||||
IdleAnims *CPlayerStateUnarmedIdle::getIdleAnimsDb(int _animNo)
|
||||
@ -282,11 +284,11 @@ int CPlayerStateUnarmedIdle::getNumIdleAnims()
|
||||
---------------------------------------------------------------------- */
|
||||
static IdleAnims s_weaponIdleAnims[]=
|
||||
{
|
||||
// start frame loop frame end frame loop count
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 160 }, // default
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 160 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 80 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 },
|
||||
// start frame loop frame end frame loop count
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 10*60 }, // default
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 },
|
||||
{ -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 },
|
||||
};
|
||||
static int s_numWeaponIdleAnims=sizeof(s_weaponIdleAnims)/sizeof(IdleAnims);
|
||||
IdleAnims *CPlayerStateWeaponIdle::getIdleAnimsDb(int _animNo)
|
||||
|
Loading…
Reference in New Issue
Block a user