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

Fixed shortcuts behavior 

It was kinda broken after implementing code battles
Also, fixed overlap of shortcuts bar with cheat console
master
krzys-h 2015-07-14 21:32:08 +02:00
parent a1a96c62ab
commit e1223ff881
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/object/robotmain.cpp
View File

@ -510,8 +510,8 @@ void CRobotMain::ChangePhase(Phase phase)
// Creates and hide the command console. // Creates and hide the command console.
dim.x = 200.0f/640.0f; dim.x = 200.0f/640.0f;
dim.y = 18.0f/480.0f; dim.y = 18.0f/480.0f;
pos.x = 50.0f/640.0f; pos.x = 20.0f/640.0f;
pos.y = 452.0f/480.0f; pos.y = 100.0f/480.0f;
Ui::CEdit* pe = static_cast<Ui::CEdit*>(m_interface->CreateEdit(pos, dim, 0, EVENT_CMD)); Ui::CEdit* pe = static_cast<Ui::CEdit*>(m_interface->CreateEdit(pos, dim, 0, EVENT_CMD));
if (pe == nullptr) return; if (pe == nullptr) return;
pe->ClearState(Ui::STATE_VISIBLE); pe->ClearState(Ui::STATE_VISIBLE);
@ -704,7 +704,7 @@ bool CRobotMain::ProcessEvent(Event &event)
{ {
if (m_phase != PHASE_NAME && if (m_phase != PHASE_NAME &&
!m_movie->IsExist() && !m_movie->IsExist() &&
!m_movieLock && !m_editLock && !m_engine->GetPause()) !m_movieLock && !m_editLock)
{ {
Ui::CEdit* pe = static_cast<Ui::CEdit*>(m_interface->SearchControl(EVENT_CMD)); Ui::CEdit* pe = static_cast<Ui::CEdit*>(m_interface->SearchControl(EVENT_CMD));
if (pe == nullptr) return false; if (pe == nullptr) return false;
@ -1197,8 +1197,8 @@ void CRobotMain::ExecuteCmd(char *cmd)
if (m_freePhoto) if (m_freePhoto)
{ {
m_camera->SetType(Gfx::CAM_TYPE_FREE); m_camera->SetType(Gfx::CAM_TYPE_FREE);
ChangePause(PAUSE_PHOTO);
DeselectAll(); // removes the control buttons DeselectAll(); // removes the control buttons
ChangePause(PAUSE_PHOTO);
m_map->ShowMap(false); m_map->ShowMap(false);
m_displayText->HideText(true); m_displayText->HideText(true);
} }

7
src/ui/mainshort.cpp
View File

@ -128,9 +128,13 @@ bool CMainShort::CreateShortcuts()
m_engine->GetPause()) ) // hangs during edition? m_engine->GetPause()) ) // hangs during edition?
{ {
m_interface->CreateShortcut(pos, dim, 6, EVENT_OBJECT_EDITLOCK); m_interface->CreateShortcut(pos, dim, 6, EVENT_OBJECT_EDITLOCK);
if(!m_engine->GetPause()) if(!m_engine->GetPause() || CPauseManager::GetInstancePointer()->GetPauseType() == PAUSE_DIALOG)
return true; return true;
} }
if (m_main->GetFreePhoto() && m_main->GetSelect() == nullptr)
{
return true;
}
rank = 0; rank = 0;
@ -359,4 +363,3 @@ void CMainShort::SetHighlight(CObject* pObj)
} }
} }