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:20:30 +00:00
parent e4daf8844b
commit f12a92d250
3 changed files with 39 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/game/game.cpp
View file

@ -721,7 +721,7 @@ int CGameScene::getTotalSpatCountForThisLevel()
/*****************************************************************************/ /*****************************************************************************/
int CGameScene::triggerTeleportEffect() int CGameScene::triggerTeleportEffect()
{ {
if(m_gamestate==GAMESTATE_PLAYING&&!m_player->isDead()) if(m_gamestate==GAMESTATE_PLAYING)
{ {
m_gamestate=GAMESTATE_TELEPORT_START; m_gamestate=GAMESTATE_TELEPORT_START;
CFader::setFadingOut(); CFader::setFadingOut();
@ -776,7 +776,7 @@ void CGameScene::setBossHasBeenKilled()
/*****************************************************************************/ /*****************************************************************************/
void CGameScene::hitBossArenaTrigger() void CGameScene::hitBossArenaTrigger()
{ {
if(!s_showBossTextOnRespawn&&!m_player->isDead()) if(!s_showBossTextOnRespawn)
{ {
s_justHitBossArenaTrigger=true; s_justHitBossArenaTrigger=true;
s_showBossTextOnRespawn=true; s_showBossTextOnRespawn=true;

4
source/player/player.cpp
View file

@ -737,6 +737,8 @@ if(newmode!=-1)
newmode=-1; newmode=-1;
} }
if(!isDead())
{
CThing *platform; CThing *platform;
platform=isOnPlatform(); platform=isOnPlatform();
if(platform) if(platform)
@ -781,7 +783,7 @@ if(newmode!=-1)
} }
} }
} }
}
m_allowConversation=false; m_allowConversation=false;

2
source/triggers/tboss.cpp
View file

@ -60,7 +60,7 @@ void CBossArenaTrigger::collidedWith(CThing *_thisThing)
{ {
case TYPE_PLAYER: case TYPE_PLAYER:
{ {
CGameScene::hitBossArenaTrigger(); GameScene.hitBossArenaTrigger();
shutdown(); shutdown();
delete this; delete this;
break; break;