From 40cddf58855b91349109b0c95cec6a1435bd054b Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 10 Jun 2001 16:51:21 +0000 Subject: [PATCH] --- source/player/player.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/source/player/player.cpp b/source/player/player.cpp index 38758cda1..d8adb3374 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -319,7 +319,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= ANIM_SPONGEBOB_NET_GETUP, // ANIM_SPONGEBOB_GETUP, ANIM_SPONGEBOB_NET_HITGROUND, // ANIM_SPONGEBOB_HITGROUND, ANIM_SPONGEBOB_NET_IDLEBREATH, // ANIM_SPONGEBOB_IDLEBREATH, - ANIM_SPONGEBOB_NET_IDLEWIND, // ANIM_SPONGEBOB_IDLEWIND, ANIM_SPONGEBOB_NET_JUMPEND, // ANIM_SPONGEBOB_JUMPEND, ANIM_SPONGEBOB_NET_JUMP, // ANIM_SPONGEBOB_JUMP, ANIM_SPONGEBOB_NET_RUN, // ANIM_SPONGEBOB_RUN, @@ -353,7 +352,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= ANIM_SPONGEBOB_CORALBLOWER_GETUP, // ANIM_SPONGEBOB_GETUP, ANIM_SPONGEBOB_CORALBLOWER_HITGROUND, // ANIM_SPONGEBOB_HITGROUND, ANIM_SPONGEBOB_CORALBLOWER_IDLEBREATH, // ANIM_SPONGEBOB_IDLEBREATH, - -1, // ANIM_SPONGEBOB_IDLEWIND, ANIM_SPONGEBOB_CORALBLOWER_JUMPEND, // ANIM_SPONGEBOB_JUMPEND, ANIM_SPONGEBOB_CORALBLOWER_JUMP, // ANIM_SPONGEBOB_JUMP, -1, // ANIM_SPONGEBOB_RUN, @@ -387,7 +385,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= ANIM_SPONGEBOB_JELLYLAUNCHER_GETUP, // ANIM_SPONGEBOB_GETUP, ANIM_SPONGEBOB_JELLYLAUNCHER_HITGROUND, // ANIM_SPONGEBOB_HITGROUND, ANIM_SPONGEBOB_JELLYLAUNCHER_IDLEBREATH, // ANIM_SPONGEBOB_IDLEBREATH, - ANIM_SPONGEBOB_JELLYLAUNCHER_IDLEWIND, // ANIM_SPONGEBOB_IDLEWIND, ANIM_SPONGEBOB_JELLYLAUNCHER_JUMPEND, // ANIM_SPONGEBOB_JUMPEND, ANIM_SPONGEBOB_JELLYLAUNCHER_JUMP, // ANIM_SPONGEBOB_JUMP, ANIM_SPONGEBOB_JELLYLAUNCHER_RUN, // ANIM_SPONGEBOB_RUN, @@ -421,7 +418,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= ANIM_SPONGEBOB_GLASSES_GETUP, // ANIM_SPONGEBOB_GETUP, ANIM_SPONGEBOB_GLASSES_HITGROUND, // ANIM_SPONGEBOB_HITGROUND, ANIM_SPONGEBOB_GLASSES_IDLEBREATH, // ANIM_SPONGEBOB_IDLEBREATH, - ANIM_SPONGEBOB_GLASSES_IDLEWIND, // ANIM_SPONGEBOB_IDLEWIND, ANIM_SPONGEBOB_GLASSES_JUMPEND, // ANIM_SPONGEBOB_JUMPEND, ANIM_SPONGEBOB_GLASSES_JUMP, // ANIM_SPONGEBOB_JUMP, ANIM_SPONGEBOB_GLASSES_RUN, // ANIM_SPONGEBOB_RUN, @@ -455,7 +451,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= ANIM_SPONGEBOB_WAND_GETUP, // ANIM_SPONGEBOB_GETUP, ANIM_SPONGEBOB_WAND_HITGROUND, // ANIM_SPONGEBOB_HITGROUND, ANIM_SPONGEBOB_WAND_IDLEBREATH, // ANIM_SPONGEBOB_IDLEBREATH, - ANIM_SPONGEBOB_WAND_IDLEWIND, // ANIM_SPONGEBOB_IDLEWIND, ANIM_SPONGEBOB_WAND_JUMPEND, // ANIM_SPONGEBOB_JUMPEND, ANIM_SPONGEBOB_WAND_JUMP, // ANIM_SPONGEBOB_JUMP, ANIM_SPONGEBOB_WAND_RUN, // ANIM_SPONGEBOB_RUN, @@ -489,7 +484,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= ANIM_SPONGEBOB_JELLYFISH_GETUP, // ANIM_SPONGEBOB_GETUP, ANIM_SPONGEBOB_JELLYFISH_HITGROUND, // ANIM_SPONGEBOB_HITGROUND, ANIM_SPONGEBOB_JELLYFISH_IDLEBREATH, // ANIM_SPONGEBOB_IDLEBREATH, - ANIM_SPONGEBOB_JELLYFISH_IDLEWIND, // ANIM_SPONGEBOB_IDLEWIND, ANIM_SPONGEBOB_JELLYFISH_JUMPEND, // ANIM_SPONGEBOB_JUMPEND, ANIM_SPONGEBOB_JELLYFISH_JUMP, // ANIM_SPONGEBOB_JUMP, ANIM_SPONGEBOB_JELLYFISH_RUN, // ANIM_SPONGEBOB_RUN, @@ -523,7 +517,6 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]= -1, // ANIM_SPONGEBOB_GETUP, -1, // ANIM_SPONGEBOB_HITGROUND, -1, // ANIM_SPONGEBOB_IDLEBREATH, - -1, // ANIM_SPONGEBOB_IDLEWIND, -1, // ANIM_SPONGEBOB_JUMPEND, -1, // ANIM_SPONGEBOB_JUMP, -1, // ANIM_SPONGEBOB_RUN, @@ -744,6 +737,15 @@ if(newmode!=-1) m_xMove = Pos.vx; +/// +#ifdef __USER_paul__ +if(PadGetDown(0)&PAD_TRIANGLE) +{ + springPlayerUp(); +} +#endif +/// + for(i=0;i<_frames;i++) { updatePadInput();