Merge with changes from Zaba999 fork.

1 files changed, 13 insertions, 16 deletions

diff --git a/src/ui/target.h b/src/ui/target.h
index ae0c7af..0b5b67d 100644
--- a/src/ui/target.h
+++ b/src/ui/target.h
@@ -19,30 +19,27 @@
 #pragma once
 
 
-#include "ui/control.h"
-
-
-class CD3DEngine;
-class CObject;
+#include <ui/control.h>
 
+#include <common/event.h>
 
+namespace Ui {
 
 class CTarget : public CControl
 {
-public:
-    CTarget(CInstanceManager* iMan);
-    ~CTarget();
-
-    bool        Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
+    public:
+        CTarget();
+        ~CTarget();
 
-    bool        EventProcess(const Event &event);
-    void        Draw();
-    bool        GetTooltip(Math::Point pos, char* name);
+        bool        Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
 
-protected:
-    CObject*    DetectFriendObject(Math::Point pos);
+        bool        EventProcess(const Event &event);
+        void        Draw();
+        bool        GetTooltip(Math::Point pos, char* name);
 
-protected:
+    protected:
+        CObject*    DetectFriendObject(Math::Point pos);
 };
 
 
+}