Further improvements in UI porting

1 files changed, 28 insertions, 14 deletions

diff --git a/src/ui/displayinfo.h b/src/ui/displayinfo.h
index 29677d4..a405363 100644
--- a/src/ui/displayinfo.h
+++ b/src/ui/displayinfo.h
@@ -1,5 +1,6 @@
 // * This file is part of the COLOBOT source code
 // * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
+// * Copyright (C) 2012, Polish Portal of Colobot (PPC)
 // *
 // * This program is free software: you can redistribute it and/or modify
 // * it under the terms of the GNU General Public License as published by
@@ -19,25 +20,37 @@
 #pragma once
 
 
-#include "common/struct.h"
-#include "old/camera.h"
+//#include "common/struct.h"
+//#include "graphics/engine/engine.h"
+//#include "graphics/engine/camera.h"
+//#include "graphics/engine/particle.h"
+//#include "old/camera.h"
 
 
 class CInstanceManager;
-class CD3DEngine;
+//class CD3DEngine;
 class CEvent;
 class CRobotMain;
-class CCamera;
-class CInterface;
+//class CCamera;
+
 class CObject;
-class CParticule;
+//class CLight;
+
+namespace Gfx {
+class CEngine;
+class Camera;
+class Particle;
 class CLight;
+}
 
+namespace Ui {
+class CInterface;
 
 class CDisplayInfo
 {
 public:
-    CDisplayInfo(CInstanceManager* iMan);
+//    CDisplayInfo(CInstanceManager* iMan);
+    CDisplayInfo();
     ~CDisplayInfo();
 
     bool        EventProcess(const Event &event);
@@ -46,7 +59,7 @@ public:
     void        StopDisplayInfo();
 
     void        SetPosition(int pos);
-    int         RetPosition();
+    int         GetPosition();
 
 protected:
     bool        EventFrame(const Event &event);
@@ -61,19 +74,19 @@ protected:
 
 protected:
     CInstanceManager* m_iMan;
-    CD3DEngine* m_engine;
-    CEvent*     m_event;
+    Gfx::CEngine* m_engine;
+    CEventQueue*     m_event;
     CRobotMain* m_main;
-    CCamera*    m_camera;
+    Gfx::CCamera*    m_camera;
     CInterface* m_interface;
-    CParticule* m_particule;
-    CLight*     m_light;
+    Gfx::CParticle* m_particle;
+    Gfx::CLight*     m_light;
 
     bool        m_bInfoMaximized;
     bool        m_bInfoMinimized;
 
     int         m_index;
-    CameraType  m_infoCamera;
+    Gfx::CameraType  m_infoCamera;
     Math::Point     m_infoNormalPos;
     Math::Point     m_infoNormalDim;
     Math::Point     m_infoActualPos;
@@ -88,3 +101,4 @@ protected:
 };
 
 
+}