diff options
author | Stijn Buys <ingar@osirion.org> | 2010-09-15 21:29:18 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2010-09-15 21:29:18 +0000 |
commit | e55638d081e2e1ff6fbc06e0e8ac0381a04308e7 (patch) | |
tree | 511ccb478adf2acd3cc93f66d217b09f3e3a06dc /src/client/map.h | |
parent | f612f19e095b8d0ba49f5bcdec6a582824315d69 (diff) |
updated comments, updated buy menu, info support for map window, added const to target selection
Diffstat (limited to 'src/client/map.h')
-rw-r--r-- | src/client/map.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/client/map.h b/src/client/map.h index 1fc1547..e0d8a2d 100644 --- a/src/client/map.h +++ b/src/client/map.h @@ -7,9 +7,11 @@ #ifndef __INCLUDED_CLIENT_MAP_H__ #define __INCLUDED_CLIENT_MAP_H__ -#include "ui/window.h" -#include "ui/label.h" #include "core/entity.h" +#include "core/info.h" +#include "ui/label.h" +#include "ui/scrollpane.h" +#include "ui/window.h" namespace client { @@ -24,6 +26,9 @@ public: return map_hover; } + /// set the map target + void set_target(const core::Entity *entity); + /// toggle the map window void toggle(); @@ -37,12 +42,19 @@ public: virtual bool on_keypress(const int key, const unsigned int modifier); protected: + virtual void resize(); + virtual void draw(); + ui::Label *map_targetlabel; + ui::ScrollPane *map_scrollpane; + unsigned int map_hover; + const core::Entity *map_target; - core::Entity *map_target; - ui::Label *map_targetlabel; + const core::Info *map_inforecord; + unsigned long map_infotimestamp; + ui::Text map_infotext; }; |