diff options
author | erihel <erihel@gmail.com> | 2013-03-30 16:03:25 +0100 |
---|---|---|
committer | erihel <erihel@gmail.com> | 2013-03-30 16:03:25 +0100 |
commit | b7b5f002a636154033166a2c828765386c14e5a5 (patch) | |
tree | 46950e3f29d20272a9d6344253f5cdf2f29da3b1 /src/object/robotmain.cpp | |
parent | 3569adb10377d83beeb705870f015cc1f40aeffc (diff) | |
download | colobot-b7b5f002a636154033166a2c828765386c14e5a5.tar.gz colobot-b7b5f002a636154033166a2c828765386c14e5a5.tar.bz2 colobot-b7b5f002a636154033166a2c828765386c14e5a5.zip |
* Removed warning while compiling brain.cpp
* Fix for issue #130
* Fix for issue #128 with wrong sound pitch
Diffstat (limited to 'src/object/robotmain.cpp')
-rw-r--r-- | src/object/robotmain.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index c1e4140..4cea7ed 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -1332,7 +1332,7 @@ bool CRobotMain::EventProcess(Event &event) // Management of the console. if (m_phase != PHASE_NAME && !m_movie->IsExist() && - !m_movieLock && !m_editLock && + !m_movieLock && !m_editLock && !m_engine->GetPause() && event.type == EVENT_KEY_DOWN && event.key.key == KEY(PAUSE)) // Pause ? { @@ -1474,8 +1474,9 @@ bool CRobotMain::EventProcess(Event &event) ChangePhase(PHASE_WIN); else if (m_lostDelay > 0.0f) ChangePhase(PHASE_LOST); - else + else if (!m_cmdEdit) { m_dialog->StartAbort(); // do you want to leave? + } } if (event.key.key == KEY(PAUSE)) { |