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-05-29 20:42:16 +00:00
parent 85fecdb6f2
commit ba904bf512
8 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
makefile.gaz
View file

@ -238,6 +238,7 @@ pickups_src := pickup \
phealth \ phealth \
phelmet \ phelmet \
pjlammo \ pjlammo \
pkelp \
plife \ plife \
pnet \ pnet \
pquest \ pquest \

8
source/pickups/pickup.cpp
View file

@ -79,6 +79,10 @@
#include "pickups\pquest.h" #include "pickups\pquest.h"
#endif #endif
#ifndef __PICKUPS_PKELP_H__
#include "pickups\pkelp.h"
#endif
#include "game/game.h" #include "game/game.h"
/* Std Lib /* Std Lib
@ -488,6 +492,10 @@ CBasePickup *createPickup(const PICKUP_TYPE _type,const DVECTOR *_pos)
pickup=new ("JellylauncherPickup") CJellyLauncherPickup(); pickup=new ("JellylauncherPickup") CJellyLauncherPickup();
break; break;
case PICKUP__KELP_TOKEN:
pickup=new ("KelpTokenPickup") CKelpTokenPickup();
break;
default: default:
ASSERT(!"UNKNOWN PICKUP TYPE"); ASSERT(!"UNKNOWN PICKUP TYPE");
return NULL; return NULL;

1
source/pickups/pickup.h
View file

@ -49,6 +49,7 @@ typedef enum
PICKUP__QUEST_ITEM, PICKUP__QUEST_ITEM,
PICKUP__BALLOON_AND_SPATULA, PICKUP__BALLOON_AND_SPATULA,
PICKUP__JELLY_LAUNCHER, PICKUP__JELLY_LAUNCHER,
PICKUP__KELP_TOKEN,
PICKUP__MAX PICKUP__MAX
} }
PICKUP_TYPE; PICKUP_TYPE;

10
source/pickups/pkelp.cpp
View file

@ -72,13 +72,11 @@
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CKelpPickup::init() void CKelpTokenPickup::init()
{ {
sFrameHdr *fh; sFrameHdr *fh;
CBasePickup::init(); CBasePickup::init();
m_glint=0;
m_glintRot=0;
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__TOKEN); fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__TOKEN);
setCollisionSize(fh->W,fh->H); setCollisionSize(fh->W,fh->H);
@ -90,7 +88,7 @@ void CKelpPickup::init()
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
DVECTOR CKelpPickup::getSizeForPlacement() DVECTOR CKelpTokenPickup::getSizeForPlacement()
{ {
DVECTOR size; DVECTOR size;
sFrameHdr *fh; sFrameHdr *fh;
@ -107,7 +105,7 @@ DVECTOR CKelpPickup::getSizeForPlacement()
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CKelpPickup::collect(class CPlayer *_player) void CKelpTokenPickup::collect(class CPlayer *_player)
{ {
CBasePickup::collect(_player); CBasePickup::collect(_player);
// CGameSlotManager::getSlotData()->collectSpatula(GameScene.getChapterNumber(),GameScene.getLevelNumber(),m_spatulaNumber); // CGameSlotManager::getSlotData()->collectSpatula(GameScene.getChapterNumber(),GameScene.getLevelNumber(),m_spatulaNumber);
@ -119,7 +117,7 @@ void CKelpPickup::collect(class CPlayer *_player)
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CKelpPickup::renderPickup(DVECTOR *_pos) void CKelpTokenPickup::renderPickup(DVECTOR *_pos)
{ {
SpriteBank *sprites; SpriteBank *sprites;
sFrameHdr *fh; sFrameHdr *fh;

2
source/pickups/pkelp.h
View file

@ -34,7 +34,7 @@
Structure defintions Structure defintions
-------------------- */ -------------------- */
class CKelpPickup : public CBasePickup class CKelpTokenPickup : public CBasePickup
{ {
public: public:
virtual void init(); virtual void init();

1
tools/Data/bin/MkLevel.ini
View file

@ -73,6 +73,7 @@ Coral_Blower=13
Quest_Item=14 Quest_Item=14
Balloon_Golden_Spatula=15 Balloon_Golden_Spatula=15
Jelly_Launcher=16 Jelly_Launcher=16
Kelp_Token=17
################################################ ################################################

2
tools/MapEdit/Item.ini
View file

@ -57,3 +57,5 @@ Gfx=..\..\graphics\pickups\+questitem.bmp
[Jelly_Launcher] [Jelly_Launcher]
Gfx=..\..\graphics\pickups\+launcher.bmp Gfx=..\..\graphics\pickups\+launcher.bmp
[Kelp_Token]
Gfx=..\..\graphics\pickups\+token.bmp

8
users/paul/spongebob project/spongebob project.dsp
View file

@ -1193,6 +1193,14 @@ SOURCE=..\..\..\source\pickups\pjlammo.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\..\source\pickups\pkelp.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\pickups\pkelp.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\pickups\plife.cpp SOURCE=..\..\..\source\pickups\plife.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File