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-08-16 19:32:24 +00:00
parent f12a92d250
commit 5747aa0a7e
1 changed files with 72 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/thing/thing.cpp
View file

@ -522,7 +522,11 @@ DVECTOR const &CamPos=CLevel::getCameraPos();
if (player && playerThing) if (player && playerThing)
{ {
int playerIsAlive=!player->isDead();
// Player -> Platform collision // Player -> Platform collision
if(playerIsAlive)
{
player->clearPlatform(); player->clearPlatform();
thing1=s_CollisionLists[CThing::TYPE_PLATFORM]; thing1=s_CollisionLists[CThing::TYPE_PLATFORM];
while(thing1) while(thing1)
@ -544,6 +548,7 @@ DVECTOR const &CamPos=CLevel::getCameraPos();
} }
thing1=thing1->m_nextCollisionThing; thing1=thing1->m_nextCollisionThing;
} }
}
// Friend -> Pickup collision // Friend -> Pickup collision
thing1=s_CollisionLists[CThing::TYPE_NPC]; thing1=s_CollisionLists[CThing::TYPE_NPC];
@ -562,6 +567,8 @@ DVECTOR const &CamPos=CLevel::getCameraPos();
} }
// Player -> Enemy collision // Player -> Enemy collision
if(playerIsAlive)
{
thing1=s_CollisionLists[CThing::TYPE_ENEMY]; thing1=s_CollisionLists[CThing::TYPE_ENEMY];
while(thing1) while(thing1)
{ {
@ -626,6 +633,7 @@ DVECTOR const &CamPos=CLevel::getCameraPos();
} }
thing1=thing1->m_nextCollisionThing; thing1=thing1->m_nextCollisionThing;
} }
}
// Friend -> Trigger collision // Friend -> Trigger collision
thing1=s_CollisionLists[CThing::TYPE_TRIGGER]; thing1=s_CollisionLists[CThing::TYPE_TRIGGER];