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

Fixed cheat console in main menu

master
krzys-h 2015-04-06 17:23:18 +02:00
parent 1dd3a4d57e
commit 2f5d4e3b2f
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/object/robotmain.cpp
View File

@ -688,18 +688,20 @@ bool CRobotMain::ProcessEvent(Event &event)
} }
// Management of the console. // Management of the console.
if (m_phase != PHASE_NAME && if (event.type == EVENT_KEY_DOWN &&
!m_movie->IsExist() &&
!m_movieLock && !m_editLock && !m_engine->GetPause() &&
event.type == EVENT_KEY_DOWN &&
event.key.key == KEY(BACKQUOTE)) // Pause ? event.key.key == KEY(BACKQUOTE)) // Pause ?
{ {
Ui::CEdit* pe = static_cast<Ui::CEdit*>(m_interface->SearchControl(EVENT_CMD)); if(m_phase != PHASE_NAME &&
if (pe == nullptr) return false; !m_movie->IsExist() &&
pe->SetState(Ui::STATE_VISIBLE); !m_movieLock && !m_editLock && !m_engine->GetPause())
pe->SetFocus(true); {
if (m_phase == PHASE_SIMUL) ChangePause(PAUSE_CHEAT); Ui::CEdit* pe = static_cast<Ui::CEdit*>(m_interface->SearchControl(EVENT_CMD));
m_cmdEdit = true; if (pe == nullptr) return false;
pe->SetState(Ui::STATE_VISIBLE);
pe->SetFocus(true);
if (m_phase == PHASE_SIMUL) ChangePause(PAUSE_CHEAT);
m_cmdEdit = true;
}
return false; return false;
} }
if (event.type == EVENT_KEY_DOWN && if (event.type == EVENT_KEY_DOWN &&

18
src/ui/maindialog.cpp
View File

@ -1845,17 +1845,17 @@ bool CMainDialog::EventProcess(const Event &event)
if ( m_phase == PHASE_WELCOME1 && m_phaseTime >= welcomeLength ) if ( m_phase == PHASE_WELCOME1 && m_phaseTime >= welcomeLength )
{ {
ChangePhase(PHASE_WELCOME2); m_main->ChangePhase(PHASE_WELCOME2);
return true; return true;
} }
if ( m_phase == PHASE_WELCOME2 && m_phaseTime >= welcomeLength ) if ( m_phase == PHASE_WELCOME2 && m_phaseTime >= welcomeLength )
{ {
ChangePhase(PHASE_WELCOME3); m_main->ChangePhase(PHASE_WELCOME3);
return true; return true;
} }
if ( m_phase == PHASE_WELCOME3 && m_phaseTime >= welcomeLength ) if ( m_phase == PHASE_WELCOME3 && m_phaseTime >= welcomeLength )
{ {
ChangePhase(PHASE_NAME); m_main->ChangePhase(PHASE_NAME);
return true; return true;
} }
@ -1984,7 +1984,9 @@ bool CMainDialog::EventProcess(const Event &event)
//? StartQuit(); // would you leave? //? StartQuit(); // would you leave?
m_sound->Play(SOUND_TZOING); m_sound->Play(SOUND_TZOING);
m_main->ChangePhase(PHASE_GENERIC); m_main->ChangePhase(PHASE_GENERIC);
return false;
} }
return true;
break; break;
case EVENT_INTERFACE_QUIT: case EVENT_INTERFACE_QUIT:
@ -2022,7 +2024,7 @@ bool CMainDialog::EventProcess(const Event &event)
break; break;
default: default:
break; return true;
} }
return false; return false;
} }
@ -2271,7 +2273,7 @@ bool CMainDialog::EventProcess(const Event &event)
break; break;
default: default:
break; return true;
} }
return false; return false;
} }
@ -2774,7 +2776,7 @@ bool CMainDialog::EventProcess(const Event &event)
if ( event.type == EVENT_KEY_DOWN || if ( event.type == EVENT_KEY_DOWN ||
event.type == EVENT_MOUSE_BUTTON_DOWN ) event.type == EVENT_MOUSE_BUTTON_DOWN )
{ {
ChangePhase(PHASE_WELCOME2); m_main->ChangePhase(PHASE_WELCOME2);
return true; return true;
} }
} }
@ -2783,7 +2785,7 @@ bool CMainDialog::EventProcess(const Event &event)
if ( event.type == EVENT_KEY_DOWN || if ( event.type == EVENT_KEY_DOWN ||
event.type == EVENT_MOUSE_BUTTON_DOWN ) event.type == EVENT_MOUSE_BUTTON_DOWN )
{ {
ChangePhase(PHASE_WELCOME3); m_main->ChangePhase(PHASE_WELCOME3);
return true; return true;
} }
} }
@ -2792,7 +2794,7 @@ bool CMainDialog::EventProcess(const Event &event)
if ( event.type == EVENT_KEY_DOWN || if ( event.type == EVENT_KEY_DOWN ||
event.type == EVENT_MOUSE_BUTTON_DOWN ) event.type == EVENT_MOUSE_BUTTON_DOWN )
{ {
ChangePhase(PHASE_NAME); m_main->ChangePhase(PHASE_NAME);
return true; return true;
} }
} }