diff options
author | Piotr Dziwiński <piotrdz@gmail.com> | 2012-09-13 09:09:41 -0700 |
---|---|---|
committer | Piotr Dziwiński <piotrdz@gmail.com> | 2012-09-13 09:09:41 -0700 |
commit | e9fcec9de52471508933c9d90cc6041ce0af9752 (patch) | |
tree | 81d0674e4b54e95dad5508948491a26d9d5522da /src/ui/target.h | |
parent | 8b2bca72dd71a1c23db51269a147443c80758f10 (diff) | |
parent | 01cc0fbc49696a19a56dfdd8359d4bb77e868925 (diff) | |
download | colobot-e9fcec9de52471508933c9d90cc6041ce0af9752.tar.gz colobot-e9fcec9de52471508933c9d90cc6041ce0af9752.tar.bz2 colobot-e9fcec9de52471508933c9d90cc6041ce0af9752.zip |
Merge pull request #45 from Erihel/dev-ui
Changes from dev-ui in erihel's fork
Diffstat (limited to 'src/ui/target.h')
-rw-r--r-- | src/ui/target.h | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/src/ui/target.h b/src/ui/target.h index ae0c7af..1f7f256 100644 --- a/src/ui/target.h +++ b/src/ui/target.h @@ -18,31 +18,38 @@ #pragma once +#include <string> -#include "ui/control.h" +#include <ui/control.h> +#include <common/misc.h> +#include <common/iman.h> +#include <common/restext.h> +#include <common/event.h> -class CD3DEngine; -class CObject; +#include <graphics/engine/engine.h> +#include <object/robotmain.h> +#include <object/object.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, std::string &name); -protected: + protected: + CObject* DetectFriendObject(Math::Point pos); }; +} |