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,

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;

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,

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 );

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,
 	};