This commit is contained in:
Charles 2001-07-03 22:17:20 +00:00
parent 1cb38b14cc
commit b6e036bf51
62 changed files with 134 additions and 149 deletions

View file

@ -21,7 +21,7 @@
class CBridgeBalloon
{
public:
virtual void setPos( DVECTOR newPos ) {Pos = newPos;}
void setPos( DVECTOR newPos ) {Pos = newPos;}
void render();
void init();
void shutdown();
@ -33,14 +33,14 @@ protected:
class CNpcBalloonBridgePlatform : public CNpcPlatform
{
public:
virtual void postInit();
virtual void render();
virtual void shutdown();
void postInit();
void render();
void shutdown();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected:
virtual void setWaypoints( sThingPlatform *ThisPlatform );
virtual void processMovement( int _frames );
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
void setWaypoints( sThingPlatform *ThisPlatform );
void processMovement( int _frames );
int checkCollisionAgainst(CThing *_thisThing, int _frames);
s32 m_maxExtension;
s8 m_balloonCount;

View file

@ -21,7 +21,7 @@
class CNpcBobbingPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
protected:
virtual void processMovement( int _frames );

View file

@ -21,7 +21,7 @@
class CNpcBouncePlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
virtual void think( int _frames );
virtual void render();
protected:

View file

@ -21,13 +21,13 @@
class CNpcBubblePlatform : public CNpcPlatform
{
public:
virtual void render();
void render();
virtual void postInit();
virtual void shutdown();
virtual void setGraphic( sThingPlatform *ThisPlatform ) {}
virtual void setGraphic( u8 graphicNum ) {}
void shutdown();
void setGraphic( sThingPlatform *ThisPlatform ) {}
void setGraphic( u8 graphicNum ) {}
protected:
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
int checkCollisionAgainst(CThing *_thisThing, int _frames);
u8 m_pop;
s16 m_scale;

View file

@ -21,7 +21,7 @@
class CNpcBubbleTubePlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
virtual void setWaypoints( sThingPlatform *ThisPlatform );
protected:
virtual void collidedWith(CThing *_thisThing);

View file

@ -22,7 +22,7 @@ class CNpcBigWheelPlatform : public CNpcPlatform
{
public:
bool alwaysThink() {return(true);}
virtual void postInit();
void postInit();
virtual int getHeightFromPlatformAtPosition(int _x,int _y, int offsetX = 0, int offsetY = 0);
protected:
virtual void setWaypoints( sThingPlatform *ThisPlatform );

View file

@ -21,7 +21,7 @@
class CNpcCollapsingBubblePlatform : public CNpcBubblePlatform
{
public:
virtual void postInit();
void postInit();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected:
virtual void processLifetime( int _frames );

View file

@ -21,7 +21,7 @@
class CNpcCircularPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
protected:
virtual void processMovement( int _frames );
};

View file

@ -21,7 +21,7 @@
class CNpcClamPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
virtual void render();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
//void setBBox();

View file

@ -21,7 +21,7 @@
class CNpcConveyorPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
virtual void render();
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
protected:

View file

@ -21,7 +21,7 @@
class CNpcFallingPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
protected:
virtual void processMovement( int _frames );
};

View file

@ -21,7 +21,7 @@
class CNpcFallingNoRespawnPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
bool alwaysThink() {return(true);}
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
protected:

View file

@ -21,7 +21,7 @@
class CNpcFishHook3Platform : public CNpcFishHookPlatform
{
public:
virtual void postInit();
void postInit();
};
#endif

View file

@ -21,7 +21,7 @@
class CNpcGeyserBubblePlatform : public CNpcBubblePlatform
{
public:
virtual void postInit();
void postInit();
protected:
virtual void processMovement( int _frames );
virtual void processLifetime( int _frames );

View file

@ -21,7 +21,7 @@
class CNpcGeyserPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
protected:
virtual void processMovement( int _frames );
virtual void processTimer( int _frames );

View file

@ -21,7 +21,7 @@
class CNpcJellyfishPlatform : public CNpcLinearPlatform
{
public:
virtual void postInit();
void postInit();
virtual void think( int _frames );
protected:
virtual void collidedWith(CThing *_thisThing);

View file

@ -21,7 +21,7 @@
class CNpcLanternPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
bool alwaysThink() {return(true);}
protected:
virtual void setWaypoints( sThingPlatform *ThisPlatform );

View file

@ -21,7 +21,7 @@
class CNpcLeafPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
protected:
virtual void processMovement( int _frames );

View file

@ -21,7 +21,7 @@
class CNpcLiftPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
virtual void setWaypoints( sThingPlatform *ThisPlatform );
protected:
virtual void collidedWith(CThing *_thisThing);

View file

@ -21,7 +21,7 @@
class CNpcLoveBoatPlatform : public CNpcCartPlatform
{
public:
virtual void postInit();
void postInit();
};
#endif

View file

@ -21,7 +21,7 @@
class CNpcPendulumPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
virtual void render();
protected:
virtual void setWaypoints( sThingPlatform *ThisPlatform );

View file

@ -24,18 +24,6 @@
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/*void CNpcPlayerBubblePlatform::postInit()
{
CNpcBubblePlatform::postInit();
setCollisionSize( 30, 30 );
setCollisionCentreOffset( 0, -15 );
calculateNonRotatedCollisionData();
}*/
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcPlayerBubblePlatform::processLifetime( int _frames )

View file

@ -21,7 +21,6 @@
class CNpcPlayerBubblePlatform : public CNpcBubblePlatform
{
public:
//virtual void postInit();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected:
virtual void processLifetime( int _frames );

View file

@ -21,7 +21,7 @@
class CNpcRaftPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
virtual void render();
protected:
virtual void processMovement( int _frames );

View file

@ -21,7 +21,7 @@
class CNpcRisingBridgePlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
virtual void trigger();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected:

View file

@ -21,7 +21,7 @@
class CNpcRetractingPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
virtual void render();
protected:
void processTimer( int _frames );

View file

@ -22,7 +22,7 @@ class CNpcSteerableBarrelPlatform : public CNpcPlatform
{
public:
virtual void render();
virtual void postInit();
void postInit();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected:
virtual void processMovement( int _frames );

View file

@ -21,7 +21,7 @@
class CNpcSeesawPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
virtual void render();
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
protected:

View file

@ -25,7 +25,7 @@
class CNpcSteamSwitchPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
virtual void setWaypoints( sThingPlatform *ThisPlatform );
protected:
virtual void processMovement( int _frames );

View file

@ -21,7 +21,7 @@
class CNpcTrapdoorPlatform : public CNpcPlatform
{
public:
virtual void postInit();
void postInit();
DVECTOR const &getTriggerPos() {return( m_triggerPos );}
void setTriggered() {m_triggered = true;}
virtual void render();