diff options
| author | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 16:54:35 +0200 |
|---|---|---|
| committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 16:54:35 +0200 |
| commit | 95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65 (patch) | |
| tree | 4bca38da7bc4983d47192adfcc3cc01407cfb776 /src/object/auto/auto.h | |
| parent | d439f4fa93eb45175dcdfa773af8f68efa1bad9d (diff) | |
| parent | a1400f496bbe9f78f71736dce43863b6833be669 (diff) | |
| download | colobot-95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65.tar.gz colobot-95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65.tar.bz2 colobot-95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65.zip | |
Merge branch 'dev-object' into dev
Conflicts:
src/object/robotmain.cpp
src/object/robotmain.h
Diffstat (limited to 'src/object/auto/auto.h')
| -rw-r--r-- | src/object/auto/auto.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/auto/auto.h b/src/object/auto/auto.h index be7e66b..dd55904 100644 --- a/src/object/auto/auto.h +++ b/src/object/auto/auto.h @@ -95,8 +95,8 @@ protected: Gfx::CLightManager* m_lightMan; Gfx::CTerrain* m_terrain; Gfx::CWater* m_water; - Gfx::CCloud * m_cloud; - Gfx::CPlanet * m_planet; + Gfx::CCloud* m_cloud; + Gfx::CPlanet* m_planet; Gfx::CLightning* m_lightning; Gfx::CCamera* m_camera; Ui::CInterface* m_interface; |