This commit is contained in:
parent
16c139d989
commit
26aa7ecc90
9 changed files with 191 additions and 56 deletions
|
@ -172,6 +172,19 @@ void CThingManager::thinkAllThings(int _frames)
|
|||
thing1=thing1->m_nextThing;
|
||||
}
|
||||
|
||||
// Player -> Hazard collision
|
||||
thing1=s_thingLists[CThing::TYPE_HAZARD];
|
||||
thing2=s_thingLists[CThing::TYPE_PLAYER];
|
||||
while(thing1&&thing2)
|
||||
{
|
||||
if(thing1->canCollide()&&
|
||||
thing1->checkCollisionAgainst(thing2, _frames))
|
||||
{
|
||||
thing1->collidedWith(thing2);
|
||||
}
|
||||
thing1=thing1->m_nextThing;
|
||||
}
|
||||
|
||||
// Player -> Enemy projectile collision
|
||||
thing1=s_thingLists[CThing::TYPE_ENEMYPROJECTILE];
|
||||
thing2=s_thingLists[CThing::TYPE_PLAYER];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue