From 26994bdf43dc298c05fe4fc9da02fe971d640ed7 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Mon, 2 Apr 2001 17:02:29 +0000
Subject: [PATCH]

---
 source/level/level.cpp     | 14 +++++++++++++-
 tools/Data/bin/MkLevel.ini | 28 ++++++++++++++++------------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/source/level/level.cpp b/source/level/level.cpp
index 7e4146f40..5e5c816c2 100644
--- a/source/level/level.cpp
+++ b/source/level/level.cpp
@@ -22,6 +22,10 @@
 #include "triggers\tlevexit.h"
 #endif
 
+#ifndef __PICKUPS_PICKUP_H__
+#include "pickups\pickup.h"
+#endif
+
 #ifndef	__SOUND_SOUND_H__
 #include "sound\sound.h"
 #endif
@@ -541,8 +545,16 @@ void	CLevel::initLayers()
 			sThingHdr	*Hdr=(sThingHdr*)MakePtr(LevelHdr,LevelHdr->ItemList);
 			ItemCount=Hdr->Count;
 			ItemList=(sThingItem*)MakePtr(Hdr,sizeof(sThingHdr));
-		}
 
+			DVECTOR	pos;
+			for(int i=0;i<ItemCount;i++)
+			{
+				pos.vx=ItemList->Pos.X<<4;
+				pos.vy=ItemList->Pos.Y<<4;
+				createPickup((PICKUP_TYPE)ItemList->Type,&pos);
+				ItemList++;
+			}
+		}
 }
 
 /*****************************************************************************/
diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index 5a72205c6..434ef5ea9 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -46,18 +46,22 @@ Stomper=36
 DustDevil=37
 
 # Items
-Balloon=0
-BubbleMixture=1
-Glasses=2
-Health25=3
-Health50=4
-Health100=5
-Helmet=6
-JellyAmmo=7
-Pants=8
-Shoe=9
-Spatula=10
-Teeth=11
+Big_Health=0
+Medium_Health=1
+Small_Health=2
+Extra_Life=3
+Golden_Spatula=4
+Jelly_Launcher_Ammo=5
+Bubble_Mixture=6
+Bubble_Wand=7
+Net=8
+Safety_Glasses=9
+Squeaky_Shoes=10
+Balloon=11
+Helmet=12
+Coral_Blower=13
+Quest_Item=14
+
 
 # Platforms
 Boots=0