zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-06-29 14:19:28 +00:00
parent cd87d0818d
commit 57b4d19ca6
48 changed files with 8 additions and 395 deletions
Download patch file Download diff file Expand all files Collapse all files

15
source/hazard/hbarrel.cpp
View file

@ -152,18 +152,3 @@ void CNpcBarrelHazard::render()
m_modelGfx->Render(renderPos,&rotation,&scale);
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/*const CRECT *CNpcBarrelHazard::getThinkBBox()
{
CRECT objThinkBox = getCollisionArea();
sBBox &thinkBBox = CThingManager::getThinkBBox();
objThinkBox.x1 = thinkBBox.XMin;
objThinkBox.x2 = thinkBBox.XMax;
objThinkBox.y1 = thinkBBox.YMin;
objThinkBox.y2 = thinkBBox.YMax;
return &objThinkBox;
}*/

1
source/hazard/hbarrel.h
View file

@ -23,7 +23,6 @@ class CNpcBarrelHazard : public CNpcHazard
public:
void init();
void render();
//virtual CRECT const *getThinkBBox();
protected:
void processMovement( int _frames );

15
source/hazard/hbbarrel.cpp
View file

@ -198,21 +198,6 @@ void CNpcBouncingBarrelHazard::render()
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/*const CRECT *CNpcBouncingBarrelHazard::getThinkBBox()
{
CRECT objThinkBox = getCollisionArea();
sBBox &thinkBBox = CThingManager::getThinkBBox();
objThinkBox.x1 = thinkBBox.XMin;
objThinkBox.x2 = thinkBBox.XMax;
objThinkBox.y1 = thinkBBox.YMin;
objThinkBox.y2 = thinkBBox.YMax;
return &objThinkBox;
}*/
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcBouncingBarrelHazard::collidedWith( CThing *_thisThing )
{
if ( m_isActive )

1
source/hazard/hbbarrel.h
View file

@ -23,7 +23,6 @@ class CNpcBouncingBarrelHazard : public CNpcHazard
public:
void init();
void render();
//virtual CRECT const *getThinkBBox();
protected:
void processMovement( int _frames );
virtual void collidedWith(CThing *_thisThing);

15
source/hazard/hbwheel.cpp
View file

@ -76,18 +76,3 @@ void CNpcBigWheelHazard::collidedWith( CThing *_thisThing )
{
// do not collide
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
const CRECT *CNpcBigWheelHazard::getThinkBBox()
{
CRECT objThinkBox = getCollisionArea();
sBBox &thinkBBox = CThingManager::getThinkBBox();
objThinkBox.x1 = thinkBBox.XMin;
objThinkBox.x2 = thinkBBox.XMax;
objThinkBox.y1 = thinkBBox.YMin;
objThinkBox.y2 = thinkBBox.YMax;
return &objThinkBox;
}

2
source/hazard/hbwheel.h
View file

@ -23,7 +23,7 @@ class CNpcBigWheelHazard : public CNpcHazard
public:
void init();
virtual void render();
virtual CRECT const *getThinkBBox();
bool alwaysThink() {return(true);}
protected:
void processMovement( int _frames );
virtual void collidedWith(CThing *_thisThing);

15
source/hazard/hdbarrel.cpp
View file

@ -178,18 +178,3 @@ void CNpcDualPlatformBarrelHazard::render()
m_modelGfx->Render(renderPos,&rotation,&scale);
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/*const CRECT *CNpcDualPlatformBarrelHazard::getThinkBBox()
{
CRECT objThinkBox = getCollisionArea();
sBBox &thinkBBox = CThingManager::getThinkBBox();
objThinkBox.x1 = thinkBBox.XMin;
objThinkBox.x2 = thinkBBox.XMax;
objThinkBox.y1 = thinkBBox.YMin;
objThinkBox.y2 = thinkBBox.YMax;
return &objThinkBox;
}*/

1
source/hazard/hdbarrel.h
View file

@ -23,7 +23,6 @@ class CNpcDualPlatformBarrelHazard : public CNpcHazard
public:
void init();
void render();
//virtual CRECT const *getThinkBBox();
protected:
void processMovement( int _frames );

12
source/hazard/hfalling.cpp
View file

@ -225,18 +225,6 @@ void CNpcFallingHazard::collidedWith( CThing *_thisThing )
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/*const CRECT *CNpcFallingHazard::getThinkBBox()
{
CRECT objThinkBox = getCollisionArea();
sBBox &thinkBBox = CThingManager::getThinkBBox();
objThinkBox.y2 = thinkBBox.YMin + 1;
return &objThinkBox;
}*/
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcFallingHazard::setWaypoints( sThingHazard *ThisHazard )
{
int pointNum;

1
source/hazard/hfalling.h
View file

@ -22,7 +22,6 @@ class CNpcFallingHazard : public CNpcHazard
{
public:
void init();
//virtual CRECT const *getThinkBBox();
virtual void setWaypoints( sThingHazard *ThisHazard );
void render();
protected:

15
source/hazard/hrrock.cpp
View file

@ -199,18 +199,3 @@ void CNpcRollingRockHazard::render()
m_modelGfx->Render(renderPos,&rotation,&scale);
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/*const CRECT *CNpcRollingRockHazard::getThinkBBox()
{
CRECT objThinkBox = getCollisionArea();
sBBox &thinkBBox = CThingManager::getThinkBBox();
objThinkBox.x1 = thinkBBox.XMin;
objThinkBox.x2 = thinkBBox.XMax;
objThinkBox.y1 = thinkBBox.YMin;
objThinkBox.y2 = thinkBBox.YMax;
return &objThinkBox;
}*/

1
source/hazard/hrrock.h
View file

@ -23,7 +23,6 @@ class CNpcRollingRockHazard : public CNpcHazard
public:
void init();
void render();
//virtual CRECT const *getThinkBBox();
protected:
void processMovement( int _frames );

15
source/hazard/hspikes.cpp
View file

@ -95,21 +95,6 @@ void CNpcSpikesHazard::processMovement( int _frames )
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
const CRECT *CNpcSpikesHazard::getThinkBBox()
{
CRECT objThinkBox = getCollisionArea();
sBBox &thinkBBox = CThingManager::getThinkBBox();
objThinkBox.x1 = thinkBBox.XMin;
objThinkBox.x2 = thinkBBox.XMax;
objThinkBox.y1 = thinkBBox.YMin;
objThinkBox.y2 = thinkBBox.YMax;
return &objThinkBox;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcSpikesHazard::processTimer( int _frames )
{
if ( m_timer > 0 )

2
source/hazard/hspikes.h
View file

@ -22,7 +22,7 @@ class CNpcSpikesHazard : public CNpcHazard
{
public:
void init();
virtual CRECT const *getThinkBBox();
bool alwaysThink() {return(true);}
protected:
virtual void processTimer( int _frames );
void processMovement( int _frames );