This commit is contained in:
parent
52791b39f1
commit
aa4a3e55a3
@ -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;
|
||||
|
@ -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;}
|
||||
|
Loading…
Reference in New Issue
Block a user