1 files changed, 73 insertions, 64 deletions
diff --git a/src/ui/displayinfo.h b/src/ui/displayinfo.h
index 29677d4..2eabbf2 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
@@ -18,73 +19,81 @@
 
 #pragma once
 
+#include <string>
 
-#include "common/struct.h"
-#include "old/camera.h"
+#include "common/event.h"
 
+#include "graphics/engine/camera.h"
 
 class CInstanceManager;
-class CD3DEngine;
-class CEvent;
 class CRobotMain;
-class CCamera;
-class CInterface;
 class CObject;
-class CParticule;
-class CLight;
-
-
-class CDisplayInfo
-{
-public:
-    CDisplayInfo(CInstanceManager* iMan);
-    ~CDisplayInfo();
-
-    bool        EventProcess(const Event &event);
-
-    void        StartDisplayInfo(char *filename, int index, bool bSoluce);
-    void        StopDisplayInfo();
-
-    void        SetPosition(int pos);
-    int         RetPosition();
-
-protected:
-    bool        EventFrame(const Event &event);
-    void        HyperUpdate();
-    void        AdjustDisplayInfo(Math::Point wpos, Math::Point wdim);
-    void        ChangeIndexButton(int index);
-    void        UpdateIndexButton();
-    void        UpdateCopyButton();
-    void        ViewDisplayInfo();
-    CObject*    SearchToto();
-    void        CreateObjectsFile();
-
-protected:
-    CInstanceManager* m_iMan;
-    CD3DEngine* m_engine;
-    CEvent*     m_event;
-    CRobotMain* m_main;
-    CCamera*    m_camera;
-    CInterface* m_interface;
-    CParticule* m_particule;
-    CLight*     m_light;
-
-    bool        m_bInfoMaximized;
-    bool        m_bInfoMinimized;
-
-    int         m_index;
-    CameraType  m_infoCamera;
-    Math::Point     m_infoNormalPos;
-    Math::Point     m_infoNormalDim;
-    Math::Point     m_infoActualPos;
-    Math::Point     m_infoActualDim;
-    Math::Point     m_infoFinalPos;
-    Math::Point     m_infoFinalDim;
-    int         m_lightSuppl;
-    bool        m_bEditLock;
-    bool        m_bInitPause;
-    bool        m_bSoluce;
-    CObject*    m_toto;
-};
-
-
+class CEventQueue;
+
+struct Event;
+
+namespace Gfx {
+    class CEngine;
+    class CParticle;
+    class CLightManager;
+}
+
+namespace Ui {
+    class CInterface;
+
+    class CDisplayInfo
+    {
+    public:
+    //    CDisplayInfo(CInstanceManager* iMan);
+        CDisplayInfo();
+        ~CDisplayInfo();
+
+        bool        EventProcess(const Event &event);
+
+        void        StartDisplayInfo(std::string filename, int index, bool bSoluce);
+        void        StopDisplayInfo();
+
+        void        SetPosition(int pos);
+        int         GetPosition();
+
+    protected:
+        bool        EventFrame(const Event &event);
+        void        HyperUpdate();
+        void        AdjustDisplayInfo(Math::Point wpos, Math::Point wdim);
+        void        ChangeIndexButton(int index);
+        void        UpdateIndexButton();
+        void        UpdateCopyButton();
+        void        ViewDisplayInfo();
+        CObject*    SearchToto();
+        void        CreateObjectsFile();
+
+    protected:
+        CInstanceManager* m_iMan;
+        Gfx::CEngine* m_engine;
+        CEventQueue*     m_event;
+        CRobotMain* m_main;
+        Gfx::CCamera*    m_camera;
+        CInterface* m_interface;
+        Gfx::CParticle* m_particle;
+        Gfx::CLightManager*     m_light;
+
+        bool        m_bInfoMaximized;
+        bool        m_bInfoMinimized;
+
+        int         m_index;
+        Gfx::CameraType  m_infoCamera;
+        Math::Point     m_infoNormalPos;
+        Math::Point     m_infoNormalDim;
+        Math::Point     m_infoActualPos;
+        Math::Point     m_infoActualDim;
+        Math::Point     m_infoFinalPos;
+        Math::Point     m_infoFinalDim;
+        int         m_lightSuppl;
+        bool        m_bEditLock;
+        bool        m_bInitPause;
+        bool        m_bSoluce;
+        CObject*    m_toto;
+    };
+
+
+}