diff options
| author | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-11 23:29:00 +0200 |
|---|---|---|
| committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-11 23:29:00 +0200 |
| commit | 44e4bcef45a1e606dcbb4a0b25fac3d649d9ebf9 (patch) | |
| tree | 766038be0bdd2aa940c464e57e5b8e97520c4e66 /src/object/task/tasktake.h | |
| parent | 68d9c61e97522213d27745c4c6dac4c839bff77d (diff) | |
| parent | 064fedb81495d2185a994a5f5a87063cd1b22607 (diff) | |
| download | colobot-44e4bcef45a1e606dcbb4a0b25fac3d649d9ebf9.tar.gz colobot-44e4bcef45a1e606dcbb4a0b25fac3d649d9ebf9.tar.bz2 colobot-44e4bcef45a1e606dcbb4a0b25fac3d649d9ebf9.zip | |
Merge branch 'dev-object' of github.com:adiblol/colobot into dev-object
Diffstat (limited to 'src/object/task/tasktake.h')
| -rw-r--r-- | src/object/task/tasktake.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/object/task/tasktake.h b/src/object/task/tasktake.h index b0553a0..c7950fe 100644 --- a/src/object/task/tasktake.h +++ b/src/object/task/tasktake.h @@ -59,7 +59,8 @@ protected: bool IsFreeDeposeObject(Math::Vector pos); protected: - CTerrain* m_terrain; + //TODO this is same member as in base class, probable should be deleted + Gfx::CTerrain* m_terrain; TaskTakeOrder m_order; TaskTakeArm m_arm; |