This commit is contained in:
Charles 2001-05-15 16:31:29 +00:00
parent b94fec971d
commit 3c93ff9e59
6 changed files with 45 additions and 4 deletions

View File

@ -119,7 +119,8 @@ platform_src := platform \
pleaf \ pleaf \
pbwheel \ pbwheel \
psbarrel \ psbarrel \
pjellfsh pjellfsh \
pclam
hazard_src := hazard \ hazard_src := hazard \
hfalling \ hfalling \

View File

@ -19,6 +19,14 @@
#include "enemy\nclam.h" #include "enemy\nclam.h"
#endif #endif
#ifndef __PLATFORM_PCLAM_H__
#include "platform\pclam.h"
#endif
#ifndef __PLATFORM_PLATFORM_H__
#include "platform\platform.h"
#endif
#ifndef __GAME_GAME_H__ #ifndef __GAME_GAME_H__
#include "game\game.h" #include "game\game.h"
#endif #endif
@ -186,6 +194,16 @@ void CNpcStaticClamEnemy::processShot( int _frames )
{ {
m_isStunned = true; m_isStunned = true;
// create platform in same place
CNpcClamPlatform *platform = new ("clam platform") CNpcClamPlatform;
platform->setType( CNpcClamPlatform::NPC_CLAM_PLATFORM );
platform->setGraphic( (u8) 0 );
platform->init( Pos );
platform->setTiltable( false );
platform->setBBox();
break; break;
} }
} }
@ -202,7 +220,7 @@ void CNpcStaticClamEnemy::collidedWith( CThing *_thisThing )
} }
} }
int CNpcStaticClamEnemy::checkCollisionAgainst( CThing *_thisThing, int _frames ) /*int CNpcStaticClamEnemy::checkCollisionAgainst( CThing *_thisThing, int _frames )
{ {
DVECTOR pos,thisThingPos; DVECTOR pos,thisThingPos;
int radius; int radius;
@ -253,4 +271,4 @@ int CNpcStaticClamEnemy::checkCollisionAgainst( CThing *_thisThing, int _frames
} }
return collided; return collided;
} }*/

View File

@ -34,7 +34,7 @@ class CNpcStaticClamEnemy : public CNpcClamEnemy
{ {
public: public:
virtual void postInit(); virtual void postInit();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames); //virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
protected: protected:
virtual void collidedWith(CThing *_thisThing); virtual void collidedWith(CThing *_thisThing);
virtual void processShot( int _frames ); virtual void processShot( int _frames );

View File

@ -370,6 +370,18 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
0, 0,
NPC_PLATFORM_TIMER_NONE, NPC_PLATFORM_TIMER_NONE,
}, },
{ // NPC_CLAM_PLATFORM
3,
128,
true,
DAMAGE__NONE,
0,
4,
NPC_PLATFORM_INFINITE_LIFE,
0,
NPC_PLATFORM_TIMER_NONE,
},
}; };
CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATFORM_TYPE_MAX] = CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATFORM_TYPE_MAX] =
@ -401,4 +413,5 @@ CNpcPlatform::NPC_PLATFORM_UNIT_TYPE CNpcPlatform::mapEditConvertTable[NPC_PLATF
NPC_STEERABLE_BARREL_PLATFORM, NPC_STEERABLE_BARREL_PLATFORM,
NPC_JELLYFISH_PLATFORM, NPC_JELLYFISH_PLATFORM,
NPC_PLAYER_BUBBLE_PLATFORM, NPC_PLAYER_BUBBLE_PLATFORM,
NPC_CLAM_PLATFORM,
}; };

View File

@ -81,6 +81,7 @@ public:
NPC_STEERABLE_BARREL_PLATFORM, NPC_STEERABLE_BARREL_PLATFORM,
NPC_JELLYFISH_PLATFORM, NPC_JELLYFISH_PLATFORM,
NPC_PLAYER_BUBBLE_PLATFORM, NPC_PLAYER_BUBBLE_PLATFORM,
NPC_CLAM_PLATFORM,
NPC_PLATFORM_TYPE_MAX, NPC_PLATFORM_TYPE_MAX,
}; };

View File

@ -1249,6 +1249,14 @@ SOURCE=..\..\..\source\platform\pcirculr.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\..\source\platform\pclam.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\platform\pclam.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\platform\pdual.cpp SOURCE=..\..\..\source\platform\pdual.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File