From ba904bf51204067a0b7afd52be038144fd710fd2 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Tue, 29 May 2001 20:42:16 +0000
Subject: [PATCH]

---
 makefile.gaz                                       |  1 +
 source/pickups/pickup.cpp                          |  8 ++++++++
 source/pickups/pickup.h                            |  1 +
 source/pickups/pkelp.cpp                           | 10 ++++------
 source/pickups/pkelp.h                             |  2 +-
 tools/Data/bin/MkLevel.ini                         |  1 +
 tools/MapEdit/Item.ini                             |  2 ++
 users/paul/spongebob project/spongebob project.dsp |  8 ++++++++
 8 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/makefile.gaz b/makefile.gaz
index 254980039..00fe9f956 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -238,6 +238,7 @@ pickups_src :=		pickup \
 					phealth \
 					phelmet \
 					pjlammo \
+					pkelp \
 					plife \
 					pnet \
 					pquest \
diff --git a/source/pickups/pickup.cpp b/source/pickups/pickup.cpp
index 1e85e56bd..bcf5d98a5 100644
--- a/source/pickups/pickup.cpp
+++ b/source/pickups/pickup.cpp
@@ -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;
diff --git a/source/pickups/pickup.h b/source/pickups/pickup.h
index be2f48ec3..8e204de29 100644
--- a/source/pickups/pickup.h
+++ b/source/pickups/pickup.h
@@ -49,6 +49,7 @@ typedef enum
 	PICKUP__QUEST_ITEM,
 	PICKUP__BALLOON_AND_SPATULA,
 	PICKUP__JELLY_LAUNCHER,
+	PICKUP__KELP_TOKEN,
 	PICKUP__MAX
 }
 PICKUP_TYPE;
diff --git a/source/pickups/pkelp.cpp b/source/pickups/pkelp.cpp
index a410c3282..4077ab075 100644
--- a/source/pickups/pkelp.cpp
+++ b/source/pickups/pkelp.cpp
@@ -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;
diff --git a/source/pickups/pkelp.h b/source/pickups/pkelp.h
index 191e6fda4..b2d5d56e8 100644
--- a/source/pickups/pkelp.h
+++ b/source/pickups/pkelp.h
@@ -34,7 +34,7 @@
 	Structure defintions
 	-------------------- */
 
-class CKelpPickup : public CBasePickup
+class CKelpTokenPickup : public CBasePickup
 {
 public:
 	virtual void		init();
diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index 11a1ea8d5..809f7cdc5 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -73,6 +73,7 @@ Coral_Blower=13
 Quest_Item=14
 Balloon_Golden_Spatula=15
 Jelly_Launcher=16
+Kelp_Token=17
 
 
 ################################################
diff --git a/tools/MapEdit/Item.ini b/tools/MapEdit/Item.ini
index b32acdaca..848da15ff 100644
--- a/tools/MapEdit/Item.ini
+++ b/tools/MapEdit/Item.ini
@@ -57,3 +57,5 @@ Gfx=..\..\graphics\pickups\+questitem.bmp
 [Jelly_Launcher]
 Gfx=..\..\graphics\pickups\+launcher.bmp
 
+[Kelp_Token]
+Gfx=..\..\graphics\pickups\+token.bmp
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 281e2c4d8..2de20ef2c 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -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