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

Fixed some manual control being allowed in code battles, closes #644

dev-time-step
krzys-h 2016-02-13 21:05:07 +01:00
parent 8ce5c3ab4c
commit 9b5d9ed893
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui/object_interface.cpp
View File

@ -441,7 +441,7 @@ bool CObjectInterface::EventProcess(const Event &event)
err = ERR_OK; err = ERR_OK;
if ( !m_programmable->IsProgram() ) if ( !m_programmable->IsProgram() && m_main->CanPlayerInteract() )
{ {
if ( action == EVENT_OBJECT_HTAKE ) 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 ) if ( m_camera->GetType() != Gfx::CAM_TYPE_ONBOARD )
{ {