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

Fixes for issue #648 and #631

dev-time-step
tomangelo2 2016-02-09 20:05:04 +01:00
parent bdf99f3de5
commit 1fc9186aaf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/level/robotmain.cpp
View File

@ -459,6 +459,7 @@ void CRobotMain::ChangePhase(Phase phase)
m_interface->Flush(); m_interface->Flush();
FlushNewScriptName(); FlushNewScriptName();
m_sound->SetListener(Math::Vector(0.0f, 0.0f, 0.0f), Math::Vector(0.0f, 0.0f, 1.0f)); m_sound->SetListener(Math::Vector(0.0f, 0.0f, 0.0f), Math::Vector(0.0f, 0.0f, 1.0f));
m_sound->StopAll();
m_camera->SetType(Gfx::CAM_TYPE_DIALOG); m_camera->SetType(Gfx::CAM_TYPE_DIALOG);
m_movie->Flush(); m_movie->Flush();
m_movieInfoIndex = -1; m_movieInfoIndex = -1;
@ -707,8 +708,8 @@ bool CRobotMain::ProcessEvent(Event &event)
} }
// Management of the console. // Management of the console.
if (event.type == EVENT_KEY_DOWN && if (event.type == EVENT_TEXT_INPUT &&
event.GetData<KeyEventData>()->key == KEY(BACKQUOTE)) // Pause ? event.GetData<TextInputData>()->text[0] == KEY(BACKQUOTE)) // Pause ?
{ {
if (m_phase != PHASE_PLAYER_SELECT && if (m_phase != PHASE_PLAYER_SELECT &&
!m_movie->IsExist() && !m_movie->IsExist() &&