From aa4a3e55a3730c03e64990584c116d12ceee4469 Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 16 Aug 2001 18:37:32 +0000 Subject: [PATCH] --- source/game/game.cpp | 4 ++-- source/game/game.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/game/game.cpp b/source/game/game.cpp index 3620448ab..c849e1eaa 100644 --- a/source/game/game.cpp +++ b/source/game/game.cpp @@ -721,7 +721,7 @@ int CGameScene::getTotalSpatCountForThisLevel() /*****************************************************************************/ int CGameScene::triggerTeleportEffect() { - if(m_gamestate==GAMESTATE_PLAYING) + if(m_gamestate==GAMESTATE_PLAYING&&!m_player->isDead()) { m_gamestate=GAMESTATE_TELEPORT_START; CFader::setFadingOut(); @@ -776,7 +776,7 @@ void CGameScene::setBossHasBeenKilled() /*****************************************************************************/ void CGameScene::hitBossArenaTrigger() { - if(!s_showBossTextOnRespawn) + if(!s_showBossTextOnRespawn&&!m_player->isDead()) { s_justHitBossArenaTrigger=true; s_showBossTextOnRespawn=true; diff --git a/source/game/game.h b/source/game/game.h index 9e86ebcc8..2886b50b9 100644 --- a/source/game/game.h +++ b/source/game/game.h @@ -53,7 +53,7 @@ virtual int canPause(); void sendEvent( GAME_EVENT evt, class CThing *sourceThing ); static void setReadyToExit(); -static void hitBossArenaTrigger(); + void hitBossArenaTrigger(); static void levelFinished() {s_levelFinished=true;} static void restartlevel() {s_restartLevel=true;}