diff options
| author | krzys-h <krzys_h@interia.pl> | 2013-04-29 17:26:32 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2013-04-29 17:26:32 +0200 |
| commit | 75950c55ba2065e792dc573adbaa31897cbc113a (patch) | |
| tree | c0fb55c900d056550b3383e1ef9979b6664ca85e /src/script | |
| parent | c2932f4ee3c65aa5546a8b2fd605af9043aba72a (diff) | |
| download | colobot-75950c55ba2065e792dc573adbaa31897cbc113a.tar.gz colobot-75950c55ba2065e792dc573adbaa31897cbc113a.tar.bz2 colobot-75950c55ba2065e792dc573adbaa31897cbc113a.zip | |
MissionController improved
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/cmdtoken.cpp | 2 | ||||
| -rw-r--r-- | src/script/script.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/script/cmdtoken.cpp b/src/script/cmdtoken.cpp index ab0528b..9c97f7d 100644 --- a/src/script/cmdtoken.cpp +++ b/src/script/cmdtoken.cpp @@ -401,6 +401,7 @@ ObjectType GetTypeObject(char *line, int rank, ObjectType def) if ( Cmd(p, "ApolloAntenna" ) ) return OBJECT_APOLLO5; if ( Cmd(p, "Me" ) ) return OBJECT_HUMAN; if ( Cmd(p, "Tech" ) ) return OBJECT_TECH; + if ( Cmd(p, "MissionController" ) ) return OBJECT_CONTROLLER; return def; } @@ -647,6 +648,7 @@ const char* GetTypeObject(ObjectType type) if ( type == OBJECT_APOLLO5 ) return "ApolloAntenna"; if ( type == OBJECT_HUMAN ) return "Me"; if ( type == OBJECT_TECH ) return "Tech"; + if ( type == OBJECT_CONTROLLER ) return "MissionController"; return ""; } diff --git a/src/script/script.cpp b/src/script/script.cpp index c9e3c66..9f002a7 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -668,7 +668,7 @@ bool CScript::rRadar(CBotVar* var, CBotVar* result, int& exception, void* user) if ( pObj->GetProxyActivate() ) continue; oType = pObj->GetType(); - if ( oType == OBJECT_TOTO ) continue; + if ( oType == OBJECT_TOTO || oType == OBJECT_CONTROLLER ) continue; if ( oType == OBJECT_RUINmobilew2 || oType == OBJECT_RUINmobilet1 || |