immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed version text disappearing during loading

master
krzys-h 2015-08-06 14:03:07 +02:00
parent f0cfc35356
commit 02417363e4
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/object/robotmain.cpp
View File

@ -376,6 +376,12 @@ bool IsPhaseWithWorld(Phase phase)
return false; return false;
} }
bool IsMainMenuPhase(Phase phase)
{
if (phase == PHASE_LOADING) return true;
return !IsPhaseWithWorld(phase);
}
//! Changes phase //! Changes phase
void CRobotMain::ChangePhase(Phase phase) void CRobotMain::ChangePhase(Phase phase)
{ {

1
src/object/robotmain.h
View File

@ -71,6 +71,7 @@ enum Phase
}; };
bool IsInSimulationConfigPhase(Phase phase); bool IsInSimulationConfigPhase(Phase phase);
bool IsPhaseWithWorld(Phase phase); bool IsPhaseWithWorld(Phase phase);
bool IsMainMenuPhase(Phase phase);
class CController; class CController;

6
src/ui/mainui.cpp
View File

@ -200,7 +200,7 @@ void CMainUserInterface::ChangePhase(Phase phase)
m_currentScreen->CreateInterface(); m_currentScreen->CreateInterface();
} }
if ( !IsPhaseWithWorld(m_phase) ) if ( IsMainMenuPhase(m_phase) )
{ {
if (!m_sound->IsPlayingMusic() && m_sound->IsCachedMusic("Intro1.ogg")) if (!m_sound->IsPlayingMusic() && m_sound->IsCachedMusic("Intro1.ogg"))
{ {
@ -208,7 +208,7 @@ void CMainUserInterface::ChangePhase(Phase phase)
} }
} }
if ( !IsPhaseWithWorld(m_phase) ) if ( IsMainMenuPhase(m_phase) )
{ {
CWindow* pw = static_cast<CWindow*>(m_interface->SearchControl(EVENT_WINDOW5)); CWindow* pw = static_cast<CWindow*>(m_interface->SearchControl(EVENT_WINDOW5));
if (pw != nullptr) if (pw != nullptr)
@ -243,7 +243,7 @@ bool CMainUserInterface::EventProcess(const Event &event)
if ( event.type == EVENT_FRAME ) if ( event.type == EVENT_FRAME )
{ {
if ( !IsPhaseWithWorld(m_phase) ) if ( IsMainMenuPhase(m_phase) )
{ {
if (!m_sound->IsPlayingMusic() && m_sound->IsCachedMusic("Intro2.ogg")) if (!m_sound->IsPlayingMusic() && m_sound->IsCachedMusic("Intro2.ogg"))
{ {