This commit is contained in:
Charles 2001-07-05 20:08:39 +00:00
parent 5dca926fb0
commit fe4e14c13b
7 changed files with 38 additions and 1 deletions

View File

@ -137,7 +137,8 @@ platform_src := platform \
plurve \
psoil \
pbubtube \
pgbubble
pgbubble \
pfblock
hazard_src := hazard \
hfalling \

View File

@ -538,6 +538,18 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
0,
NPC_PLATFORM_TIMER_NONE,
},
{ // NPC_FALLING_BLOCK_PLATFORM
5,
128,
true,
DAMAGE__NONE,
0,
2,
NPC_PLATFORM_INFINITE_LIFE,
0,
NPC_PLATFORM_TIMER_NONE,
},
};
CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATFORM_TYPE_MAX] =
@ -580,6 +592,7 @@ CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATF
NPC_LOVE_BOAT_PLATFORM,
NPC_STEERABLE_OILDRUM_PLATFORM,
NPC_BUBBLE_TUBE_PLATFORM,
NPC_FALLING_BLOCK_PLATFORM,
NPC_CONVEYOR_PLATFORM,
NPC_PLAYER_BUBBLE_PLATFORM,
NPC_CLAM_PLATFORM,

View File

@ -207,6 +207,10 @@
#include "platform\pgbubble.h"
#endif
#ifndef __PLATFORM_PFBLOCK_H__
#include "platform\pfblock.h"
#endif
#include "fx\fx.h"
#include "fx\fxjfish.h"
@ -463,6 +467,12 @@ CNpcPlatform *CNpcPlatform::Create(int Type)
break;
}
case NPC_FALLING_BLOCK_PLATFORM:
{
platform = new ("falling block platform") CNpcFallingBlockPlatform;
break;
}
case NPC_CLAM_PLATFORM:
{
platform = new ("clam platform") CNpcClamPlatform;

View File

@ -95,6 +95,7 @@ public:
NPC_LOVE_BOAT_PLATFORM,
NPC_STEERABLE_OILDRUM_PLATFORM,
NPC_BUBBLE_TUBE_PLATFORM,
NPC_FALLING_BLOCK_PLATFORM,
NPC_PLATFORM_TYPE_MAX,
};
enum

View File

@ -126,6 +126,7 @@ RockBridge=32
SteamSwitch=33
LiftPlatform=34
BubbleTubePlatform=37
FallingBlockPlatform=38
################################################
# Triggers

View File

@ -147,3 +147,6 @@ Gfx=..\..\Graphics\platforms\Industrial\Industrial.gin
[BubbleTubePlatform]
Gfx=..\..\Graphics\platforms\Oilrig2\oilrigplatform2.gin
[FallingBlockPlatform]
Gfx=..\..\Graphics\platforms\fallingrock\fallingrock.gin

View File

@ -1561,6 +1561,14 @@ SOURCE=..\..\..\source\platform\pfallnor.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\platform\pfblock.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\platform\pfblock.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\platform\pfgen.cpp
# End Source File
# Begin Source File