This commit is contained in:
parent
749b749a22
commit
6da7b53b4b
16 changed files with 205 additions and 73 deletions
|
@ -314,7 +314,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
ANIM_SPONGEBOB_NET_RUN, // ANIM_SPONGEBOB_RUN,
|
||||
ANIM_SPONGEBOB_NET_RUNSTOP, // ANIM_SPONGEBOB_RUNSTOP,
|
||||
ANIM_SPONGEBOB_NET_RUNSTART, // ANIM_SPONGEBOB_RUNSTART,
|
||||
ANIM_SPONGEBOB_NET_SOAKUP, // ANIM_SPONGEBOB_SOAKUP,
|
||||
ANIM_SPONGEBOB_NET_TEETERBACK, // ANIM_SPONGEBOB_TEETERBACK,
|
||||
ANIM_SPONGEBOB_NET_TEETERFRONT, // ANIM_SPONGEBOB_TEETERFRONT,
|
||||
ANIM_SPONGEBOB_NET_SWIPE, // ANIM_SPONGEBOB_SWIPE,
|
||||
|
@ -326,7 +325,7 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
-1, // ANIM_SPONGEBOB_BLOWBUBBLE,
|
||||
-1, // ANIM_SPONGEBOB_FIREEND,
|
||||
-1, // ANIM_SPONGEBOB_FIRESTART,
|
||||
-1, // ANIM_SPONGEBOB_IDLEWEAPON,
|
||||
ANIM_SPONGEBOB_NET_IDLEWEAPON, // ANIM_SPONGEBOB_IDLEWEAPON,
|
||||
-1, // ANIM_SPONGEBOB_WALK,
|
||||
-1, // ANIM_SPONGEBOB_KARATE,
|
||||
ANIM_SPONGEBOB_NET_GETHIT, // ANIM_SPONGEBOB_GETHIT
|
||||
|
@ -335,7 +334,14 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
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,
|
||||
},
|
||||
|
||||
// PLAYER_ADDON_CORALBLOWER,
|
||||
|
@ -351,7 +357,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
-1, // ANIM_SPONGEBOB_RUN,
|
||||
-1, // ANIM_SPONGEBOB_RUNSTOP,
|
||||
-1, // ANIM_SPONGEBOB_RUNSTART,
|
||||
-1, // ANIM_SPONGEBOB_SOAKUP,
|
||||
ANIM_SPONGEBOB_CORALBLOWER_TEETERBACK, // ANIM_SPONGEBOB_TEETERBACK,
|
||||
ANIM_SPONGEBOB_CORALBLOWER_TEETERFRONT, // ANIM_SPONGEBOB_TEETERFRONT,
|
||||
-1, // ANIM_SPONGEBOB_SWIPE,
|
||||
|
@ -372,6 +377,14 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
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,
|
||||
},
|
||||
|
||||
// PLAYER_ADDON_JELLYLAUNCHER,
|
||||
|
@ -387,7 +400,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
ANIM_SPONGEBOB_JELLYLAUNCHER_RUN, // ANIM_SPONGEBOB_RUN,
|
||||
ANIM_SPONGEBOB_JELLYLAUNCHER_RUNSTOP, // ANIM_SPONGEBOB_RUNSTOP,
|
||||
ANIM_SPONGEBOB_JELLYLAUNCHER_RUNSTART, // ANIM_SPONGEBOB_RUNSTART,
|
||||
ANIM_SPONGEBOB_JELLYLAUNCHER_SOAKUP, // ANIM_SPONGEBOB_SOAKUP,
|
||||
ANIM_SPONGEBOB_JELLYLAUNCHER_TEETERBACK, // ANIM_SPONGEBOB_TEETERBACK,
|
||||
ANIM_SPONGEBOB_JELLYLAUNCHER_TEETERFRONT, // ANIM_SPONGEBOB_TEETERFRONT,
|
||||
-1, // ANIM_SPONGEBOB_SWIPE,
|
||||
|
@ -408,6 +420,14 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
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,
|
||||
},
|
||||
|
||||
// PLAYER_ADDON_BUBBLEWAND,
|
||||
|
@ -423,7 +443,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
ANIM_SPONGEBOB_WAND_RUN, // ANIM_SPONGEBOB_RUN,
|
||||
ANIM_SPONGEBOB_WAND_RUNSTOP, // ANIM_SPONGEBOB_RUNSTOP,
|
||||
ANIM_SPONGEBOB_WAND_RUNSTART, // ANIM_SPONGEBOB_RUNSTART,
|
||||
-1, // ANIM_SPONGEBOB_SOAKUP,
|
||||
ANIM_SPONGEBOB_WAND_TEETERBACK, // ANIM_SPONGEBOB_TEETERBACK,
|
||||
ANIM_SPONGEBOB_WAND_TEETERFRONT, // ANIM_SPONGEBOB_TEETERFRONT,
|
||||
-1, // ANIM_SPONGEBOB_SWIPE,
|
||||
|
@ -444,6 +463,15 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
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,
|
||||
|
||||
},
|
||||
|
||||
// PLAYER_ADDON_JELLYFISHINNET
|
||||
|
@ -459,7 +487,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
ANIM_SPONGEBOB_JELLYFISH_RUN, // ANIM_SPONGEBOB_RUN,
|
||||
ANIM_SPONGEBOB_JELLYFISH_RUNSTOP, // ANIM_SPONGEBOB_RUNSTOP,
|
||||
ANIM_SPONGEBOB_JELLYFISH_RUNSTART, // ANIM_SPONGEBOB_RUNSTART,
|
||||
ANIM_SPONGEBOB_JELLYFISH_SOAKUP, // ANIM_SPONGEBOB_SOAKUP,
|
||||
ANIM_SPONGEBOB_JELLYFISH_TEETERBACK, // ANIM_SPONGEBOB_TEETERBACK,
|
||||
ANIM_SPONGEBOB_JELLYFISH_TEETERFRONT, // ANIM_SPONGEBOB_TEETERFRONT,
|
||||
ANIM_SPONGEBOB_JELLYFISH_SWIPE, // ANIM_SPONGEBOB_SWIPE,
|
||||
|
@ -480,6 +507,14 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
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,
|
||||
-1, // ANIM_SPONGEBOB_IDLENET,
|
||||
-1, // ANIM_SPONGEBOB_IDLEZORRO,
|
||||
},
|
||||
|
||||
// PLAYER_ADDON_GLOVE
|
||||
|
@ -495,7 +530,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
-1, // ANIM_SPONGEBOB_RUN,
|
||||
-1, // ANIM_SPONGEBOB_RUNSTOP,
|
||||
-1, // ANIM_SPONGEBOB_RUNSTART,
|
||||
-1, // ANIM_SPONGEBOB_SOAKUP,
|
||||
-1, // ANIM_SPONGEBOB_TEETERBACK,
|
||||
-1, // ANIM_SPONGEBOB_TEETERFRONT,
|
||||
-1, // ANIM_SPONGEBOB_SWIPE,
|
||||
|
@ -516,6 +550,14 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
|
|||
-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,
|
||||
},
|
||||
};
|
||||
|
||||
|
@ -1229,13 +1271,16 @@ if(drawlastpos)
|
|||
|
||||
|
||||
// Render player
|
||||
DVECTOR sbPos=
|
||||
if(m_animNo!=ANIM_SPONGEBOB_DONOTDRAW)
|
||||
{
|
||||
Pos.vx-m_cameraPos.vx,
|
||||
Pos.vy-m_cameraPos.vy,
|
||||
};
|
||||
renderSb(&sbPos,m_animNo,m_animFrame>>sbanimspeed);
|
||||
m_currentPlayerModeClass->render(&sbPos);
|
||||
DVECTOR sbPos=
|
||||
{
|
||||
Pos.vx-m_cameraPos.vx,
|
||||
Pos.vy-m_cameraPos.vy,
|
||||
};
|
||||
renderSb(&sbPos,m_animNo,m_animFrame>>sbanimspeed);
|
||||
m_currentPlayerModeClass->render(&sbPos);
|
||||
}
|
||||
|
||||
|
||||
// UI
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue