From 8b9954fff4f865cb0e078c4e7f7c2a4c1d1caa77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Konopacki?= <konopacki.m@gmail.com>
Date: Thu, 13 Sep 2012 22:14:40 +0200
Subject: brain.* mainmovie.* : Partially rewritten The remaining part will be
 revised and rewritten after merge with dev and dev-ui branches

---
 src/object/brain.h | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'src/object/brain.h')

diff --git a/src/object/brain.h b/src/object/brain.h
index b1ef9bc..b653b1f 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;
     CSoundInterface*    m_sound;
-    CParticle*          m_particle;
+
     CTaskManager*       m_primaryTask;
     CTaskManager*       m_secondaryTask;
 
-- 
cgit v1.2.3-1-g7c22


From a1400f496bbe9f78f71736dce43863b6833be669 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Sat, 15 Sep 2012 15:33:08 +0200
Subject: CRobotMain rewrite

- rewritten CRobotMain
- won't compile yet because of dependencies to CMainDialog
---
 src/object/brain.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/object/brain.h')

diff --git a/src/object/brain.h b/src/object/brain.h
index b653b1f..3db5b4c 100644
--- a/src/object/brain.h
+++ b/src/object/brain.h
@@ -178,7 +178,7 @@ protected:
     Ui::CInterface*     m_interface;
     Ui::CDisplayText*   m_displayText;
     CRobotMain*         m_main;
-    CStudio*            m_studio;
+    Ui::CStudio*        m_studio;
     CSoundInterface*    m_sound;
 
     CTaskManager*       m_primaryTask;
-- 
cgit v1.2.3-1-g7c22