zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-06-13 16:59:29 +00:00
parent 125ff4cb98
commit 693744cb6f
10 changed files with 11 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/DataCache.scr
View file

@ -159,7 +159,6 @@ actors/SPONGEBOB_JELLYLAUNCHER.SBK
actors/SPONGEBOB_NET.SBK
actors/SPONGEBOB_WAND.SBK
actors/SPONGEBOB_JELLYFISH.SBK
actors/SPONGEBOB_GLASSES.SBK
actors/SPONGEBOB_GLOVE.SBK
actors/BARNACLEBOY.SBK

1
makefile.gaz
View file

@ -248,7 +248,6 @@ pickups_src := pickup \
pballoon \
pblower \
pbubmix \
pglasses \
phealth \
phelmet \
pjlammo \

4
makefile.gfx
View file

@ -107,7 +107,7 @@ ACTOR_OUT_DIR := $(DATA_OUT)/Actors
ACTOR_MAKEFILE_DIR := $(TEMP_BUILD_DIR)/actor
ACTOR_DIRS_TO_MAKE := $(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR)
ACTOR_SPONGEBOB := SpongeBob SpongeBob_CoralBlower SpongeBob_JellyLauncher SpongeBob_Net SpongeBob_Glove SpongeBob_Wand SpongeBob_Glasses SpongeBob_JellyFish
ACTOR_SPONGEBOB := SpongeBob SpongeBob_CoralBlower SpongeBob_JellyLauncher SpongeBob_Net SpongeBob_Glove SpongeBob_Wand SpongeBob_JellyFish
ACTOR_NPC := BarnacleBoy Krusty Squidward Gary Sandy Patrick MermaidMan
ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil \
@ -182,7 +182,7 @@ INGAMEFX_GFX_NONTRANS_IN := $(foreach FILE,$(INGAMEFX_GFX_NONTRANS),$(INGAMEFX_N
PICKUP_GFX_DIR := $(GRAF_DIR)/pickups
PICKUP_GFX := +spatula +token +pants +health100 +health50 +health25 +glint1 +glint2 +glint3 +glint4 \
+jellyammo +bubblemixture +bubblewand +glasses +shoe +balloon +balloonburst +helmet \
+jellyammo +bubblemixture +bubblewand +shoe +balloon +balloonburst +helmet \
+blower +launcher +net \
+c1_l1_quest_item +c1_l2_quest_item +c1_l3_quest_item +c1_l4_quest_item \
+c2_l1_quest_item +c2_l2_quest_item +c2_l3_quest_item +c2_l4_quest_item \

2
source/enemy/nsj2back.cpp
View file

@ -43,7 +43,7 @@ void CNpcSmallJellyfish2BackgroundEnemy::render()
{
CPlayer *player = GameScene.getPlayer();
if ( player->isWearingGlasses() )
// if ( player->isWearingGlasses() ) (PKG)
{
SprFrame = NULL;

3
source/pickups/pglasses.cpp
View file

@ -1,3 +1,6 @@
dsadsasdsad
/*=========================================================================
pglasses.cpp

3
source/pickups/pglasses.h
View file

@ -1,3 +1,6 @@
asddsasadsaasd
/*=========================================================================
pglasses.h

6
source/pickups/pickup.cpp
View file

@ -55,10 +55,6 @@
#include "pickups\pblower.h"
#endif
#ifndef __PICKUPS_PGLASSES_H__
#include "pickups\pglasses.h"
#endif
#ifndef __PICKUPS_PSHOES_H__
#include "pickups\pshoes.h"
#endif
@ -468,7 +464,7 @@ CBasePickup *createPickup(const PICKUP_TYPE _type,const DVECTOR *_pos)
break;
case PICKUP__GLASSES:
pickup=new ("GlassesPickup") CGlassesPickup();
ASSERT(!"GLASSES ARE NO LONGER IN THE GAME");
break;
case PICKUP__SQUEAKY_SHOES:

2
source/pickups/pickup.h
View file

@ -45,7 +45,7 @@ typedef enum
PICKUP__BUBBLE_MIXTURE,
PICKUP__BUBBLE_WAND,
PICKUP__NET,
PICKUP__GLASSES,
PICKUP__GLASSES, // No longer in the game.. Yay(!)
PICKUP__SQUEAKY_SHOES,
PICKUP__BALLOON,
PICKUP__HELMET,

84
source/player/player.cpp
View file

@ -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)
{

4
source/player/player.h
View file

@ -94,7 +94,6 @@ typedef enum
PLAYER_ADDON_NET,
PLAYER_ADDON_CORALBLOWER,
PLAYER_ADDON_JELLYLAUNCHER,
PLAYER_ADDON_GLASSES,
PLAYER_ADDON_BUBBLEWAND,
PLAYER_ADDON_JELLYFISHINNET,
PLAYER_ADDON_GLOVE,
@ -372,8 +371,6 @@ private:
MAX_JELLFISH_IN_NET=5,
};
public:
void giveGlasses() {m_glassesFlag=true;}
int isWearingGlasses() {return m_glassesFlag;}
void giveSqueakyBoots() {m_squeakyBootsTimer=SQUEAKY_BOOTS_TIME;}
int isWearingBoots() {return m_squeakyBootsTimer;}
void giveInvincibilityRing() {m_invincibilityRingTimer=INVINCIBILITY_RING_TIME;}
@ -404,7 +401,6 @@ public:
void justButtBouncedABadGuy(); // Also fugly.. :/
private:
int m_glassesFlag;
int m_squeakyBootsTimer;
int m_invincibilityRingTimer;
int m_divingHelmet;