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/brain.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/brain.h')
-rw-r--r-- | src/object/brain.h | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/object/brain.h b/src/object/brain.h index b1ef9bc..3db5b4c 100644 --- a/src/object/brain.h +++ b/src/object/brain.h @@ -21,8 +21,9 @@ // #include <stdio.h> -#include "common/misc.h" #include "common/event.h" +#include "common/misc.h" + #include "object/object.h" #include "object/task/taskmanip.h" #include "object/task/taskflag.h" @@ -34,23 +35,23 @@ class CObject; class CPhysics; class CMotion; class CTaskManager; -class CInterface; -class CWindow; -class CDisplayText; class CScript; class CRobotMain; -class CStudio; class CSoundInterface; -class CParticle; -namespace Gfx -{ +namespace Ui { +class CStudio; +class CInterface; +class CWindow; +class CDisplayText; +} +namespace Gfx { class CEngine; class CTerrain; class CWater; class CCamera; - +class CParticle; } /* Gfx */ @@ -149,14 +150,14 @@ protected: void GroundFlat(); void ColorFlag(int color); - void UpdateScript(CWindow *pw); + void UpdateScript(Ui::CWindow *pw); int GetSelScript(); void BlinkScript(bool bEnable); - void CheckInterface(CWindow *pw, EventType event, bool bState); - void EnableInterface(CWindow *pw, EventType event, bool bState); - void DeadInterface(CWindow *pw, EventType event, bool bState); - void DefaultEnter(CWindow *pw, EventType event, bool bState=true); + void CheckInterface(Ui::CWindow *pw, EventType event, bool bState); + void EnableInterface(Ui::CWindow *pw, EventType event, bool bState); + void DeadInterface(Ui::CWindow *pw, EventType event, bool bState); + void DefaultEnter(Ui::CWindow *pw, EventType event, bool bState=true); void TraceRecordStart(); void TraceRecordFrame(); @@ -170,15 +171,16 @@ protected: Gfx::CTerrain* m_terrain; Gfx::CWater* m_water; Gfx::CCamera* m_camera; + Gfx::CParticle* m_particle; CObject* m_object; CPhysics* m_physics; CMotion* m_motion; - CInterface* m_interface; - CDisplayText* m_displayText; + Ui::CInterface* m_interface; + Ui::CDisplayText* m_displayText; CRobotMain* m_main; - CStudio* m_studio; + Ui::CStudio* m_studio; CSoundInterface* m_sound; - CParticle* m_particle; + CTaskManager* m_primaryTask; CTaskManager* m_secondaryTask; |