This commit is contained in:
Charles 2001-05-04 16:47:09 +00:00
parent 44bb303853
commit 2297e73b3c
6 changed files with 46 additions and 0 deletions

View file

@ -60,6 +60,7 @@ void CNpcFallingPlatformGenerator::think( int _frames )
{ {
case NPC_OILDRUM_PLATFORM: case NPC_OILDRUM_PLATFORM:
case NPC_CRATE_PLATFORM: case NPC_CRATE_PLATFORM:
case NPC_VERTICAL_OILDRUM_PLATFORM:
{ {
newPlatform = new ("falling platform") CNpcFallingNoRespawnPlatform; newPlatform = new ("falling platform") CNpcFallingNoRespawnPlatform;
break; break;

View file

@ -302,6 +302,34 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
NPC_PLATFORM_TIMER_NONE, NPC_PLATFORM_TIMER_NONE,
}, },
{ // NPC_VERTICAL_OILDRUM_GENERATOR
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
2,
128,
true,
DAMAGE__NONE,
0,
4,
NPC_PLATFORM_INFINITE_LIFE,
2,
NPC_PLATFORM_TIMER_NONE,
},
{ // NPC_VERTICAL_OILDRUM_PLATFORM
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
2,
128,
true,
DAMAGE__NONE,
0,
4,
NPC_PLATFORM_INFINITE_LIFE,
4,
NPC_PLATFORM_TIMER_NONE,
},
{ // NPC_PLAYER_BUBBLE_PLATFORM { // NPC_PLAYER_BUBBLE_PLATFORM
ACTORS_CLAM_SBK, ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP, ANIM_CLAM_SIDESNAP,
@ -339,5 +367,6 @@ CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATF
NPC_OILDRUM_GENERATOR, NPC_OILDRUM_GENERATOR,
NPC_CRATE_GENERATOR, NPC_CRATE_GENERATOR,
NPC_RAFT_PLATFORM, NPC_RAFT_PLATFORM,
NPC_VERTICAL_OILDRUM_GENERATOR,
NPC_PLAYER_BUBBLE_PLATFORM, NPC_PLAYER_BUBBLE_PLATFORM,
}; };

View file

@ -255,6 +255,15 @@ CNpcPlatform *CNpcPlatform::Create(sThingPlatform *ThisPlatform)
break; break;
} }
case NPC_VERTICAL_OILDRUM_GENERATOR:
{
CNpcFallingPlatformGenerator *generator;
generator = new ("vertical oildrum generator") CNpcFallingPlatformGenerator;
generator->setTargetType( NPC_VERTICAL_OILDRUM_PLATFORM );
platform = generator;
break;
}
default: default:
{ {
ASSERT( 0 ); ASSERT( 0 );

View file

@ -72,6 +72,8 @@ public:
NPC_OILDRUM_GENERATOR, NPC_OILDRUM_GENERATOR,
NPC_CRATE_GENERATOR, NPC_CRATE_GENERATOR,
NPC_RAFT_PLATFORM, NPC_RAFT_PLATFORM,
NPC_VERTICAL_OILDRUM_GENERATOR,
NPC_VERTICAL_OILDRUM_PLATFORM,
NPC_PLAYER_BUBBLE_PLATFORM, NPC_PLAYER_BUBBLE_PLATFORM,
NPC_PLATFORM_TYPE_MAX, NPC_PLATFORM_TYPE_MAX,
}; };

View file

@ -101,6 +101,7 @@ BouncyTyre=15
DualPlatform=16 DualPlatform=16
Wooden=6 Wooden=6
Raft=19 Raft=19
VertOilDrumGenerator=20
################################################ ################################################
# Triggers # Triggers

View file

@ -78,3 +78,7 @@ Gfx=..\..\Graphics\platforms\wooden\wooden.gin
[Raft] [Raft]
Gfx=..\..\Graphics\platforms\raft\raft.gin Gfx=..\..\Graphics\platforms\raft\raft.gin
[VertOildrumGenerator]
Gfx=..\..\Graphics\platforms\vert_Oildrum\vert_Oildrum.gin