diff --git a/source/game/bosstext.cpp b/source/game/bosstext.cpp index f16743198..8b0cd7da4 100644 --- a/source/game/bosstext.cpp +++ b/source/game/bosstext.cpp @@ -254,24 +254,23 @@ void CBossText::render() sFrameHdr *fh1,*fh2; int width; - y=210; + m_fontBank->setJustification(FontBank::JUST_LEFT); - y+=13; fh1=sb->getFrameHeader(FRM__BUTX); - width=fh1->W+10+m_fontBank->getStringWidth(STR__BOSS__CROSS_BUTTON); - x=256-(width/2); - sb->printFT4(fh1,x,y+3,0,0,0); - x+=fh1->W+10; - m_fontBank->print(x,y,STR__BOSS__CROSS_BUTTON); + width=fh1->W+INSTRUCTIONS_GAP_BETWEEN_BUTTONS_AND_TEXT+m_fontBank->getStringWidth(STR__BOSS__CROSS_BUTTON); + x=128-(width/2); + sb->printFT4(fh1,x,INSTRUCTIONS_Y_POS+INSTRUCTIONS_BUTTON_Y_OFFSET,0,0,0); + x+=fh1->W+INSTRUCTIONS_GAP_BETWEEN_BUTTONS_AND_TEXT; + m_fontBank->print(x,INSTRUCTIONS_Y_POS,STR__BOSS__CROSS_BUTTON); - y+=13; fh1=sb->getFrameHeader(FRM__BUTT); - width=fh1->W+10+m_fontBank->getStringWidth(STR__BOSS__TRIANGLE_BUTTON); - x=256-(width/2); - sb->printFT4(fh1,x,y+3,0,0,0); - x+=fh1->W+10; - m_fontBank->print(x,y,STR__BOSS__TRIANGLE_BUTTON); + width=fh1->W+INSTRUCTIONS_GAP_BETWEEN_BUTTONS_AND_TEXT+m_fontBank->getStringWidth(STR__BOSS__TRIANGLE_BUTTON); + x=256+128-(width/2); + sb->printFT4(fh1,x,INSTRUCTIONS_Y_POS+INSTRUCTIONS_BUTTON_Y_OFFSET,0,0,0); + x+=fh1->W+INSTRUCTIONS_GAP_BETWEEN_BUTTONS_AND_TEXT; + m_fontBank->print(x,INSTRUCTIONS_Y_POS,STR__BOSS__TRIANGLE_BUTTON); + m_fontBank->setJustification(FontBank::JUST_CENTRE); } /*---------------------------------------------------------------------- diff --git a/source/game/bosstext.h b/source/game/bosstext.h index ee2d12bff..086f392a2 100644 --- a/source/game/bosstext.h +++ b/source/game/bosstext.h @@ -58,6 +58,12 @@ private: } BOSS_DATA; static const BOSS_DATA s_bossData[]; + enum + { + INSTRUCTIONS_Y_POS=215, + INSTRUCTIONS_GAP_BETWEEN_BUTTONS_AND_TEXT=2, + INSTRUCTIONS_BUTTON_Y_OFFSET=3, + }; class FontBank *m_fontBank; class ScalableFontBank *m_scalableFontBank; diff --git a/source/game/game.cpp b/source/game/game.cpp index 5734afb41..9efd54997 100644 --- a/source/game/game.cpp +++ b/source/game/game.cpp @@ -212,12 +212,11 @@ void CGameScene::init() m_HealthManager= new ("Health Manager") CHealthManager(); m_HealthManager->init(); - m_bossText->init(); - s_readyToExit=false; s_restartLevel=false; m_bossText=new ("BossText") CBossText(); + m_bossText->init(); CFader::setFadingIn(); CLevel::setIsBossRespawn(false); @@ -749,6 +748,7 @@ void CGameScene::initLevel() m_musicStarted=false; SetPadRescan(); + StopLoad(); SYSTEM_DBGMSG("InitLevelDone\n"); }