From c9f1767b3a036b08416df1f2b7ae6d7c9f7ecacf Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 13 Aug 2001 21:25:06 +0000 Subject: [PATCH] --- Graphics/characters/SpongeBob/AnimList.Txt | 3 ++- .../characters/SpongeBob_CoralBlower/AnimList.Txt | 3 ++- Graphics/characters/SpongeBob_JellyFish/AnimList.Txt | 3 ++- .../characters/SpongeBob_JellyLauncher/AnimList.Txt | 3 ++- Graphics/characters/SpongeBob_Net/AnimList.Txt | 4 +++- Graphics/characters/SpongeBob_Wand/AnimList.Txt | 3 ++- source/paul/animtest.cpp | 1 + source/player/panimsfx.cpp | 10 +++++++++- source/player/player.cpp | 6 ++++++ source/player/psidle.cpp | 12 ++++++------ 10 files changed, 35 insertions(+), 13 deletions(-) diff --git a/Graphics/characters/SpongeBob/AnimList.Txt b/Graphics/characters/SpongeBob/AnimList.Txt index 8988b3068..2e159a916 100644 --- a/Graphics/characters/SpongeBob/AnimList.Txt +++ b/Graphics/characters/SpongeBob/AnimList.Txt @@ -34,4 +34,5 @@ IdleMoustache IdleNoFace # IdleNet IdleZorro -Celebrate \ No newline at end of file +Celebrate +IdleBlink \ No newline at end of file diff --git a/Graphics/characters/SpongeBob_CoralBlower/AnimList.Txt b/Graphics/characters/SpongeBob_CoralBlower/AnimList.Txt index f4d354ded..b02e83997 100644 --- a/Graphics/characters/SpongeBob_CoralBlower/AnimList.Txt +++ b/Graphics/characters/SpongeBob_CoralBlower/AnimList.Txt @@ -16,4 +16,5 @@ GetHit CrouchDown CrouchUp LookUp -Celebrate \ No newline at end of file +Celebrate +IdleBlink \ No newline at end of file diff --git a/Graphics/characters/SpongeBob_JellyFish/AnimList.Txt b/Graphics/characters/SpongeBob_JellyFish/AnimList.Txt index caa594391..eaab0a0ae 100644 --- a/Graphics/characters/SpongeBob_JellyFish/AnimList.Txt +++ b/Graphics/characters/SpongeBob_JellyFish/AnimList.Txt @@ -20,4 +20,5 @@ CrouchUp LookUp IdleWeapon IdleNet -Celebrate \ No newline at end of file +Celebrate +IdleBlink \ No newline at end of file diff --git a/Graphics/characters/SpongeBob_JellyLauncher/AnimList.Txt b/Graphics/characters/SpongeBob_JellyLauncher/AnimList.Txt index a251b0a3a..ce79c8ba5 100644 --- a/Graphics/characters/SpongeBob_JellyLauncher/AnimList.Txt +++ b/Graphics/characters/SpongeBob_JellyLauncher/AnimList.Txt @@ -20,4 +20,5 @@ CrouchDown CrouchUp LookUp IdleWeapon -Celebrate \ No newline at end of file +Celebrate +IdleBlink \ No newline at end of file diff --git a/Graphics/characters/SpongeBob_Net/AnimList.Txt b/Graphics/characters/SpongeBob_Net/AnimList.Txt index 199ddd435..61a43071d 100644 --- a/Graphics/characters/SpongeBob_Net/AnimList.Txt +++ b/Graphics/characters/SpongeBob_Net/AnimList.Txt @@ -1,3 +1,4 @@ + ButtBounceEnd ButtBounceStart Fall @@ -19,4 +20,5 @@ CrouchDown CrouchUp LookUp IdleWeapon -Celebrate \ No newline at end of file +Celebrate +IdleBlink \ No newline at end of file diff --git a/Graphics/characters/SpongeBob_Wand/AnimList.Txt b/Graphics/characters/SpongeBob_Wand/AnimList.Txt index a07a2c949..e724dbecb 100644 --- a/Graphics/characters/SpongeBob_Wand/AnimList.Txt +++ b/Graphics/characters/SpongeBob_Wand/AnimList.Txt @@ -19,4 +19,5 @@ DeathSquash GetHit CrouchDown CrouchUp -Celebrate \ No newline at end of file +Celebrate +IdleBlink \ No newline at end of file diff --git a/source/paul/animtest.cpp b/source/paul/animtest.cpp index 68ed9de9f..8eb6a62ec 100644 --- a/source/paul/animtest.cpp +++ b/source/paul/animtest.cpp @@ -116,6 +116,7 @@ static const char *s_animNames[NUM_ANIM_SPONGEBOB]= "ANIM_SPONGEBOB_IDLENOFACE", "ANIM_SPONGEBOB_IDLEZORRO", "ANIM_SPONGEBOB_CELEBRATE", + "ANIM_SPONGEBOB_IDLEBLINK", }; diff --git a/source/player/panimsfx.cpp b/source/player/panimsfx.cpp index 2c3af62dc..7a18ca8cf 100644 --- a/source/player/panimsfx.cpp +++ b/source/player/panimsfx.cpp @@ -238,6 +238,13 @@ static const CPlayer::AnimFrameSfx s_idleZorroSfx[]= }; 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 @@ -259,8 +266,9 @@ const CPlayer::AnimSfx CPlayer::s_animSfx[]= { ANIM_SPONGEBOB_IDLEMOUSTACHE, s_idleMoustacheCount, s_idleMoustacheSfx }, { ANIM_SPONGEBOB_IDLENOFACE, s_idleNoFaceCount, s_idleNoFaceSfx }, { 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) /*=========================================================================== diff --git a/source/player/player.cpp b/source/player/player.cpp index 00c5702af..c080c2da3 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -356,6 +356,7 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_IDLENOFACE, -1, // ANIM_SPONGEBOB_IDLEZORRO, ANIM_SPONGEBOB_NET_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, + ANIM_SPONGEBOB_NET_IDLEBLINK, // ANIM_SPONGEBOB_IDLEBLINK, }, // PLAYER_ADDON_CORALBLOWER, @@ -396,6 +397,7 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_IDLENOFACE, -1, // ANIM_SPONGEBOB_IDLEZORRO, ANIM_SPONGEBOB_CORALBLOWER_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, + ANIM_SPONGEBOB_CORALBLOWER_IDLEBLINK, // ANIM_SPONGEBOB_IDLEBLINK, }, // PLAYER_ADDON_JELLYLAUNCHER, @@ -436,6 +438,7 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_IDLENOFACE, -1, // ANIM_SPONGEBOB_IDLEZORRO, ANIM_SPONGEBOB_JELLYLAUNCHER_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, + ANIM_SPONGEBOB_JELLYLAUNCHER_IDLEBLINK, // ANIM_SPONGEBOB_IDLEBLINK, }, // PLAYER_ADDON_BUBBLEWAND, @@ -476,6 +479,7 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_IDLENOFACE, -1, // ANIM_SPONGEBOB_IDLEZORRO, ANIM_SPONGEBOB_WAND_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, + ANIM_SPONGEBOB_WAND_IDLEBLINK, // ANIM_SPONGEBOB_IDLEBLINK, }, // PLAYER_ADDON_JELLYFISHINNET @@ -516,6 +520,7 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_IDLENOFACE, -1, // ANIM_SPONGEBOB_IDLEZORRO, ANIM_SPONGEBOB_JELLYFISH_CELEBRATE, // ANIM_SPONGEBOB_CELEBRATE, + ANIM_SPONGEBOB_JELLYFISH_IDLEBLINK, // ANIM_SPONGEBOB_IDLEBLINK, }, // PLAYER_ADDON_GLOVE @@ -556,6 +561,7 @@ s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_IDLENOFACE, -1, // ANIM_SPONGEBOB_IDLEZORRO, -1, // ANIM_SPONGEBOB_CELEBRATE, + -1, // ANIM_SPONGEBOB_IDLEBLINK, }, }; diff --git a/source/player/psidle.cpp b/source/player/psidle.cpp index 44ce66e54..80689890c 100644 --- a/source/player/psidle.cpp +++ b/source/player/psidle.cpp @@ -300,8 +300,8 @@ static IdleAnims s_unarmedIdleAnims[]= { // start frame loop frame end frame loop count { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default - { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, - { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 }, + { ANIM_SPONGEBOB_IDLEBLINK, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, + { ANIM_SPONGEBOB_IDLEBLINK, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 }, { -1, ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN, -1, 1 }, { -1, ANIM_SPONGEBOB_IDLEBANDAID, -1, 1 }, { -1, ANIM_SPONGEBOB_IDLEMATURE, -1, 1 }, @@ -331,8 +331,8 @@ static IdleAnims s_weaponIdleAnims[]= { // start frame loop frame end frame loop count { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default - { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, - { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 }, + { ANIM_SPONGEBOB_IDLEBLINK, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, + { ANIM_SPONGEBOB_IDLEBLINK, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 }, { -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 }, }; 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 { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, // default - { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, - { -1, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 }, + { ANIM_SPONGEBOB_IDLEBLINK, ANIM_SPONGEBOB_IDLEBREATH, -1, 5*60 }, + { ANIM_SPONGEBOB_IDLEBLINK, ANIM_SPONGEBOB_IDLEBREATH, -1, 2*60 }, { -1, ANIM_SPONGEBOB_IDLEWEAPON, -1, 1 }, }; static int s_numNetIdleAnims=sizeof(s_netIdleAnims)/sizeof(IdleAnims);