[colobot] 273/377: Fixed some manual control being allowed in code battles, closes #644

[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 9b5d9ed893f8a0a9c50d1cf7d6a2a1cf24de9875
Author: krzys-h <krzys_h at interia.pl>
Date:   Sat Feb 13 21:05:07 2016 +0100

    Fixed some manual control being allowed in code battles, closes #644
---
 src/ui/object_interface.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/object_interface.cpp b/src/ui/object_interface.cpp
index 8bdd9cc..81a6800 100644
--- a/src/ui/object_interface.cpp
+++ b/src/ui/object_interface.cpp
@@ -441,7 +441,7 @@ bool CObjectInterface::EventProcess(const Event &event)
 
     err = ERR_OK;
 
-    if ( !m_programmable->IsProgram() )
+    if ( !m_programmable->IsProgram() && m_main->CanPlayerInteract() )
     {
         if ( action == EVENT_OBJECT_HTAKE )
         {
@@ -598,7 +598,7 @@ bool CObjectInterface::EventProcess(const Event &event)
             }
         }
 
-        if ( action == EVENT_OBJECT_FIRE && !m_taskExecutor->IsForegroundTask() && !m_object->GetTrainer())
+        if ( action == EVENT_OBJECT_FIRE && !m_taskExecutor->IsForegroundTask() && !m_object->GetTrainer() )
         {
             if ( m_camera->GetType() != Gfx::CAM_TYPE_ONBOARD )
             {

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