This commit is contained in:
parent
b32a609fdf
commit
35fe355186
5 changed files with 48 additions and 1 deletions
|
@ -100,7 +100,8 @@ platform_src := platform \
|
||||||
pbranch \
|
pbranch \
|
||||||
ppendulm \
|
ppendulm \
|
||||||
pseesaw \
|
pseesaw \
|
||||||
pbounce
|
pbounce \
|
||||||
|
pdual
|
||||||
|
|
||||||
hazard_src := hazard \
|
hazard_src := hazard \
|
||||||
hfalling \
|
hfalling \
|
||||||
|
|
|
@ -246,6 +246,20 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
|
||||||
NPC_PLATFORM_TIMER_NONE,
|
NPC_PLATFORM_TIMER_NONE,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{ // NPC_DUAL_PLATFORM
|
||||||
|
ACTORS_CLAM_SBK,
|
||||||
|
ANIM_CLAM_SIDESNAP,
|
||||||
|
3,
|
||||||
|
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,
|
||||||
|
@ -279,5 +293,6 @@ CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATF
|
||||||
NPC_OILDRUM_PLATFORM,
|
NPC_OILDRUM_PLATFORM,
|
||||||
NPC_CRATE_PLATFORM,
|
NPC_CRATE_PLATFORM,
|
||||||
NPC_BOUNCE_PLATFORM,
|
NPC_BOUNCE_PLATFORM,
|
||||||
|
NPC_DUAL_PLATFORM,
|
||||||
NPC_PLAYER_BUBBLE_PLATFORM,
|
NPC_PLAYER_BUBBLE_PLATFORM,
|
||||||
};
|
};
|
||||||
|
|
|
@ -99,6 +99,10 @@
|
||||||
#include "platform\pbounce.h"
|
#include "platform\pbounce.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __PLATFORM_PDUAL_H__
|
||||||
|
#include "platform\pdual.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef __PLATFORM_PPLAYER_H__
|
#ifndef __PLATFORM_PPLAYER_H__
|
||||||
#include "platform\pplayer.h"
|
#include "platform\pplayer.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -205,6 +209,24 @@ CNpcPlatform *CNpcPlatform::Create(sThingPlatform *ThisPlatform)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case NPC_DUAL_PLATFORM:
|
||||||
|
{
|
||||||
|
CNpcDualPlatform *dualPlatformMaster;
|
||||||
|
platform = dualPlatformMaster = new ("dual platform master") CNpcDualPlatform;
|
||||||
|
dualPlatformMaster->setMaster( true );
|
||||||
|
CNpcDualPlatform *dualPlatformSlave;
|
||||||
|
dualPlatformSlave = new ("dual platform slave") CNpcDualPlatform;
|
||||||
|
dualPlatformSlave->setMaster( false );
|
||||||
|
dualPlatformMaster->setOtherPlatform( dualPlatformSlave );
|
||||||
|
dualPlatformSlave->setOtherPlatform( dualPlatformMaster );
|
||||||
|
|
||||||
|
dualPlatformSlave->setType( platformType );
|
||||||
|
dualPlatformSlave->setGraphic( ThisPlatform );
|
||||||
|
dualPlatformSlave->setTiltable( false );
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
ASSERT( 0 );
|
ASSERT( 0 );
|
||||||
|
|
|
@ -68,6 +68,7 @@ public:
|
||||||
NPC_OILDRUM_PLATFORM,
|
NPC_OILDRUM_PLATFORM,
|
||||||
NPC_CRATE_PLATFORM,
|
NPC_CRATE_PLATFORM,
|
||||||
NPC_BOUNCE_PLATFORM,
|
NPC_BOUNCE_PLATFORM,
|
||||||
|
NPC_DUAL_PLATFORM,
|
||||||
NPC_PLAYER_BUBBLE_PLATFORM,
|
NPC_PLAYER_BUBBLE_PLATFORM,
|
||||||
NPC_PLATFORM_TYPE_MAX,
|
NPC_PLATFORM_TYPE_MAX,
|
||||||
};
|
};
|
||||||
|
|
|
@ -1105,6 +1105,14 @@ SOURCE=..\..\..\source\platform\pcirculr.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\platform\pdual.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\platform\pdual.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\..\..\source\platform\pfalling.cpp
|
SOURCE=..\..\..\source\platform\pfalling.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue