diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2014-10-07 22:15:40 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2014-10-07 22:15:40 +0200 |
| commit | 5274acd624c3a5ad60592cee2ebc869b10a96fda (patch) | |
| tree | 04836157b8c3aa9553d5e67e8ed248220ff1661a /src/object/brain.h | |
| parent | 3ef2f976df56817d2a23d4fe88a1917798beaacd (diff) | |
| parent | 2770ee8927cb91419b1918f46228435026790cf6 (diff) | |
| download | colobot-5274acd624c3a5ad60592cee2ebc869b10a96fda.tar.gz colobot-5274acd624c3a5ad60592cee2ebc869b10a96fda.tar.bz2 colobot-5274acd624c3a5ad60592cee2ebc869b10a96fda.zip | |
Merge with dev
Diffstat (limited to 'src/object/brain.h')
| -rw-r--r-- | src/object/brain.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/object/brain.h b/src/object/brain.h index a1f5da7..6b0d790 100644 --- a/src/object/brain.h +++ b/src/object/brain.h @@ -102,6 +102,7 @@ public: int GetProgram(); void StopProgram(); void StopTask(); + void StopSecondaryTask(); bool IntroduceVirus(); void SetActiveVirus(bool bActive); @@ -128,7 +129,7 @@ public: Error StartTaskBuild(ObjectType type); Error StartTaskSearch(); Error StartTaskTerraform(); - Error StartTaskPen(bool bDown, int color); + Error StartTaskPen(bool down, int color); Error StartTaskRecover(); Error StartTaskShield(TaskShieldMode mode); Error StartTaskFire(float delay); |