diff options
| author | erihel <erihel@gmail.com> | 2013-04-11 15:34:03 +0200 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2013-04-11 15:34:03 +0200 |
| commit | b0919139bdda0d0dd1f6935ca6894135517478ab (patch) | |
| tree | 3a74addb055d9122961a49c4d6f55cdb7580201f /src | |
| parent | 01309c8bd0a9ac4476952ec5063499ec980a7b12 (diff) | |
| download | colobot-b0919139bdda0d0dd1f6935ca6894135517478ab.tar.gz colobot-b0919139bdda0d0dd1f6935ca6894135517478ab.tar.bz2 colobot-b0919139bdda0d0dd1f6935ca6894135517478ab.zip | |
* Fix for issue #161: function checking for radar didn't check if it's finished
Diffstat (limited to 'src')
| -rw-r--r-- | src/object/robotmain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 2c890a4..9f95e10 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -6801,10 +6801,10 @@ bool CRobotMain::GetRadar() for (int i = 0; i < 1000000; i++) { CObject* obj = static_cast<CObject*>(iMan->SearchInstance(CLASS_OBJECT, i)); - if (obj == 0) break; + if (obj == nullptr) break; ObjectType type = obj->GetType(); - if (type == OBJECT_RADAR) + if (type == OBJECT_RADAR && !obj->GetLock()) return true; } return false; |