This commit is contained in:
parent
849de2f195
commit
999c6e9884
7 changed files with 40 additions and 2 deletions
|
@ -128,7 +128,8 @@ platform_src := platform \
|
|||
pbaloon \
|
||||
ptrpdoor \
|
||||
pconveyr \
|
||||
pplayer
|
||||
pplayer \
|
||||
pcbubble
|
||||
|
||||
hazard_src := hazard \
|
||||
hfalling \
|
||||
|
|
|
@ -20,6 +20,19 @@
|
|||
|
||||
class CNpcCollapsingBubblePlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void render();
|
||||
virtual void postInit();
|
||||
protected:
|
||||
virtual void processLifetime( int _frames );
|
||||
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
u8 m_pop;
|
||||
};
|
||||
|
||||
class CNpcCollapsingAcridPlatform : public CNpcCollapsingBubblePlatform
|
||||
{
|
||||
public:
|
||||
virtual void render();
|
||||
};
|
||||
|
||||
#endif
|
|
@ -454,6 +454,18 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
|
|||
0,
|
||||
NPC_PLATFORM_TIMER_NONE,
|
||||
},
|
||||
|
||||
{ // NPC_COLLAPSING_ACRID_PLATFORM
|
||||
3,
|
||||
128,
|
||||
true,
|
||||
DAMAGE__NONE,
|
||||
0,
|
||||
2,
|
||||
NPC_PLATFORM_INFINITE_LIFE_COLLAPSIBLE,
|
||||
0,
|
||||
NPC_PLATFORM_TIMER_NONE,
|
||||
},
|
||||
};
|
||||
|
||||
CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATFORM_TYPE_MAX] =
|
||||
|
@ -489,6 +501,7 @@ CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATF
|
|||
NPC_BALLOON_BRIDGE_PLATFORM,
|
||||
NPC_TRAPDOOR_PLATFORM,
|
||||
NPC_CONVEYOR_GENERATOR,
|
||||
NPC_COLLAPSING_ACRID_PLATFORM,
|
||||
NPC_CONVEYOR_PLATFORM,
|
||||
NPC_PLAYER_BUBBLE_PLATFORM,
|
||||
NPC_CLAM_PLATFORM,
|
||||
|
|
|
@ -209,6 +209,12 @@ CNpcPlatform *CNpcPlatform::Create(int Type)
|
|||
break;
|
||||
}
|
||||
|
||||
case NPC_COLLAPSING_ACRID_PLATFORM:
|
||||
{
|
||||
platform = new ("collapsing bubble platform") CNpcCollapsingAcridPlatform;
|
||||
break;
|
||||
}
|
||||
|
||||
case NPC_FISH_HOOK_PLATFORM:
|
||||
{
|
||||
platform = new ("fish hook platform") CNpcFishHookPlatform;
|
||||
|
|
|
@ -88,6 +88,7 @@ public:
|
|||
NPC_CONVEYOR_PLATFORM,
|
||||
NPC_PLAYER_BUBBLE_PLATFORM,
|
||||
NPC_CLAM_PLATFORM,
|
||||
NPC_COLLAPSING_ACRID_PLATFORM,
|
||||
NPC_PLATFORM_TYPE_MAX,
|
||||
};
|
||||
enum
|
||||
|
|
|
@ -118,7 +118,7 @@ TrapdoorRight=29
|
|||
SinkingCrate=8
|
||||
ConveyorCrateGenerator=30
|
||||
DualGreenPlatform=16
|
||||
AcridBubble=4
|
||||
AcridBubble=31
|
||||
LeafRaft=19
|
||||
OilRigPlatform=1
|
||||
|
||||
|
|
|
@ -1317,6 +1317,10 @@ SOURCE=..\..\..\source\platform\pcart.h
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\platform\pcbubble.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\platform\pcbubble.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue