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 18:37:32 +00:00
parent 52791b39f1
commit aa4a3e55a3
2 changed files with 3 additions and 3 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) if(m_gamestate==GAMESTATE_PLAYING&&!m_player->isDead())
{ {
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) if(!s_showBossTextOnRespawn&&!m_player->isDead())
{ {
s_justHitBossArenaTrigger=true; s_justHitBossArenaTrigger=true;
s_showBossTextOnRespawn=true; s_showBossTextOnRespawn=true;

2
source/game/game.h
View file

@ -53,7 +53,7 @@ virtual int canPause();
void sendEvent( GAME_EVENT evt, class CThing *sourceThing ); void sendEvent( GAME_EVENT evt, class CThing *sourceThing );
static void setReadyToExit(); static void setReadyToExit();
static void hitBossArenaTrigger(); void hitBossArenaTrigger();
static void levelFinished() {s_levelFinished=true;} static void levelFinished() {s_levelFinished=true;}
static void restartlevel() {s_restartLevel=true;} static void restartlevel() {s_restartLevel=true;}