zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-05-04 16:52:33 +00:00
parent f75c33db04
commit a58f9da5ef
3 changed files with 0 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

46
source/platform/platdata.cpp
View file

@ -22,8 +22,6 @@
CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] = CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
{ {
{ // NPC_LINEAR_PLATFORM { // NPC_LINEAR_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
1, 1,
//512, //512,
2048, 2048,
@ -37,8 +35,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_CIRCULAR_PLATFORM { // NPC_CIRCULAR_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,
@ -51,8 +47,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_BUBBLE_PLATFORM { // NPC_BUBBLE_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,
@ -65,8 +59,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_COLLAPSING_BUBBLE_PLATFORM { // NPC_COLLAPSING_BUBBLE_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,
@ -79,8 +71,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_FISH_HOOK_PLATFORM { // NPC_FISH_HOOK_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,
@ -93,8 +83,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_RETRACTING_PLATFORM { // NPC_RETRACTING_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,
@ -107,8 +95,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_GEYSER_PLATFORM { // NPC_GEYSER_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
8, 8,
128, 128,
true, true,
@ -121,8 +107,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_BOBBING_PLATFORM { // NPC_BOBBING_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
0, 0,
128, 128,
true, true,
@ -135,8 +119,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_FALLING_PLATFORM { // NPC_FALLING_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
4, 4,
128, 128,
true, true,
@ -149,8 +131,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_CART_PLATFORM { // NPC_CART_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
4, 4,
128, 128,
true, true,
@ -163,8 +143,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_FISH_HOOK_2_PLATFORM { // NPC_FISH_HOOK_2_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,
@ -177,8 +155,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_BRANCH_PLATFORM { // NPC_BRANCH_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,
@ -191,8 +167,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_SEESAW_PLATFORM { // NPC_SEESAW_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,
@ -205,8 +179,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_OILDRUM_PLATFORM { // NPC_OILDRUM_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
2, 2,
128, 128,
true, true,
@ -219,8 +191,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_CRATE_PLATFORM { // NPC_CRATE_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,
@ -233,8 +203,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_BOUNCE_PLATFORM { // NPC_BOUNCE_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,
@ -247,8 +215,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_DUAL_PLATFORM { // NPC_DUAL_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,
@ -261,8 +227,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_OILDRUM_GENERATOR { // NPC_OILDRUM_GENERATOR
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
2, 2,
128, 128,
true, true,
@ -275,8 +239,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_CRATE_GENERATOR { // NPC_CRATE_GENERATOR
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,
@ -289,8 +251,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_RAFT_PLATFORM { // NPC_RAFT_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,
@ -303,8 +263,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_VERTICAL_OILDRUM_GENERATOR { // NPC_VERTICAL_OILDRUM_GENERATOR
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
2, 2,
128, 128,
true, true,
@ -317,8 +275,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_VERTICAL_OILDRUM_PLATFORM { // NPC_VERTICAL_OILDRUM_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
2, 2,
128, 128,
true, true,
@ -331,8 +287,6 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
}, },
{ // NPC_PLAYER_BUBBLE_PLATFORM { // NPC_PLAYER_BUBBLE_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
3, 3,
128, 128,
true, true,

23
source/platform/platform.cpp
View file

@ -345,10 +345,6 @@ void CNpcPlatform::init()
CPlatformThing::init(); CPlatformThing::init();
m_animPlaying = true;
m_animNo = m_data[m_type].initAnim;
m_frame = 0;
m_heading = 0; m_heading = 0;
m_velocity = 0; m_velocity = 0;
m_rotation = 0; m_rotation = 0;
@ -398,10 +394,6 @@ void CNpcPlatform::init( DVECTOR initPos, s32 initLifetime )
void CNpcPlatform::reinit() void CNpcPlatform::reinit()
{ {
m_animPlaying = true;
m_animNo = m_data[m_type].initAnim;
m_frame = 0;
m_heading = 0; m_heading = 0;
m_velocity = 0; m_velocity = 0;
m_rotation = 0; m_rotation = 0;
@ -512,21 +504,6 @@ void CNpcPlatform::think(int _frames)
processLifetime( _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 ) if ( m_heading > 1024 && m_heading < 3072 )
{ {
m_reversed = true; m_reversed = true;

6
source/platform/platform.h
View file

@ -134,9 +134,6 @@ protected:
typedef struct NPC_PLATFORM_DATA_TYPE typedef struct NPC_PLATFORM_DATA_TYPE
{ {
FileEquate ActorType;
// FileEquate animData;
u16 initAnim;
u8 speed; u8 speed;
u16 turnSpeed; u16 turnSpeed;
bool detectCollision; bool detectCollision;
@ -184,7 +181,6 @@ protected:
DVECTOR m_base; DVECTOR m_base;
DVECTOR m_initPos; DVECTOR m_initPos;
u8 m_state; u8 m_state;
bool m_animPlaying;
bool m_reversed; bool m_reversed;
s32 m_extension; s32 m_extension;
s32 m_lifetime; s32 m_lifetime;
@ -200,8 +196,6 @@ protected:
s32 m_tiltVelocity; s32 m_tiltVelocity;
bool m_extendDir; bool m_extendDir;
int m_frame;
int m_animNo;
CModelGfx *m_modelGfx; CModelGfx *m_modelGfx;
u8 m_isShuttingDown; u8 m_isShuttingDown;