diff options
| author | erihel <erihel@gmail.com> | 2013-04-28 20:09:41 +0200 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2013-04-28 20:09:41 +0200 |
| commit | 919b0e8114368132c88d95768b43fc17c70b699d (patch) | |
| tree | 50da6747d6e3dad7e2236a01c6c7a40c910e4a30 /src/object/object.h | |
| parent | 5669053de08bac9726902e96f89aa85b99909399 (diff) | |
| parent | c7d289c00bc60d366f8c5c1016fb30717a228495 (diff) | |
| download | colobot-919b0e8114368132c88d95768b43fc17c70b699d.tar.gz colobot-919b0e8114368132c88d95768b43fc17c70b699d.tar.bz2 colobot-919b0e8114368132c88d95768b43fc17c70b699d.zip | |
Merge branch 'dev' of github:colobot/colobot into dev
Diffstat (limited to 'src/object/object.h')
| -rw-r--r-- | src/object/object.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/object/object.h b/src/object/object.h index 4d8cc02..25ea708 100644 --- a/src/object/object.h +++ b/src/object/object.h @@ -156,6 +156,7 @@ enum ObjectType OBJECT_MOBILEsa = 210, //! < submarine OBJECT_MOBILEtg = 211, //! < training target OBJECT_MOBILEdr = 212, //! < robot drawing + OBJECT_CONTROLLER = 213, //! < mission controller OBJECT_WAYPOINT = 250, //! < waypoint OBJECT_FLAGb = 260, //! < blue flag OBJECT_FLAGr = 261, //! < red flag |