This commit is contained in:
Charles 2001-05-05 16:47:51 +00:00
parent a7b015ed1b
commit a1e47a513e
7 changed files with 38 additions and 1 deletions

View file

@ -113,7 +113,8 @@ platform_src := platform \
plantern \ plantern \
pbgeyser \ pbgeyser \
pleaf \ pleaf \
pbwheel pbwheel \
psbarrel
hazard_src := hazard \ hazard_src := hazard \
hfalling \ hfalling \

View file

@ -334,6 +334,18 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
NPC_PLATFORM_TIMER_NONE, NPC_PLATFORM_TIMER_NONE,
}, },
{ // NPC_STEERABLE_BARREL_PLATFORM
2,
128,
true,
DAMAGE__NONE,
0,
4,
NPC_PLATFORM_INFINITE_LIFE,
0,
NPC_PLATFORM_TIMER_NONE,
},
{ // NPC_PLAYER_BUBBLE_PLATFORM { // NPC_PLAYER_BUBBLE_PLATFORM
3, 3,
128, 128,
@ -373,5 +385,6 @@ CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATF
NPC_LANTERN_PLATFORM, NPC_LANTERN_PLATFORM,
NPC_BUBBLE_GEYSER_GENERATOR, NPC_BUBBLE_GEYSER_GENERATOR,
NPC_BIG_WHEEL_PLATFORM, NPC_BIG_WHEEL_PLATFORM,
NPC_STEERABLE_BARREL_PLATFORM,
NPC_PLAYER_BUBBLE_PLATFORM, NPC_PLAYER_BUBBLE_PLATFORM,
}; };

View file

@ -131,6 +131,10 @@
#include "platform\pbwheel.h" #include "platform\pbwheel.h"
#endif #endif
#ifndef __PLATFORM_PSBARREL_H__
#include "platform\psbarrel.h"
#endif
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -306,6 +310,12 @@ CNpcPlatform *CNpcPlatform::Create(sThingPlatform *ThisPlatform)
break; break;
} }
case NPC_STEERABLE_BARREL_PLATFORM:
{
platform = new ("steerable barrel platform") CNpcSteerableBarrelPlatform;
break;
}
default: default:
{ {
ASSERT( 0 ); ASSERT( 0 );

View file

@ -78,6 +78,7 @@ public:
NPC_BUBBLE_GEYSER_GENERATOR, NPC_BUBBLE_GEYSER_GENERATOR,
NPC_LEAF_PLATFORM, NPC_LEAF_PLATFORM,
NPC_BIG_WHEEL_PLATFORM, NPC_BIG_WHEEL_PLATFORM,
NPC_STEERABLE_BARREL_PLATFORM,
NPC_PLAYER_BUBBLE_PLATFORM, NPC_PLAYER_BUBBLE_PLATFORM,
NPC_PLATFORM_TYPE_MAX, NPC_PLATFORM_TYPE_MAX,
}; };

View file

@ -106,6 +106,7 @@ SwingingLantern=21
BubbleGeyserGenerator=22 BubbleGeyserGenerator=22
BigWheelPlatform=23 BigWheelPlatform=23
FixedPathBarrelPlatform=1 FixedPathBarrelPlatform=1
SteerableBarrelPlatform=24
################################################ ################################################
# Triggers # Triggers

View file

@ -93,3 +93,6 @@ Gfx=..\..\Graphics\platforms\carriage\carriage.gin
[FixedPathBarrelPlatform] [FixedPathBarrelPlatform]
Gfx=..\..\Graphics\platforms\barrel\barrel.gin Gfx=..\..\Graphics\platforms\barrel\barrel.gin
[SteerableBarrelPlatform]
Gfx=..\..\Graphics\platforms\barrel\barrel.gin

View file

@ -1313,6 +1313,14 @@ SOURCE=..\..\..\source\platform\pretract.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\..\source\platform\psbarrel.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\platform\psbarrel.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\platform\pseesaw.cpp SOURCE=..\..\..\source\platform\pseesaw.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File