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

Fixed problems with motor() + fire() in CBot while the robot was selected

master
krzys-h 2015-08-17 18:26:09 +02:00
parent 1059ae37c1
commit 0bff05f095
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/object/old_object.cpp
View File

@ -2030,14 +2030,14 @@ bool COldObject::EventProcess(const Event &event)
else if (GetSelect()) else if (GetSelect())
{ {
bool canMove = true; bool canMove = true;
if (Implements(ObjectInterfaceType::Programmable))
{
canMove = canMove && !IsProgram();
}
if (Implements(ObjectInterfaceType::TaskExecutor)) if (Implements(ObjectInterfaceType::TaskExecutor))
{ {
canMove = canMove || (IsForegroundTask() && GetForegroundTask()->IsPilot()); canMove = canMove || (IsForegroundTask() && GetForegroundTask()->IsPilot());
} }
if (Implements(ObjectInterfaceType::Programmable))
{
canMove = canMove && !IsProgram();
}
if ( canMove ) if ( canMove )
{ {