This commit is contained in:
parent
76842932e1
commit
c9f1767b3a
10 changed files with 35 additions and 13 deletions
|
@ -34,4 +34,5 @@ IdleMoustache
|
||||||
IdleNoFace
|
IdleNoFace
|
||||||
# IdleNet
|
# IdleNet
|
||||||
IdleZorro
|
IdleZorro
|
||||||
Celebrate
|
Celebrate
|
||||||
|
IdleBlink
|
|
@ -16,4 +16,5 @@ GetHit
|
||||||
CrouchDown
|
CrouchDown
|
||||||
CrouchUp
|
CrouchUp
|
||||||
LookUp
|
LookUp
|
||||||
Celebrate
|
Celebrate
|
||||||
|
IdleBlink
|
|
@ -20,4 +20,5 @@ CrouchUp
|
||||||
LookUp
|
LookUp
|
||||||
IdleWeapon
|
IdleWeapon
|
||||||
IdleNet
|
IdleNet
|
||||||
Celebrate
|
Celebrate
|
||||||
|
IdleBlink
|
|
@ -20,4 +20,5 @@ CrouchDown
|
||||||
CrouchUp
|
CrouchUp
|
||||||
LookUp
|
LookUp
|
||||||
IdleWeapon
|
IdleWeapon
|
||||||
Celebrate
|
Celebrate
|
||||||
|
IdleBlink
|
|
@ -1,3 +1,4 @@
|
||||||
|
|
||||||
ButtBounceEnd
|
ButtBounceEnd
|
||||||
ButtBounceStart
|
ButtBounceStart
|
||||||
Fall
|
Fall
|
||||||
|
@ -19,4 +20,5 @@ CrouchDown
|
||||||
CrouchUp
|
CrouchUp
|
||||||
LookUp
|
LookUp
|
||||||
IdleWeapon
|
IdleWeapon
|
||||||
Celebrate
|
Celebrate
|
||||||
|
IdleBlink
|
|
@ -19,4 +19,5 @@ DeathSquash
|
||||||
GetHit
|
GetHit
|
||||||
CrouchDown
|
CrouchDown
|
||||||
CrouchUp
|
CrouchUp
|
||||||
Celebrate
|
Celebrate
|
||||||
|
IdleBlink
|
|
@ -116,6 +116,7 @@ static const char *s_animNames[NUM_ANIM_SPONGEBOB]=
|
||||||
"ANIM_SPONGEBOB_IDLENOFACE",
|
"ANIM_SPONGEBOB_IDLENOFACE",
|
||||||
"ANIM_SPONGEBOB_IDLEZORRO",
|
"ANIM_SPONGEBOB_IDLEZORRO",
|
||||||
"ANIM_SPONGEBOB_CELEBRATE",
|
"ANIM_SPONGEBOB_CELEBRATE",
|
||||||
|
"ANIM_SPONGEBOB_IDLEBLINK",
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -238,6 +238,13 @@ static const CPlayer::AnimFrameSfx s_idleZorroSfx[]=
|
||||||
};
|
};
|
||||||
static const int s_idleZorroCount=sizeof(s_idleZorroSfx)/sizeof(CPlayer::AnimFrameSfx);
|
static const int s_idleZorroCount=sizeof(s_idleZorroSfx)/sizeof(CPlayer::AnimFrameSfx);
|
||||||
|
|
||||||
|
// ANIM_SPONGEBOB_IDLEBLINK,
|
||||||
|
static const CPlayer::AnimFrameSfx s_idleBlinkSfx[]=
|
||||||
|
{
|
||||||
|
{ 5, CSoundMediator::SFX_SPONGEBOB_BLINK, },
|
||||||
|
};
|
||||||
|
static const int s_idleBlinkCount=sizeof(s_idleBlinkSfx)/sizeof(CPlayer::AnimFrameSfx);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// This is the table that ties up anims to sfx
|
// This is the table that ties up anims to sfx
|
||||||
|
@ -259,8 +266,9 @@ const CPlayer::AnimSfx CPlayer::s_animSfx[]=
|
||||||
{ ANIM_SPONGEBOB_IDLEMOUSTACHE, s_idleMoustacheCount, s_idleMoustacheSfx },
|
{ ANIM_SPONGEBOB_IDLEMOUSTACHE, s_idleMoustacheCount, s_idleMoustacheSfx },
|
||||||
{ ANIM_SPONGEBOB_IDLENOFACE, s_idleNoFaceCount, s_idleNoFaceSfx },
|
{ ANIM_SPONGEBOB_IDLENOFACE, s_idleNoFaceCount, s_idleNoFaceSfx },
|
||||||
{ ANIM_SPONGEBOB_IDLEZORRO, s_idleZorroCount, s_idleZorroSfx },
|
{ ANIM_SPONGEBOB_IDLEZORRO, s_idleZorroCount, s_idleZorroSfx },
|
||||||
|
{ ANIM_SPONGEBOB_IDLEBLINK, s_idleBlinkCount, s_idleBlinkSfx },
|
||||||
};
|
};
|
||||||
const int CPlayer::s_numAnimSfx=16; // Grrrrrrrr! (pkg)
|
const int CPlayer::s_numAnimSfx=17; // Grrrrrrrr! (pkg)
|
||||||
|
|
||||||
|
|
||||||
/*===========================================================================
|
/*===========================================================================
|
||||||
|
|
|
@ -356,6 +356,7 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||||
-1, // ANIM_SPONGEBOB_IDLENOFACE,
|
-1, // ANIM_SPONGEBOB_IDLENOFACE,
|
||||||
-1, // ANIM_SPONGEBOB_IDLEZORRO,
|
-1, // ANIM_SPONGEBOB_IDLEZORRO,
|
||||||
ANIM_SPONGEBOB_NET_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
|
ANIM_SPONGEBOB_NET_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
|
||||||
|
ANIM_SPONGEBOB_NET_IDLEBLINK, // ANIM_SPONGEBOB_IDLEBLINK,
|
||||||
},
|
},
|
||||||
|
|
||||||
// PLAYER_ADDON_CORALBLOWER,
|
// PLAYER_ADDON_CORALBLOWER,
|
||||||
|
@ -396,6 +397,7 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||||
-1, // ANIM_SPONGEBOB_IDLENOFACE,
|
-1, // ANIM_SPONGEBOB_IDLENOFACE,
|
||||||
-1, // ANIM_SPONGEBOB_IDLEZORRO,
|
-1, // ANIM_SPONGEBOB_IDLEZORRO,
|
||||||
ANIM_SPONGEBOB_CORALBLOWER_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
|
ANIM_SPONGEBOB_CORALBLOWER_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
|
||||||
|
ANIM_SPONGEBOB_CORALBLOWER_IDLEBLINK, // ANIM_SPONGEBOB_IDLEBLINK,
|
||||||
},
|
},
|
||||||
|
|
||||||
// PLAYER_ADDON_JELLYLAUNCHER,
|
// PLAYER_ADDON_JELLYLAUNCHER,
|
||||||
|
@ -436,6 +438,7 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||||
-1, // ANIM_SPONGEBOB_IDLENOFACE,
|
-1, // ANIM_SPONGEBOB_IDLENOFACE,
|
||||||
-1, // ANIM_SPONGEBOB_IDLEZORRO,
|
-1, // ANIM_SPONGEBOB_IDLEZORRO,
|
||||||
ANIM_SPONGEBOB_JELLYLAUNCHER_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
|
ANIM_SPONGEBOB_JELLYLAUNCHER_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
|
||||||
|
ANIM_SPONGEBOB_JELLYLAUNCHER_IDLEBLINK, // ANIM_SPONGEBOB_IDLEBLINK,
|
||||||
},
|
},
|
||||||
|
|
||||||
// PLAYER_ADDON_BUBBLEWAND,
|
// PLAYER_ADDON_BUBBLEWAND,
|
||||||
|
@ -476,6 +479,7 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||||
-1, // ANIM_SPONGEBOB_IDLENOFACE,
|
-1, // ANIM_SPONGEBOB_IDLENOFACE,
|
||||||
-1, // ANIM_SPONGEBOB_IDLEZORRO,
|
-1, // ANIM_SPONGEBOB_IDLEZORRO,
|
||||||
ANIM_SPONGEBOB_WAND_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
|
ANIM_SPONGEBOB_WAND_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
|
||||||
|
ANIM_SPONGEBOB_WAND_IDLEBLINK, // ANIM_SPONGEBOB_IDLEBLINK,
|
||||||
},
|
},
|
||||||
|
|
||||||
// PLAYER_ADDON_JELLYFISHINNET
|
// PLAYER_ADDON_JELLYFISHINNET
|
||||||
|
@ -516,6 +520,7 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||||
-1, // ANIM_SPONGEBOB_IDLENOFACE,
|
-1, // ANIM_SPONGEBOB_IDLENOFACE,
|
||||||
-1, // ANIM_SPONGEBOB_IDLEZORRO,
|
-1, // ANIM_SPONGEBOB_IDLEZORRO,
|
||||||
ANIM_SPONGEBOB_JELLYFISH_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
|
ANIM_SPONGEBOB_JELLYFISH_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE,
|
||||||
|
ANIM_SPONGEBOB_JELLYFISH_IDLEBLINK, // ANIM_SPONGEBOB_IDLEBLINK,
|
||||||
},
|
},
|
||||||
|
|
||||||
// PLAYER_ADDON_GLOVE
|
// PLAYER_ADDON_GLOVE
|
||||||
|
@ -556,6 +561,7 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
||||||
-1, // ANIM_SPONGEBOB_IDLENOFACE,
|
-1, // ANIM_SPONGEBOB_IDLENOFACE,
|
||||||
-1, // ANIM_SPONGEBOB_IDLEZORRO,
|
-1, // ANIM_SPONGEBOB_IDLEZORRO,
|
||||||
-1, // ANIM_SPONGEBOB_CELEBRATE,
|
-1, // ANIM_SPONGEBOB_CELEBRATE,
|
||||||
|
-1, // ANIM_SPONGEBOB_IDLEBLINK,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -300,8 +300,8 @@ static IdleAnims s_unarmedIdleAnims[]=
|
||||||
{
|
{
|
||||||
// start frame loop frame end frame loop count
|
// start frame loop frame end frame loop count
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default
|
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 },
|
{ ANIM_SPONGEBOB_IDLEBLINK, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 },
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 },
|
{ ANIM_SPONGEBOB_IDLEBLINK, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 },
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN, -1, 1 },
|
{ -1, ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN, -1, 1 },
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEBANDAID, -1, 1 },
|
{ -1, ANIM_SPONGEBOB_IDLEBANDAID, -1, 1 },
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEMATURE, -1, 1 },
|
{ -1, ANIM_SPONGEBOB_IDLEMATURE, -1, 1 },
|
||||||
|
@ -331,8 +331,8 @@ static IdleAnims s_weaponIdleAnims[]=
|
||||||
{
|
{
|
||||||
// start frame loop frame end frame loop count
|
// start frame loop frame end frame loop count
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default
|
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 },
|
{ ANIM_SPONGEBOB_IDLEBLINK, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 },
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 },
|
{ ANIM_SPONGEBOB_IDLEBLINK, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 },
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 },
|
{ -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 },
|
||||||
};
|
};
|
||||||
static int s_numWeaponIdleAnims=sizeof(s_weaponIdleAnims)/sizeof(IdleAnims);
|
static int s_numWeaponIdleAnims=sizeof(s_weaponIdleAnims)/sizeof(IdleAnims);
|
||||||
|
@ -357,8 +357,8 @@ static IdleAnims s_netIdleAnims[]=
|
||||||
{
|
{
|
||||||
// start frame loop frame end frame loop count
|
// start frame loop frame end frame loop count
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default
|
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 },
|
{ ANIM_SPONGEBOB_IDLEBLINK, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 },
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 },
|
{ ANIM_SPONGEBOB_IDLEBLINK, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 },
|
||||||
{ -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 },
|
{ -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 },
|
||||||
};
|
};
|
||||||
static int s_numNetIdleAnims=sizeof(s_netIdleAnims)/sizeof(IdleAnims);
|
static int s_numNetIdleAnims=sizeof(s_netIdleAnims)/sizeof(IdleAnims);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue