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-07-30 19:43:39 +00:00
parent 469a744a87
commit 64012414b9
14 changed files with 50 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

32
source/thing/thing.cpp
View file

@ -724,6 +724,38 @@ DVECTOR const &CamPos=CLevel::getCameraPos();
thing1=thing1->m_nextCollisionThing;
}
// Trigger -> Player projectile collision
thing1=s_CollisionLists[CThing::TYPE_PLAYERPROJECTILE];
while(thing1)
{
thing2=s_CollisionLists[CThing::TYPE_TRIGGER];
while(thing2)
{
if(thing1->checkCollisionAgainst(thing2, _frames))
{
thing2->collidedWith(thing1);
}
thing2=thing2->m_nextCollisionThing;
}
thing1=thing1->m_nextCollisionThing;
}
// Hazard -> Player projectile collision
thing1=s_CollisionLists[CThing::TYPE_PLAYERPROJECTILE];
while(thing1)
{
thing2=s_CollisionLists[CThing::TYPE_HAZARD];
while(thing2)
{
if(thing1->checkCollisionAgainst(thing2, _frames))
{
thing2->collidedWith(thing1);
}
thing2=thing2->m_nextCollisionThing;
}
thing1=thing1->m_nextCollisionThing;
}
// Friendly npc -> Platform projectile collision - first clear platforms
CNpcFriend *friendNpc = (CNpcFriend *) s_CollisionLists[CThing::TYPE_NPC];