From 4c1f906c804895facebd41d02b588660277510af Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Tue, 29 May 2001 15:29:56 +0000
Subject: [PATCH]

---
 makefile.gaz                                  |  3 ++-
 source/platform/pfallnor.cpp                  |  2 +-
 source/platform/pfgen.cpp                     |  2 +-
 source/platform/platdata.cpp                  | 26 +++++++++++++++++++
 source/platform/platform.cpp                  | 22 +++++++++++++++-
 source/platform/platform.h                    |  2 ++
 tools/Data/bin/MkLevel.ini                    |  1 +
 tools/MapEdit/platform.ini                    |  3 +++
 .../spongebob project/spongebob project.dsp   |  8 ++++++
 9 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/makefile.gaz b/makefile.gaz
index f982837aa..daaf7617e 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -126,7 +126,8 @@ platform_src :=		platform \
 					pfishhk3 \
 					prbridge \
 					pbaloon \
-					ptrpdoor
+					ptrpdoor \
+					pconveyr
 
 hazard_src :=		hazard \
 					hfalling \
diff --git a/source/platform/pfallnor.cpp b/source/platform/pfallnor.cpp
index c6242c72a..883fd0fe0 100644
--- a/source/platform/pfallnor.cpp
+++ b/source/platform/pfallnor.cpp
@@ -60,7 +60,7 @@ void CNpcFallingNoRespawnPlatform::processMovement( int _frames )
 
 		if ( groundHeight < moveY )
 		{
-			if ( ( CGameScene::getCollision()->getCollisionBlock( Pos.vx, Pos.vy + groundHeight + 8 ) & COLLISION_TYPE_MASK ) != (7<<COLLISION_TYPE_FLAG_SHIFT) )
+			if ( ( CGameScene::getCollision()->getCollisionBlock( Pos.vx, Pos.vy + groundHeight + 8 ) & COLLISION_TYPE_MASK ) != COLLISION_TYPE_FLAG_DEATH )
 			{
 				moveY = groundHeight;
 				moveX = 2 * _frames;
diff --git a/source/platform/pfgen.cpp b/source/platform/pfgen.cpp
index 0b0d6215a..56964374c 100644
--- a/source/platform/pfgen.cpp
+++ b/source/platform/pfgen.cpp
@@ -1,6 +1,6 @@
 /*=========================================================================
 
-	pfgen.h
+	pfgen.cpp
 
 	Author:		CRB
 	Created: 
diff --git a/source/platform/platdata.cpp b/source/platform/platdata.cpp
index a87448b2e..77194da02 100644
--- a/source/platform/platdata.cpp
+++ b/source/platform/platdata.cpp
@@ -407,6 +407,30 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 		NPC_PLATFORM_TIMER_NONE,
 	},
 
+	{	// NPC_CONVEYOR_GENERATOR
+		3,
+		128,
+		true,
+		DAMAGE__NONE,
+		0,
+		4,
+		NPC_PLATFORM_INFINITE_LIFE,
+		10,
+		NPC_PLATFORM_TIMER_NONE,
+	},
+
+	{	// NPC_CONVEYOR_PLATFORM
+		3,
+		128,
+		true,
+		DAMAGE__NONE,
+		0,
+		4,
+		NPC_PLATFORM_INFINITE_LIFE,
+		0,
+		NPC_PLATFORM_TIMER_NONE,
+	},
+
 	{	// NPC_PLAYER_BUBBLE_PLATFORM
 		3,
 		128,
@@ -464,6 +488,8 @@ CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATF
 	NPC_RISING_BRIDGE_PLATFORM,
 	NPC_BALLOON_BRIDGE_PLATFORM,
 	NPC_TRAPDOOR_PLATFORM,
+	NPC_CONVEYOR_GENERATOR,
+	NPC_CONVEYOR_PLATFORM,
 	NPC_PLAYER_BUBBLE_PLATFORM,
 	NPC_CLAM_PLATFORM,
 };
diff --git a/source/platform/platform.cpp b/source/platform/platform.cpp
index 5a8564488..364e386f4 100644
--- a/source/platform/platform.cpp
+++ b/source/platform/platform.cpp
@@ -163,6 +163,14 @@
 #include "platform\ptrpdoor.h"
 #endif
 
+#ifndef __PLATFORM_PCONVEYR_H__
+#include "platform\pconveyr.h"
+#endif
+
+#ifndef __PLATFORM_PFALLNOR_H__
+#include "platform\pfallnor.h"
+#endif
+
 #include "fx\fx.h"
 #include "fx\fxjfish.h"
 
@@ -229,7 +237,7 @@ CNpcPlatform	*CNpcPlatform::Create(int Type)
 		case NPC_CRATE_PLATFORM:
 		case NPC_FALLING_PLATFORM:
 		{
-			platform = new ("falling platform") CNpcFallingPlatform;
+			platform = new ("falling platform") CNpcFallingNoRespawnPlatform;
 			break;
 		}
 
@@ -365,6 +373,18 @@ CNpcPlatform	*CNpcPlatform::Create(int Type)
 			break;
 		}
 
+		case NPC_CONVEYOR_GENERATOR:
+		{
+			platform = new ("conveyor generator") CNpcConveyorPlatformGenerator;
+			break;
+		}
+
+		case NPC_CONVEYOR_PLATFORM:
+		{
+			platform = new ("conveyor platform") CNpcConveyorPlatform;
+			break;
+		}
+
 		default:
 		{
 			ASSERT( 0 );
diff --git a/source/platform/platform.h b/source/platform/platform.h
index e0380e512..e3169c943 100644
--- a/source/platform/platform.h
+++ b/source/platform/platform.h
@@ -84,6 +84,8 @@ public:
 		NPC_RISING_BRIDGE_PLATFORM,
 		NPC_BALLOON_BRIDGE_PLATFORM,
 		NPC_TRAPDOOR_PLATFORM,
+		NPC_CONVEYOR_GENERATOR,
+		NPC_CONVEYOR_PLATFORM,
 		NPC_PLAYER_BUBBLE_PLATFORM,
 		NPC_CLAM_PLATFORM,
 		NPC_PLATFORM_TYPE_MAX,
diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index 3f4e1c234..11a1ea8d5 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -115,6 +115,7 @@ BalloonBridge=28
 TrapdoorLeft=29
 TrapdoorRight=29
 SinkingCrate=8
+ConveyorCrateGenerator=30
 
 ################################################
 # Triggers
diff --git a/tools/MapEdit/platform.ini b/tools/MapEdit/platform.ini
index 6094643f5..d1f9ebfa0 100644
--- a/tools/MapEdit/platform.ini
+++ b/tools/MapEdit/platform.ini
@@ -120,3 +120,6 @@ Gfx=..\..\Graphics\platforms\trapdoor_wooden\trapdoor_woodenr.gin
 
 [SinkingCrate]
 Gfx=..\..\Graphics\platforms\Crate\Crate.gin
+
+[ConveyorCrateGenerator]
+Gfx=..\..\Graphics\platforms\wooden_Crate\wooden_Crate.gin
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 094a8178e..6c1640c58 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -1321,6 +1321,14 @@ SOURCE=..\..\..\source\platform\pclam.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\platform\pconveyr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\platform\pconveyr.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\platform\pdual.cpp
 # End Source File
 # Begin Source File