This commit is contained in:
Paul
parent
125ff4cb98
commit
693744cb6f
10 changed files with 11 additions and 99 deletions
|
|
@ -116,10 +116,6 @@
|
|||
#include <ACTOR_SPONGEBOB_JELLYLAUNCHER_Anim.h>
|
||||
#endif
|
||||
|
||||
#ifndef __ANIM_SPONGEBOB_GLASSES_HEADER__
|
||||
#include <ACTOR_SPONGEBOB_GLASSES_Anim.h>
|
||||
#endif
|
||||
|
||||
#ifndef __ANIM_SPONGEBOB_WAND_HEADER__
|
||||
#include <ACTOR_SPONGEBOB_WAND_Anim.h>
|
||||
#endif
|
||||
|
|
@ -148,23 +144,6 @@
|
|||
// Two dice. One says 'Re' on every face, the other says 'boot',
|
||||
// 'install', 'try', 'tire', 'sume' and 'number'
|
||||
|
||||
/*
|
||||
WEAPON MODES
|
||||
unamred constant
|
||||
karate-chop constant
|
||||
balloon timed ( respawn )
|
||||
bubble mixture (un)limited supply ( respawn )
|
||||
helmet constant ( respawn )
|
||||
coral blower constant ( respawn )
|
||||
net constant
|
||||
jelly launcher limited supply ( respawn )
|
||||
|
||||
POWER-UPS
|
||||
glasses constant
|
||||
squeaky boots timed ( respawn )
|
||||
mm & bb ring timed
|
||||
*/
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
Function Prototypes
|
||||
------------------- */
|
||||
|
|
@ -288,7 +267,6 @@ CActorGfx *s_addonActorGfx[NUM_PLAYER_ADDONS]=
|
|||
NULL, // PLAYER_ADDON_NET
|
||||
NULL, // PLAYER_ADDON_CORALBLOWER
|
||||
NULL, // PLAYER_ADDON_JELLYLAUNCHER
|
||||
NULL, // PLAYER_ADDON_GLASSES
|
||||
NULL, // PLAYER_ADDON_BUBBLEWAND
|
||||
NULL, // PLAYER_ADDON_JELLYFISHINNET
|
||||
NULL, // PLAYER_ADDON_GLOVE
|
||||
|
|
@ -298,7 +276,6 @@ FileEquate s_addonActorPoolNames[NUM_PLAYER_ADDONS]=
|
|||
ACTORS_SPONGEBOB_NET_SBK, // PLAYER_ADDON_NET
|
||||
ACTORS_SPONGEBOB_CORALBLOWER_SBK, // PLAYER_ADDON_CORALBLOWER
|
||||
ACTORS_SPONGEBOB_JELLYLAUNCHER_SBK, // PLAYER_ADDON_JELLYLAUNCHER
|
||||
ACTORS_SPONGEBOB_GLASSES_SBK, // PLAYER_ADDON_GLASSES
|
||||
ACTORS_SPONGEBOB_WAND_SBK, // PLAYER_ADDON_BUBBLEWAND
|
||||
ACTORS_SPONGEBOB_JELLYFISH_SBK, // PLAYER_ADDON_JELLYFISHINNET
|
||||
ACTORS_SPONGEBOB_GLOVE_SBK, // PLAYER_ADDON_GLOVE
|
||||
|
|
@ -428,42 +405,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
-1, // ANIM_SPONGEBOB_IDLEFACEUPSIDEDOWN
|
||||
},
|
||||
|
||||
// PLAYER_ADDON_GLASSES,
|
||||
{
|
||||
ANIM_SPONGEBOB_GLASSES_BUTTBOUNCEEND, // ANIM_SPONGEBOB_BUTTBOUNCEEND,
|
||||
ANIM_SPONGEBOB_GLASSES_BUTTBOUNCESTART, // ANIM_SPONGEBOB_BUTTBOUNCESTART,
|
||||
ANIM_SPONGEBOB_GLASSES_FALL, // ANIM_SPONGEBOB_FALL,
|
||||
ANIM_SPONGEBOB_GLASSES_GETUP, // ANIM_SPONGEBOB_GETUP,
|
||||
ANIM_SPONGEBOB_GLASSES_HITGROUND, // ANIM_SPONGEBOB_HITGROUND,
|
||||
ANIM_SPONGEBOB_GLASSES_IDLEBREATH, // ANIM_SPONGEBOB_IDLEBREATH,
|
||||
ANIM_SPONGEBOB_GLASSES_JUMPEND, // ANIM_SPONGEBOB_JUMPEND,
|
||||
ANIM_SPONGEBOB_GLASSES_JUMP, // ANIM_SPONGEBOB_JUMP,
|
||||
ANIM_SPONGEBOB_GLASSES_RUN, // ANIM_SPONGEBOB_RUN,
|
||||
ANIM_SPONGEBOB_GLASSES_RUNSTOP, // ANIM_SPONGEBOB_RUNSTOP,
|
||||
ANIM_SPONGEBOB_GLASSES_RUNSTART, // ANIM_SPONGEBOB_RUNSTART,
|
||||
ANIM_SPONGEBOB_GLASSES_SOAKUP, // ANIM_SPONGEBOB_SOAKUP,
|
||||
ANIM_SPONGEBOB_GLASSES_TEETERBACK, // ANIM_SPONGEBOB_TEETERBACK,
|
||||
ANIM_SPONGEBOB_GLASSES_TEETERFRONT, // ANIM_SPONGEBOB_TEETERFRONT,
|
||||
ANIM_SPONGEBOB_GLASSES_SWIPE, // ANIM_SPONGEBOB_SWIPE,
|
||||
ANIM_SPONGEBOB_GLASSES_DEATHFORWARDS, // ANIM_SPONGEBOB_DEATHFORWARDS,
|
||||
ANIM_SPONGEBOB_GLASSES_DEATHSQUASH, // ANIM_SPONGEBOB_DEATHSQUASH,
|
||||
ANIM_SPONGEBOB_GLASSES_DEATHSPIN, // ANIM_SPONGEBOB_DEATHSPIN,
|
||||
-1, // ANIM_SPONGEBOB_DEATHDRY
|
||||
ANIM_SPONGEBOB_GLASSES_BALLOONJUMP, // ANIM_SPONGEBOB_BALLOONJUMP,
|
||||
ANIM_SPONGEBOB_GLASSES_BLOWBUBBLE, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
||||
ANIM_SPONGEBOB_GLASSES_FIREEND, // ANIM_SPONGEBOB_FIREEND,
|
||||
ANIM_SPONGEBOB_GLASSES_FIRESTART, // ANIM_SPONGEBOB_FIRESTART,
|
||||
ANIM_SPONGEBOB_GLASSES_IDLEWEAPON, // ANIM_SPONGEBOB_IDLEWEAPON,
|
||||
ANIM_SPONGEBOB_GLASSES_WALK, // ANIM_SPONGEBOB_WALK,
|
||||
ANIM_SPONGEBOB_GLASSES_KARATE, // ANIM_SPONGEBOB_KARATE,
|
||||
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,
|
||||
{
|
||||
ANIM_SPONGEBOB_WAND_BUTTBOUNCEEND, // ANIM_SPONGEBOB_BUTTBOUNCEEND,
|
||||
|
|
@ -650,15 +591,12 @@ m_animFrame=0;
|
|||
m_divingHelmet=false;
|
||||
setIsInWater(true);
|
||||
|
||||
m_glassesFlag=0;
|
||||
|
||||
// Always ( cept for one level ) need this
|
||||
registerAddon(PLAYER_ADDON_GLOVE);
|
||||
#ifdef __USER_paul__
|
||||
registerAddon(PLAYER_ADDON_NET);
|
||||
registerAddon(PLAYER_ADDON_CORALBLOWER);
|
||||
registerAddon(PLAYER_ADDON_JELLYLAUNCHER);
|
||||
registerAddon(PLAYER_ADDON_GLASSES);
|
||||
registerAddon(PLAYER_ADDON_BUBBLEWAND);
|
||||
registerAddon(PLAYER_ADDON_JELLYFISHINNET);
|
||||
#endif
|
||||
|
|
@ -1888,28 +1826,6 @@ void CPlayer::renderSb(DVECTOR *_pos,int _animNo,int _animFrame)
|
|||
}
|
||||
}
|
||||
|
||||
// Render glasses addon?
|
||||
if(isWearingGlasses())
|
||||
{
|
||||
s8 addonAnimNo=s_animMapNet[PLAYER_ADDON_GLASSES][_animNo];
|
||||
if(addonAnimNo!=-1)
|
||||
{
|
||||
CActorGfx *addonGfx=s_addonActorGfx[PLAYER_ADDON_GLASSES];
|
||||
if(addonGfx)
|
||||
{
|
||||
if(_animFrame>=addonGfx->getFrameCount(addonAnimNo))
|
||||
{
|
||||
PAUL_DBGMSG("FRAME OVERRUN ON SPONGEBOB GLASSES ADDON! ( %d vs %d )",m_actorGfx->getFrameCount(_animNo),addonGfx->getFrameCount(addonAnimNo));
|
||||
}
|
||||
else
|
||||
{
|
||||
ft4=addonGfx->Render(*_pos,addonAnimNo,_animFrame,m_facing==FACING_RIGHT?0:1);
|
||||
setSemiTrans(ft4,trans);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Render glove addon?
|
||||
if(m_currentMode==PLAYER_MODE_FULLUNARMED)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue