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

Browse source
This commit is contained in:
Paul 2001-04-11 16:49:07 +00:00
parent 8287304b36
commit caf6e6edd4
1 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
source/thing/thing.cpp
View file

@ -25,7 +25,10 @@
#include "game\game.h" #include "game\game.h"
#endif #endif
#ifndef __UTILS_HEADER__
#include "utils\utils.h" #include "utils\utils.h"
#endif
/* Std Lib /* Std Lib
------- */ ------- */
@ -134,27 +137,12 @@ void CThingManager::thinkAllThings(int _frames)
while(thing1&&thing2) while(thing1&&thing2)
{ {
//if ( !thing1->hasChild( thing2 ) ) if(thing1->canCollide()&&
thing1->checkCollisionAgainst(thing2, _frames))
{ {
//thing1->removeAllChild();
if(thing1->canCollide()&&
thing1->checkCollisionAgainst(thing2, _frames))
{
//thing1->addChild( thing2 );
thing1->collidedWith(thing2);
}
}
/*else
{
DVECTOR thatPos = thing2->getPos();
thatPos.vy = thing1->getNewYPos( thing2 );
thing2->setNewCollidedPos( thatPos );
thing1->collidedWith(thing2); thing1->collidedWith(thing2);
}*/ }
thing1=thing1->m_nextThing; thing1=thing1->m_nextThing;
} }