This commit is contained in:
parent
85fecdb6f2
commit
ba904bf512
@ -238,6 +238,7 @@ pickups_src := pickup \
|
||||
phealth \
|
||||
phelmet \
|
||||
pjlammo \
|
||||
pkelp \
|
||||
plife \
|
||||
pnet \
|
||||
pquest \
|
||||
|
@ -79,6 +79,10 @@
|
||||
#include "pickups\pquest.h"
|
||||
#endif
|
||||
|
||||
#ifndef __PICKUPS_PKELP_H__
|
||||
#include "pickups\pkelp.h"
|
||||
#endif
|
||||
|
||||
#include "game/game.h"
|
||||
|
||||
/* Std Lib
|
||||
@ -488,6 +492,10 @@ CBasePickup *createPickup(const PICKUP_TYPE _type,const DVECTOR *_pos)
|
||||
pickup=new ("JellylauncherPickup") CJellyLauncherPickup();
|
||||
break;
|
||||
|
||||
case PICKUP__KELP_TOKEN:
|
||||
pickup=new ("KelpTokenPickup") CKelpTokenPickup();
|
||||
break;
|
||||
|
||||
default:
|
||||
ASSERT(!"UNKNOWN PICKUP TYPE");
|
||||
return NULL;
|
||||
|
@ -49,6 +49,7 @@ typedef enum
|
||||
PICKUP__QUEST_ITEM,
|
||||
PICKUP__BALLOON_AND_SPATULA,
|
||||
PICKUP__JELLY_LAUNCHER,
|
||||
PICKUP__KELP_TOKEN,
|
||||
PICKUP__MAX
|
||||
}
|
||||
PICKUP_TYPE;
|
||||
|
@ -72,13 +72,11 @@
|
||||
Params:
|
||||
Returns:
|
||||
---------------------------------------------------------------------- */
|
||||
void CKelpPickup::init()
|
||||
void CKelpTokenPickup::init()
|
||||
{
|
||||
sFrameHdr *fh;
|
||||
|
||||
CBasePickup::init();
|
||||
m_glint=0;
|
||||
m_glintRot=0;
|
||||
|
||||
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__TOKEN);
|
||||
setCollisionSize(fh->W,fh->H);
|
||||
@ -90,7 +88,7 @@ void CKelpPickup::init()
|
||||
Params:
|
||||
Returns:
|
||||
---------------------------------------------------------------------- */
|
||||
DVECTOR CKelpPickup::getSizeForPlacement()
|
||||
DVECTOR CKelpTokenPickup::getSizeForPlacement()
|
||||
{
|
||||
DVECTOR size;
|
||||
sFrameHdr *fh;
|
||||
@ -107,7 +105,7 @@ DVECTOR CKelpPickup::getSizeForPlacement()
|
||||
Params:
|
||||
Returns:
|
||||
---------------------------------------------------------------------- */
|
||||
void CKelpPickup::collect(class CPlayer *_player)
|
||||
void CKelpTokenPickup::collect(class CPlayer *_player)
|
||||
{
|
||||
CBasePickup::collect(_player);
|
||||
// CGameSlotManager::getSlotData()->collectSpatula(GameScene.getChapterNumber(),GameScene.getLevelNumber(),m_spatulaNumber);
|
||||
@ -119,7 +117,7 @@ void CKelpPickup::collect(class CPlayer *_player)
|
||||
Params:
|
||||
Returns:
|
||||
---------------------------------------------------------------------- */
|
||||
void CKelpPickup::renderPickup(DVECTOR *_pos)
|
||||
void CKelpTokenPickup::renderPickup(DVECTOR *_pos)
|
||||
{
|
||||
SpriteBank *sprites;
|
||||
sFrameHdr *fh;
|
||||
|
@ -34,7 +34,7 @@
|
||||
Structure defintions
|
||||
-------------------- */
|
||||
|
||||
class CKelpPickup : public CBasePickup
|
||||
class CKelpTokenPickup : public CBasePickup
|
||||
{
|
||||
public:
|
||||
virtual void init();
|
||||
|
@ -73,6 +73,7 @@ Coral_Blower=13
|
||||
Quest_Item=14
|
||||
Balloon_Golden_Spatula=15
|
||||
Jelly_Launcher=16
|
||||
Kelp_Token=17
|
||||
|
||||
|
||||
################################################
|
||||
|
@ -57,3 +57,5 @@ Gfx=..\..\graphics\pickups\+questitem.bmp
|
||||
[Jelly_Launcher]
|
||||
Gfx=..\..\graphics\pickups\+launcher.bmp
|
||||
|
||||
[Kelp_Token]
|
||||
Gfx=..\..\graphics\pickups\+token.bmp
|
||||
|
@ -1193,6 +1193,14 @@ SOURCE=..\..\..\source\pickups\pjlammo.h
|
||||
# End 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
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
Loading…
Reference in New Issue
Block a user