This commit is contained in:
parent
d2971296b8
commit
7478d3483b
88 changed files with 260 additions and 260 deletions
|
@ -25,7 +25,7 @@ public:
|
|||
void render();
|
||||
void init();
|
||||
void shutdown();
|
||||
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
protected:
|
||||
DVECTOR Pos;
|
||||
};
|
||||
|
@ -36,7 +36,7 @@ public:
|
|||
void postInit();
|
||||
void render();
|
||||
void shutdown();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
void processMovement( int _frames );
|
||||
|
|
|
@ -22,10 +22,10 @@ class CNpcGeyserPlatformGenerator : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
void setTargetType( NPC_PLATFORM_UNIT_TYPE targetType ) {m_targetType = targetType;}
|
||||
virtual void render();
|
||||
void render();
|
||||
protected:
|
||||
virtual void think( int _frames );
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
void think( int _frames );
|
||||
void collidedWith(CThing *_thisThing);
|
||||
|
||||
NPC_PLATFORM_UNIT_TYPE m_targetType;
|
||||
};
|
||||
|
|
|
@ -23,7 +23,7 @@ class CNpcBobbingPlatform : public CNpcPlatform
|
|||
public:
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
void processMovement( int _frames );
|
||||
|
||||
enum NPC_BOB_STATE
|
||||
{
|
||||
|
|
|
@ -22,8 +22,8 @@ class CNpcBouncePlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
void postInit();
|
||||
virtual void think( int _frames );
|
||||
virtual void render();
|
||||
void think( int _frames );
|
||||
void render();
|
||||
protected:
|
||||
s32 m_vertScale;
|
||||
s32 m_vertVelocity;
|
||||
|
|
|
@ -21,12 +21,12 @@
|
|||
class CNpcBranchPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
virtual void render();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
void postInit();
|
||||
void render();
|
||||
CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
virtual void processMovement( int _frames );
|
||||
void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
void processMovement( int _frames );
|
||||
|
||||
s32 m_angularVelocity;
|
||||
u8 m_reversed;
|
||||
|
|
|
@ -22,11 +22,11 @@ class CNpcBubbleTubePlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
void postInit();
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
protected:
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
virtual void processMovement( int _frames );
|
||||
virtual void processTimer( int _frames );
|
||||
void collidedWith(CThing *_thisThing);
|
||||
void processMovement( int _frames );
|
||||
void processTimer( int _frames );
|
||||
|
||||
u8 m_isActivated;
|
||||
u8 m_returning;
|
||||
|
|
|
@ -23,10 +23,10 @@ class CNpcBigWheelPlatform : public CNpcPlatform
|
|||
public:
|
||||
bool alwaysThink() {return(true);}
|
||||
void postInit();
|
||||
virtual int getHeightFromPlatformAtPosition(int _x,int _y, int offsetX = 0, int offsetY = 0);
|
||||
int getHeightFromPlatformAtPosition(int _x,int _y, int offsetX = 0, int offsetY = 0);
|
||||
protected:
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
virtual void processMovement( int _frames );
|
||||
void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
void processMovement( int _frames );
|
||||
};
|
||||
|
||||
#endif
|
|
@ -21,13 +21,13 @@
|
|||
class CNpcCartPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
virtual void render();
|
||||
virtual u8 isCart() {return( true );}
|
||||
virtual void jump();
|
||||
void postInit();
|
||||
void render();
|
||||
u8 isCart() {return( true );}
|
||||
void jump();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
void processMovement( int _frames );
|
||||
void collidedWith(CThing *_thisThing);
|
||||
|
||||
s32 m_carSpeed;
|
||||
u8 m_isActivated;
|
||||
|
|
|
@ -22,9 +22,9 @@ class CNpcCollapsingBubblePlatform : public CNpcBubblePlatform
|
|||
{
|
||||
public:
|
||||
void postInit();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
virtual void processLifetime( int _frames );
|
||||
void processLifetime( int _frames );
|
||||
u8 m_startCollapse;
|
||||
};
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ class CNpcCircularPlatform : public CNpcPlatform
|
|||
public:
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
void processMovement( int _frames );
|
||||
};
|
||||
|
||||
#endif
|
|
@ -22,8 +22,8 @@ class CNpcClamPlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
void postInit();
|
||||
virtual void render();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
void render();
|
||||
CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
//void setBBox();
|
||||
};
|
||||
|
||||
|
|
|
@ -22,11 +22,11 @@ class CNpcConveyorPlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
void postInit();
|
||||
virtual void render();
|
||||
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
void render();
|
||||
int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
void processMovement( int _frames );
|
||||
void collidedWith(CThing *_thisThing);
|
||||
|
||||
u8 m_spinFinish;
|
||||
s16 m_rotation;
|
||||
|
@ -35,10 +35,10 @@ protected:
|
|||
class CNpcConveyorPlatformGenerator : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void render();
|
||||
void render();
|
||||
protected:
|
||||
virtual void think( int _frames );
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
void think( int _frames );
|
||||
void collidedWith(CThing *_thisThing);
|
||||
};
|
||||
|
||||
#endif
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcDropPlatform : public CNpcPlatform
|
||||
{
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
void processMovement( int _frames );
|
||||
};
|
||||
|
||||
#endif
|
|
@ -24,15 +24,15 @@ public:
|
|||
void setMaster( u8 isMaster );
|
||||
void setOtherPlatform( CNpcDualPlatform *other );
|
||||
void setMovement( DVECTOR move );
|
||||
virtual u8 canDrop();
|
||||
u8 canDrop();
|
||||
void setLineBase( DVECTOR base ) {m_lineBase = base;}
|
||||
DVECTOR getLineBase() {return( m_lineBase );}
|
||||
virtual void render();
|
||||
void render();
|
||||
void setThinkArea( CRECT &newArea );
|
||||
protected:
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
virtual void processMovement( int _frames );
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
void processMovement( int _frames );
|
||||
void collidedWith(CThing *_thisThing);
|
||||
|
||||
u8 m_isMaster;
|
||||
CNpcDualPlatform *m_otherPlatform;
|
||||
|
|
|
@ -23,7 +23,7 @@ class CNpcFallingPlatform : public CNpcPlatform
|
|||
public:
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
void processMovement( int _frames );
|
||||
};
|
||||
|
||||
#endif
|
|
@ -23,10 +23,10 @@ class CNpcFallingNoRespawnPlatform : public CNpcPlatform
|
|||
public:
|
||||
void postInit();
|
||||
bool alwaysThink() {return(true);}
|
||||
virtual int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
int checkCollisionAgainst(CThing *_thisThing, int _frames);
|
||||
protected:
|
||||
virtual void render();
|
||||
virtual void processMovement( int _frames );
|
||||
void render();
|
||||
void processMovement( int _frames );
|
||||
|
||||
u8 m_spinFinish;
|
||||
s16 m_rotation;
|
||||
|
|
|
@ -22,11 +22,11 @@ class CNpcFallingPlatformGenerator : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
void setTargetType( NPC_PLATFORM_UNIT_TYPE targetType ) {m_targetType = targetType;}
|
||||
virtual void render();
|
||||
void render();
|
||||
bool alwaysThink() {return(true);}
|
||||
protected:
|
||||
virtual void think( int _frames );
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
void think( int _frames );
|
||||
void collidedWith(CThing *_thisThing);
|
||||
|
||||
NPC_PLATFORM_UNIT_TYPE m_targetType;
|
||||
};
|
||||
|
|
|
@ -22,11 +22,11 @@ class CNpcFishHookPlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
virtual void postInit();
|
||||
virtual void render();
|
||||
virtual CRECT const *getThinkBBox();
|
||||
void render();
|
||||
CRECT const *getThinkBBox();
|
||||
protected:
|
||||
virtual void processLifetime( int _frames );
|
||||
virtual void processMovement( int _frames );
|
||||
void processLifetime( int _frames );
|
||||
void processMovement( int _frames );
|
||||
|
||||
u8 m_isMoving;
|
||||
u8 m_isResetting;
|
||||
|
|
|
@ -23,8 +23,8 @@ class CNpcGeyserBubblePlatform : public CNpcBubblePlatform
|
|||
public:
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
virtual void processLifetime( int _frames );
|
||||
void processMovement( int _frames );
|
||||
void processLifetime( int _frames );
|
||||
};
|
||||
|
||||
#endif
|
|
@ -23,8 +23,8 @@ class CNpcGeyserPlatform : public CNpcPlatform
|
|||
public:
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
virtual void processTimer( int _frames );
|
||||
void processMovement( int _frames );
|
||||
void processTimer( int _frames );
|
||||
|
||||
bool m_isFiring;
|
||||
|
||||
|
|
|
@ -22,9 +22,9 @@ class CNpcJellyfishPlatform : public CNpcLinearPlatform
|
|||
{
|
||||
public:
|
||||
void postInit();
|
||||
virtual void think( int _frames );
|
||||
void think( int _frames );
|
||||
protected:
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
void collidedWith(CThing *_thisThing);
|
||||
|
||||
s32 m_vertScale;
|
||||
u8 m_dipCount;
|
||||
|
|
|
@ -24,8 +24,8 @@ public:
|
|||
void postInit();
|
||||
bool alwaysThink() {return(true);}
|
||||
protected:
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
virtual void processMovement( int _frames );
|
||||
void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
void processMovement( int _frames );
|
||||
|
||||
s32 m_length;
|
||||
s32 m_maxExtension;
|
||||
|
|
|
@ -23,7 +23,7 @@ class CNpcLeafPlatform : public CNpcPlatform
|
|||
public:
|
||||
void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
void processMovement( int _frames );
|
||||
|
||||
u8 m_isActivated;
|
||||
};
|
||||
|
|
|
@ -22,11 +22,11 @@ class CNpcLiftPlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
void postInit();
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
protected:
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
virtual void processMovement( int _frames );
|
||||
virtual void processTimer( int _frames );
|
||||
void collidedWith(CThing *_thisThing);
|
||||
void processMovement( int _frames );
|
||||
void processTimer( int _frames );
|
||||
|
||||
u8 m_isActivated;
|
||||
u8 m_returning;
|
||||
|
|
|
@ -23,7 +23,7 @@ class CNpcLinearPlatform : public CNpcPlatform
|
|||
public:
|
||||
virtual void postInit();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
void processMovement( int _frames );
|
||||
};
|
||||
|
||||
#endif
|
|
@ -22,10 +22,10 @@ class CNpcPendulumPlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
void postInit();
|
||||
virtual void render();
|
||||
void render();
|
||||
protected:
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
virtual void processMovement( int _frames );
|
||||
void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
void processMovement( int _frames );
|
||||
|
||||
s32 m_length;
|
||||
s32 m_maxExtension;
|
||||
|
|
|
@ -21,9 +21,9 @@
|
|||
class CNpcPlayerBubblePlatform : public CNpcBubblePlatform
|
||||
{
|
||||
public:
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
virtual void processLifetime( int _frames );
|
||||
void processLifetime( int _frames );
|
||||
};
|
||||
|
||||
#endif
|
|
@ -22,9 +22,9 @@ class CNpcRaftPlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
void postInit();
|
||||
virtual void render();
|
||||
void render();
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
void processMovement( int _frames );
|
||||
|
||||
u8 m_isActivated;
|
||||
u8 m_isSinking;
|
||||
|
|
|
@ -22,11 +22,11 @@ class CNpcRisingBridgePlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
void postInit();
|
||||
virtual void trigger();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
void trigger();
|
||||
CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
virtual void processMovement( int _frames );
|
||||
void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
void processMovement( int _frames );
|
||||
|
||||
s32 m_maxExtension;
|
||||
u8 m_triggered;
|
||||
|
|
|
@ -22,7 +22,7 @@ class CNpcRetractingPlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
void postInit();
|
||||
virtual void render();
|
||||
void render();
|
||||
protected:
|
||||
void processTimer( int _frames );
|
||||
|
||||
|
|
|
@ -21,12 +21,12 @@
|
|||
class CNpcSteerableBarrelPlatform : public CNpcPlatform
|
||||
{
|
||||
public:
|
||||
virtual void render();
|
||||
void render();
|
||||
void postInit();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
virtual void collidedWith(CThing *_thisThing);
|
||||
void collidedWith(CThing *_thisThing);
|
||||
|
||||
s16 m_rotation;
|
||||
s32 m_currentSpeed;
|
||||
|
|
|
@ -22,10 +22,10 @@ class CNpcSeesawPlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
void postInit();
|
||||
virtual void render();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
void render();
|
||||
CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
void processMovement( int _frames );
|
||||
|
||||
s32 m_angularVelocity;
|
||||
s32 m_currentAngle;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
class CNpcSteerableOildrumPlatform : public CNpcSteerableBarrelPlatform
|
||||
{
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
void processMovement( int _frames );
|
||||
};
|
||||
|
||||
#endif
|
|
@ -26,10 +26,10 @@ class CNpcSteamSwitchPlatform : public CNpcPlatform
|
|||
{
|
||||
public:
|
||||
void postInit();
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
protected:
|
||||
virtual void processMovement( int _frames );
|
||||
virtual void processTimer( int _frames );
|
||||
void processMovement( int _frames );
|
||||
void processTimer( int _frames );
|
||||
|
||||
enum NPC_STEAM_SWITCH_STATE
|
||||
{
|
||||
|
|
|
@ -24,11 +24,11 @@ public:
|
|||
void postInit();
|
||||
DVECTOR const &getTriggerPos() {return( m_triggerPos );}
|
||||
void setTriggered() {m_triggered = true;}
|
||||
virtual void render();
|
||||
virtual CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
void render();
|
||||
CRECT const *getThinkBBox() {return( CThing::getThinkBBox() );}
|
||||
protected:
|
||||
virtual void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
virtual void processMovement( int _frames );
|
||||
void setWaypoints( sThingPlatform *ThisPlatform );
|
||||
void processMovement( int _frames );
|
||||
|
||||
DVECTOR m_triggerPos;
|
||||
u8 m_triggered;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue