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-09 19:38:58 +00:00
parent 097c54d7cc
commit dfd36d956e
7 changed files with 72 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
source/thing/thing.cpp
View file

@ -750,6 +750,26 @@ DVECTOR const &CamPos=CLevel::getCameraPos();
thing1=thing1->m_nextCollisionThing;
}
// gary collision with hazards
thing2=s_CollisionLists[CThing::TYPE_NPC];
while(thing2)
{
if ( thing2->getThingSubType() == CNpcFriend::NPC_FRIEND_GARY )
{
thing1=s_CollisionLists[CThing::TYPE_HAZARD];
while(thing1)
{
if(thing1->checkCollisionAgainst(thing2, _frames))
{
thing1->collidedWith(thing2);
}
thing1=thing1->m_nextCollisionThing;
}
}
thing2=thing2->m_nextCollisionThing;
}
player->detectHazardousSurface();
}
// Shut emm down, sh sh shut em down, we shutem down