diff options
Diffstat (limited to 'src/ui/map.h')
-rw-r--r-- | src/ui/map.h | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/ui/map.h b/src/ui/map.h index efdf54b..7e80e0a 100644 --- a/src/ui/map.h +++ b/src/ui/map.h @@ -19,16 +19,14 @@ #pragma once -#include "ui/control.h" -#include "object/object.h" +#include <ui/control.h> +#include <object/object.h> + +#include <common/event.h> -class CD3DEngine; class CTerrain; class CWater; -class CRobotMain; - - const int MAPMAXOBJECT = 100; @@ -53,7 +51,7 @@ struct MapObject CObject* object; MapColor color; ObjectType type; - Math::Point pos; + Math::Point pos; float dir; }; @@ -62,10 +60,10 @@ struct MapObject class CMap : public CControl { public: - CMap(CInstanceManager* iMan); + CMap(); ~CMap(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); bool EventProcess(const Event &event); void Draw(); @@ -87,8 +85,8 @@ public: void SetEnable(bool bEnable); bool RetEnable(); - void SetFloorColor(D3DCOLORVALUE color); - void SetWaterColor(D3DCOLORVALUE color); + void SetFloorColor(Gfx::Color color); + void SetWaterColor(Gfx::Color color); void FlushObject(); void UpdateObject(CObject* pObj); @@ -97,9 +95,9 @@ public: void SetHilite(CObject* pObj); protected: - Math::Point AdjustOffset(Math::Point offset); + Math::Point AdjustOffset(Math::Point offset); void SelectObject(Math::Point pos); - Math::Point MapInter(Math::Point pos, float dir); + 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); @@ -117,16 +115,16 @@ protected: float m_time; float m_half; float m_zoom; - Math::Point m_offset; + Math::Point m_offset; float m_angle; - D3DCOLORVALUE m_floorColor; - D3DCOLORVALUE m_waterColor; + Gfx::Color m_floorColor; + Gfx::Color m_waterColor; MapObject m_map[MAPMAXOBJECT]; int m_totalFix; int m_totalMove; int m_hiliteRank; - Math::Point m_mapPos; - Math::Point m_mapDim; + Math::Point m_mapPos; + Math::Point m_mapDim; bool m_bRadar; char m_fixImage[100]; int m_mode; |