From a58f9da5ef4a8239969292617e5a51f38fed5328 Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Fri, 4 May 2001 16:52:33 +0000
Subject: [PATCH]

---
 source/platform/platdata.cpp | 46 ------------------------------------
 source/platform/platform.cpp | 23 ------------------
 source/platform/platform.h   |  6 -----
 3 files changed, 75 deletions(-)

diff --git a/source/platform/platdata.cpp b/source/platform/platdata.cpp
index c57619674..fc842ce52 100644
--- a/source/platform/platdata.cpp
+++ b/source/platform/platdata.cpp
@@ -22,8 +22,6 @@
 CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 {
 	{	// NPC_LINEAR_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		1,
 		//512,
 		2048,
@@ -37,8 +35,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_CIRCULAR_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
@@ -51,8 +47,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_BUBBLE_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
@@ -65,8 +59,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_COLLAPSING_BUBBLE_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
@@ -79,8 +71,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_FISH_HOOK_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
@@ -93,8 +83,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_RETRACTING_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
@@ -107,8 +95,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_GEYSER_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		8,
 		128,
 		true,
@@ -121,8 +107,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_BOBBING_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		0,
 		128,
 		true,
@@ -135,8 +119,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_FALLING_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		4,
 		128,
 		true,
@@ -149,8 +131,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_CART_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		4,
 		128,
 		true,
@@ -163,8 +143,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_FISH_HOOK_2_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
@@ -177,8 +155,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_BRANCH_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
@@ -191,8 +167,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_SEESAW_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
@@ -205,8 +179,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_OILDRUM_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		2,
 		128,
 		true,
@@ -219,8 +191,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_CRATE_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
@@ -233,8 +203,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_BOUNCE_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
@@ -247,8 +215,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_DUAL_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
@@ -261,8 +227,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_OILDRUM_GENERATOR
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		2,
 		128,
 		true,
@@ -275,8 +239,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_CRATE_GENERATOR
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
@@ -289,8 +251,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_RAFT_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
@@ -303,8 +263,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_VERTICAL_OILDRUM_GENERATOR
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		2,
 		128,
 		true,
@@ -317,8 +275,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_VERTICAL_OILDRUM_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		2,
 		128,
 		true,
@@ -331,8 +287,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
 	},
 
 	{	// NPC_PLAYER_BUBBLE_PLATFORM
-		ACTORS_CLAM_SBK,
-		ANIM_CLAM_SIDESNAP,
 		3,
 		128,
 		true,
diff --git a/source/platform/platform.cpp b/source/platform/platform.cpp
index eeb86c407..3f2c838ae 100644
--- a/source/platform/platform.cpp
+++ b/source/platform/platform.cpp
@@ -345,10 +345,6 @@ void CNpcPlatform::init()
 	CPlatformThing::init();
 
 
-	m_animPlaying = true;
-	m_animNo = m_data[m_type].initAnim;
-	m_frame = 0;
-
 	m_heading = 0;
 	m_velocity = 0;
 	m_rotation = 0;
@@ -398,10 +394,6 @@ void CNpcPlatform::init( DVECTOR initPos, s32 initLifetime )
 
 void CNpcPlatform::reinit()
 {
-	m_animPlaying = true;
-	m_animNo = m_data[m_type].initAnim;
-	m_frame = 0;
-
 	m_heading = 0;
 	m_velocity = 0;
 	m_rotation = 0;
@@ -512,21 +504,6 @@ void CNpcPlatform::think(int _frames)
 
 		processLifetime( _frames );
 
-		if ( m_animPlaying )
-		{
-/*			int frameCount = m_actorGfx->getFrameCount(m_animNo);
-
-			if ( frameCount - m_frame > _frames )
-			{
-				m_frame += _frames;
-			}
-			else
-			{
-				m_frame = frameCount - 1;
-				m_animPlaying = false;
-			}
-*/		}
-
 		if ( m_heading > 1024 && m_heading < 3072 )
 		{
 			m_reversed = true;
diff --git a/source/platform/platform.h b/source/platform/platform.h
index 28493f3cc..f1f99b087 100644
--- a/source/platform/platform.h
+++ b/source/platform/platform.h
@@ -134,9 +134,6 @@ protected:
 
 	typedef struct NPC_PLATFORM_DATA_TYPE
 	{
-		FileEquate						ActorType;
-//		FileEquate						animData;
-		u16								initAnim;
 		u8								speed;
 		u16								turnSpeed;
 		bool							detectCollision;
@@ -184,7 +181,6 @@ protected:
 	DVECTOR						m_base;
 	DVECTOR						m_initPos;
 	u8							m_state;
-	bool						m_animPlaying;
 	bool						m_reversed;
 	s32							m_extension;
 	s32							m_lifetime;
@@ -200,8 +196,6 @@ protected:
 	s32							m_tiltVelocity;
 	bool						m_extendDir;
 
-	int							m_frame;
-	int							m_animNo;
 	CModelGfx					*m_modelGfx;
 	u8							m_isShuttingDown;