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

Browse source
This commit is contained in:
Daveo 2001-05-11 00:54:52 +00:00
parent bb454ee0a7
commit 4e9fb55b36
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/fx/fxjfish.h
View file

@ -22,6 +22,8 @@ virtual void think(int _frames);
virtual void render(); virtual void render();
void SetUp(int _Width,int _Gap,int _Length,int _Count); void SetUp(int _Width,int _Gap,int _Length,int _Count);
virtual CRECT const &getCollisionArea() {return (Parent->getCollisionArea());}
protected: protected:
int XOfs; int XOfs;

6
source/thing/thing.cpp
View file

@ -211,14 +211,14 @@ DVECTOR const &CamPos=CLevel::getCameraPos();
if (Flag) if (Flag)
{ {
thing->think(_frames); thing->think(_frames);
thing->updateCollisionArea(); // thing->updateCollisionArea();
if (thing->canCollide()) if (thing->canCollide())
{ {
CThingManager::addToCollisionList(thing); CThingManager::addToCollisionList(thing);
} }
} }
/* THIS WILL NOT STAY HERE, THINGS MUST BE INITIALISED CORRECTLY */ /* THIS WILL NOT STAY HERE, THINGS MUST BE INITIALISED CORRECTLY */
// thing->updateCollisionArea(); thing->updateCollisionArea();
thing=thing->m_nextListThing; thing=thing->m_nextListThing;
} }
@ -379,7 +379,7 @@ DVECTOR const &CamPos=CLevel::getCameraPos();
// Shut emm down, sh sh shut em down, we shutem down // Shut emm down, sh sh shut em down, we shutem down
for(i=0;i<CThing::MAX_TYPE;i++) for(i=0;i<CThing::MAX_TYPE;i++)
{ {
thing=s_CollisionLists[i]; thing=s_thingLists[i];
CThing *nextThing = thing; CThing *nextThing = thing;
while(thing) while(thing)
{ {

2
source/thing/thing.h
View file

@ -151,7 +151,7 @@ public:
DVECTOR const &getCollisionCentre() {return m_collisionCentre;} DVECTOR const &getCollisionCentre() {return m_collisionCentre;}
DVECTOR const &getCollisionCentreOffset() {return m_collisionCentreOffset;} DVECTOR const &getCollisionCentreOffset() {return m_collisionCentreOffset;}
int getCollisionRadius() {return m_collisionRadius;} int getCollisionRadius() {return m_collisionRadius;}
CRECT const &getCollisionArea() {return m_collisionArea;} virtual CRECT const &getCollisionArea() {return m_collisionArea;}
s16 getCollisionAngle() {return m_collisionAngle;} // pkg - move to CNpcPlatform? s16 getCollisionAngle() {return m_collisionAngle;} // pkg - move to CNpcPlatform?
DVECTOR const &getNewCollidedPos() {return m_newCollidedPos;} // pkg - to be removed? DVECTOR const &getNewCollidedPos() {return m_newCollidedPos;} // pkg - to be removed?
DVECTOR const &getCollisionSize() {return m_collisionSize;} DVECTOR const &getCollisionSize() {return m_collisionSize;}