From a36c7d3f9ea8c2e1c2426679203307fe8233e564 Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Fri, 4 May 2001 23:56:39 +0000
Subject: [PATCH]

---
 data/DataCache.scr                               |  1 +
 makefile.gaz                                     |  3 ++-
 makefile.gfx                                     |  2 +-
 source/enemy/npcdata.cpp                         |  2 +-
 source/hazard/hcsaw.cpp                          |  4 ++--
 source/platform/platdata.cpp                     | 16 ++++++++++++++--
 source/platform/platform.cpp                     |  9 +++++++++
 source/platform/platform.h                       |  1 +
 .../paul/spongebob project/spongebob project.dsp |  8 ++++++++
 9 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/data/DataCache.scr b/data/DataCache.scr
index 4bc414f2b..aeb5d60c7 100644
--- a/data/DataCache.scr
+++ b/data/DataCache.scr
@@ -186,6 +186,7 @@ actors/SKELETALFISH.SBK
 actors/SPIDERCRAB.SBK
 actors/SPIKEYANENOME.SBK
 actors/STOMPER.SBK
+actors/SHELL.SBK
 
 actors/SHARKSUB.SBK
 actors/MOTHERJELLYFISH.SBK
diff --git a/makefile.gaz b/makefile.gaz
index dc97bb967..a79fffd63 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -111,7 +111,8 @@ platform_src :=		platform \
 					pfallnor \
 					praft \
 					plantern \
-					pbgeyser
+					pbgeyser \
+					pleaf
 
 hazard_src :=		hazard \
 					hfalling \
diff --git a/makefile.gfx b/makefile.gfx
index 00cb150c3..7fd535ff3 100644
--- a/makefile.gfx
+++ b/makefile.gfx
@@ -113,7 +113,7 @@ ACTOR_NPC :=			BarnacleBoy Krusty Squidward Gary Sandy Patrick MermaidMan
 ACTOR_ENEMY :=			Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil Eyeball \
 						Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish Lrgjellyfish \
 						PuffaFish Sharkman Skeletalfish SpiderCrab SpikeyAnenome Stomper \
-						SharkSub Motherjellyfish SeaSnake
+						SharkSub Motherjellyfish SeaSnake Shell
 
 #						Boogermonster GiantWorm Jellyfish2 Motherjellyfish Nautilus Neptune SeaSnake SharkSub 
 
diff --git a/source/enemy/npcdata.cpp b/source/enemy/npcdata.cpp
index f820f7227..289accf8c 100644
--- a/source/enemy/npcdata.cpp
+++ b/source/enemy/npcdata.cpp
@@ -929,7 +929,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
 	},
 
 	{	// NPC_SHELL
-		ACTORS_SPIDERCRAB_SBK,
+		ACTORS_SHELL_SBK,
 		0,
 		NPC_SENSOR_NONE,
 		NPC_MOVEMENT_STATIC,
diff --git a/source/hazard/hcsaw.cpp b/source/hazard/hcsaw.cpp
index 007795bbe..5bbbda4e4 100644
--- a/source/hazard/hcsaw.cpp
+++ b/source/hazard/hcsaw.cpp
@@ -60,8 +60,8 @@ void CNpcCircularSawHazard::render()
 		{
 			SVECTOR rotation;
 			rotation.vx = 0;
-			rotation.vy = m_rotation;
-			rotation.vz = 0;
+			rotation.vy = 0;
+			rotation.vz = m_rotation;
 
 			VECTOR scale;
 			scale.vx = ONE;
diff --git a/source/platform/platdata.cpp b/source/platform/platdata.cpp
index c1e3bd594..fd367080b 100644
--- a/source/platform/platdata.cpp
+++ b/source/platform/platdata.cpp
@@ -119,7 +119,7 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_FALLING_PLATFORM
-		4,
+		3,
 		128,
 		true,
 		DAMAGE__NONE,
@@ -310,6 +310,18 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 		NPC_PLATFORM_TIMER_NONE,
 	},
 
+	{	// NPC_LEAF_PLATFORM
+		3,
+		128,
+		true,
+		DAMAGE__NONE,
+		0,
+		4,
+		NPC_PLATFORM_INFINITE_LIFE,
+		4,
+		NPC_PLATFORM_TIMER_NONE,
+	},
+
 	{	// NPC_PLAYER_BUBBLE_PLATFORM
 		3,
 		128,
@@ -327,7 +339,7 @@ CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATF
 {
 	NPC_BUBBLE_PLATFORM,
 	NPC_LINEAR_PLATFORM,
-	NPC_FALLING_PLATFORM,
+	NPC_LEAF_PLATFORM,
 	NPC_CIRCULAR_PLATFORM,
 	NPC_COLLAPSING_BUBBLE_PLATFORM,
 	NPC_FISH_HOOK_PLATFORM,
diff --git a/source/platform/platform.cpp b/source/platform/platform.cpp
index a91664fc4..3a6c9d561 100644
--- a/source/platform/platform.cpp
+++ b/source/platform/platform.cpp
@@ -123,6 +123,9 @@
 #include "platform\pbgeyser.h"
 #endif
 
+#ifndef __PLATFORM_PLEAF_H__
+#include "platform\pleaf.h"
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -287,6 +290,12 @@ CNpcPlatform	*CNpcPlatform::Create(sThingPlatform *ThisPlatform)
 			break;
 		}
 
+		case NPC_LEAF_PLATFORM:
+		{
+			platform = new ("leaf platform") CNpcLeafPlatform;
+			break;
+		}
+
 		default:
 		{
 			ASSERT( 0 );
diff --git a/source/platform/platform.h b/source/platform/platform.h
index c64d67176..7d295626f 100644
--- a/source/platform/platform.h
+++ b/source/platform/platform.h
@@ -76,6 +76,7 @@ public:
 		NPC_VERTICAL_OILDRUM_PLATFORM,
 		NPC_LANTERN_PLATFORM,
 		NPC_BUBBLE_GEYSER_GENERATOR,
+		NPC_LEAF_PLATFORM,
 		NPC_PLAYER_BUBBLE_PLATFORM,
 		NPC_PLATFORM_TYPE_MAX,
 	};
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 51dddeb29..2c34343b4 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -1253,6 +1253,14 @@ SOURCE=..\..\..\source\platform\platform.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\platform\pleaf.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\platform\pleaf.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\platform\plinear.cpp
 # End Source File
 # Begin Source File