latest changes

1 files changed, 85 insertions, 73 deletions

diff --git a/src/ui/map.h b/src/ui/map.h
index 693398c..18020af 100644
--- a/src/ui/map.h
+++ b/src/ui/map.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
@@ -22,11 +23,21 @@
 #include <ui/control.h>
 
 #include <object/object.h>
+#include <object/robotmain.h>
 
 #include <common/event.h>
+#include <common/iman.h>
 
-class CTerrain;
-class CWater;
+#include <graphics/engine/terrain.h>
+#include <graphics/engine/water.h>
+#include <graphics/engine/engine.h>
+#include <graphics/core/device.h>
+#include <graphics/core/vertex.h>
+
+#include <math/geometry.h>
+
+
+namespace Ui {
 
 const int MAPMAXOBJECT = 100;
 
@@ -59,77 +70,78 @@ struct MapObject
 
 class CMap : public CControl
 {
-public:
-    CMap();
-    ~CMap();
-
-    bool        Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
-    bool        EventProcess(const Event &event);
-    void        Draw();
-
-    void        UpdateTerrain();
-    void        UpdateTerrain(int bx, int by, int ex, int ey);
-
-    void        SetFixImage(char *filename);
-    bool        RetFixImage();
-
-    void        SetOffset(float ox, float oy);
-    void        SetAngle(float angle);
-    void        SetMode(int mode);
-    void        SetToy(bool bToy);
-    void        SetDebug(bool bDebug);
-
-    void        SetZoom(float value);
-    float       RetZoom();
-
-    void        SetEnable(bool bEnable);
-    bool        RetEnable();
-
-    void        SetFloorColor(D3DCOLORVALUE color);
-    void        SetWaterColor(D3DCOLORVALUE color);
-
-    void        FlushObject();
-    void        UpdateObject(CObject* pObj);
-
-    CObject*    DetectObject(Math::Point pos, bool &bInMap);
-    void        SetHilite(CObject* pObj);
-
-protected:
-    Math::Point     AdjustOffset(Math::Point offset);
-    void        SelectObject(Math::Point pos);
-    Math::Point     MapInter(Math::Point pos, float dir);
-    void        DrawFocus(Math::Point pos, float dir, ObjectType type, MapColor color);
-    void        DrawObject(Math::Point pos, float dir, ObjectType type, MapColor color, bool bSelect, bool bHilite);
-    void        DrawObjectIcon(Math::Point pos, Math::Point dim, MapColor color, ObjectType type, bool bHilite);
-    void        DrawHilite(Math::Point pos);
-    void        DrawTriangle(Math::Point p1, Math::Point p2, Math::Point p3, Math::Point uv1, Math::Point uv2);
-    void        DrawPenta(Math::Point p1, Math::Point p2, Math::Point p3, Math::Point p4, Math::Point p5, Math::Point uv1, Math::Point uv2);
-    void        DrawVertex(Math::Point uv1, Math::Point uv2, float zoom);
-
-protected:
-    CTerrain*       m_terrain;
-    CWater*         m_water;
-    CRobotMain*     m_main;
-
-    bool            m_bEnable;
-    float           m_time;
-    float           m_half;
-    float           m_zoom;
-    Math::Point         m_offset;
-    float           m_angle;
-    D3DCOLORVALUE   m_floorColor;
-    D3DCOLORVALUE   m_waterColor;
-    MapObject       m_map[MAPMAXOBJECT];
-    int             m_totalFix;
-    int             m_totalMove;
-    int             m_hiliteRank;
-    Math::Point         m_mapPos;
-    Math::Point         m_mapDim;
-    bool            m_bRadar;
-    char            m_fixImage[100];
-    int             m_mode;
-    bool            m_bToy;
-    bool            m_bDebug;
+    public:
+        CMap();
+        ~CMap();
+
+        bool        Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        bool        EventProcess(const Event &event);
+        void        Draw();
+
+        void        UpdateTerrain();
+        void        UpdateTerrain(int bx, int by, int ex, int ey);
+
+        void        SetFixImage(const char *filename);
+        bool        GetFixImage();
+
+        void        SetOffset(float ox, float oy);
+        void        SetAngle(float angle);
+        void        SetMode(int mode);
+        void        SetToy(bool bToy);
+        void        SetDebug(bool bDebug);
+
+        void        SetZoom(float value);
+        float       GetZoom();
+
+        void        SetEnable(bool bEnable);
+        bool        GetEnable();
+
+        void        SetFloorColor(Gfx::Color color);
+        void        SetWaterColor(Gfx::Color color);
+
+        void        FlushObject();
+        void        UpdateObject(CObject* pObj);
+
+        CObject*    DetectObject(Math::Point pos, bool &bInMap);
+        void        SetHighlight(CObject* pObj);
+
+    protected:
+        Math::Point AdjustOffset(Math::Point offset);
+        void        SelectObject(Math::Point pos);
+        Math::Point MapInter(Math::Point pos, float dir);
+        void        DrawFocus(Math::Point pos, float dir, ObjectType type, MapColor color);
+        void        DrawObject(Math::Point pos, float dir, ObjectType type, MapColor color, bool bSelect, bool bHilite);
+        void        DrawObjectIcon(Math::Point pos, Math::Point dim, MapColor color, ObjectType type, bool bHilite);
+        void        DrawHighlight(Math::Point pos);
+        void        DrawTriangle(Math::Point p1, Math::Point p2, Math::Point p3, Math::Point uv1, Math::Point uv2);
+        void        DrawPenta(Math::Point p1, Math::Point p2, Math::Point p3, Math::Point p4, Math::Point p5, Math::Point uv1, Math::Point uv2);
+        void        DrawVertex(Math::Point uv1, Math::Point uv2, float zoom);
+
+    protected:
+        Gfx::CTerrain*  m_terrain;
+        Gfx::CWater*    m_water;
+        CRobotMain*     m_main;
+
+        bool            m_bEnable;
+        float           m_time;
+        float           m_half;
+        float           m_zoom;
+        Math::Point     m_offset;
+        float           m_angle;
+        Gfx::Color      m_floorColor;
+        Gfx::Color      m_waterColor;
+        MapObject       m_map[MAPMAXOBJECT];
+        int             m_totalFix;
+        int             m_totalMove;
+        int             m_highlightRank;
+        Math::Point     m_mapPos;
+        Math::Point     m_mapDim;
+        bool            m_bRadar;
+        char            m_fixImage[100];
+        int             m_mode;
+        bool            m_bToy;
+        bool            m_bDebug;
 };
 
 
+}