diff options
| author | erihel <erihel@gmail.com> | 2013-03-23 20:33:14 +0100 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2013-03-23 20:33:14 +0100 |
| commit | 956efb1feb7767c2845c8d6d241f036c179f6adf (patch) | |
| tree | 49a685d78f98cd5fb892843696ab13b7b774c67f /src/object/robotmain.cpp | |
| parent | 25c3ba0d3b06fe4e63f3dab4f80f596026b36377 (diff) | |
| download | colobot-956efb1feb7767c2845c8d6d241f036c179f6adf.tar.gz colobot-956efb1feb7767c2845c8d6d241f036c179f6adf.tar.bz2 colobot-956efb1feb7767c2845c8d6d241f036c179f6adf.zip | |
* Blocked cheat input in SatCom, intro movie and while editing cbot (issue #130)
Diffstat (limited to 'src/object/robotmain.cpp')
| -rw-r--r-- | src/object/robotmain.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index b3f269c..55a9b86 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -1331,6 +1331,7 @@ bool CRobotMain::EventProcess(Event &event) // Management of the console. if (m_phase != PHASE_NAME && !m_movie->IsExist() && + !m_movieLock && !m_editLock && event.type == EVENT_KEY_DOWN && event.key.key == KEY(PAUSE)) // Pause ? { @@ -2090,6 +2091,8 @@ void CRobotMain::StartDisplayInfo(const char *filename, int index) //! End of displaying of instructions void CRobotMain::StopDisplayInfo() { + if (m_cmdEdit) return; + if (m_movieInfoIndex != -1) // film to read the SatCom? m_movie->Start(MM_SATCOMclose, 2.0f); |