[colobot] 250/377: Fixes for issue #648 and #631

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 1fc9186aaf9fa4e45a89a55a989fe21df3e26f3a
Author: tomangelo2 <tomangelo at wp.pl>
Date:   Tue Feb 9 20:05:04 2016 +0100

    Fixes for issue #648 and #631
---
 src/level/robotmain.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp
index 99886f4..9214c51 100644
--- a/src/level/robotmain.cpp
+++ b/src/level/robotmain.cpp
@@ -459,6 +459,7 @@ void CRobotMain::ChangePhase(Phase phase)
         m_interface->Flush();
         FlushNewScriptName();
         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_movie->Flush();
         m_movieInfoIndex = -1;
@@ -707,8 +708,8 @@ bool CRobotMain::ProcessEvent(Event &event)
     }
 
     // Management of the console.
-    if (event.type == EVENT_KEY_DOWN &&
-        event.GetData<KeyEventData>()->key == KEY(BACKQUOTE))  // Pause ?
+    if (event.type == EVENT_TEXT_INPUT &&
+        event.GetData<TextInputData>()->text[0] == KEY(BACKQUOTE)) // Pause ?
     {
         if (m_phase != PHASE_PLAYER_SELECT &&
             !m_movie->IsExist()   &&

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git