From beefcbd30e5cb1b700c977090021cd4784989c1e Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Fri, 8 Nov 2013 13:20:45 +0000 Subject: Added player reputation window, minor cosmetic user interface changes. --- src/client/gamewindow.h | 70 +++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 31 deletions(-) (limited to 'src/client/gamewindow.h') diff --git a/src/client/gamewindow.h b/src/client/gamewindow.h index 158e6ea..6808eac 100644 --- a/src/client/gamewindow.h +++ b/src/client/gamewindow.h @@ -7,23 +7,24 @@ #ifndef __INCLUDED_CLIENT_GAMEWINDOW_H__ #define __INCLUDED_CLIENT_GAMEWINDOW_H__ + #include "ui/window.h" #include "ui/label.h" #include "ui/iconbutton.h" -#include "client/hud.h" - -#include "client/chat.h" -#include "client/inventorywindow.h" -#include "client/mapwindow.h" - -#include "client/buymenu.h" -#include "client/entitymenu.h" -#include "client/trademenu.h" - namespace client { +class HUD; +class Chat; +class MapWindow; +class InventoryWindow; +class ReputationWindow; + +class EntityMenu; +class BuyMenu; +class TradeMenu; + /** * @brief the game user interface base widget * The GameWindow is drawn if core::localcontrol() is set. @@ -44,6 +45,9 @@ public: /// toggle inventory window void toggle_inventory(); + + /// toggle reputation window + void toggle_reputation(); /// togge chat window void toggle_chat(); @@ -70,6 +74,10 @@ public: return gamewindow_inventory; } + inline ReputationWindow *reputation() { + return gamewindow_reputation; + } + inline EntityMenu *menu() { return gamewindow_entitymenu; } @@ -82,30 +90,30 @@ protected: virtual void resize(); private: - HUD *gamewindow_hud; - Chat *gamewindow_chat; - MapWindow *gamewindow_map; - InventoryWindow *gamewindow_inventory; - - EntityMenu *gamewindow_entitymenu; - BuyMenu *gamewindow_buymenu; - TradeMenu *gamewindow_trademenu; - - ui::IconButton *gamewindow_menubutton; - ui::IconButton *gamewindow_freeflightbutton; - ui::IconButton *gamewindow_gotobutton; - ui::IconButton *gamewindow_dockbutton; - ui::IconButton *gamewindow_launchbutton; - ui::IconButton *gamewindow_formationbutton; - ui::IconButton *gamewindow_homebutton; - ui::IconButton *gamewindow_chatbutton; - ui::IconButton *gamewindow_mapbutton; - ui::IconButton *gamewindow_inventorybutton; - + HUD *gamewindow_hud; + Chat *gamewindow_chat; + MapWindow *gamewindow_map; + InventoryWindow *gamewindow_inventory; + ReputationWindow *gamewindow_reputation; + + EntityMenu *gamewindow_entitymenu; + BuyMenu *gamewindow_buymenu; + TradeMenu *gamewindow_trademenu; + + ui::IconButton *gamewindow_menubutton; + ui::IconButton *gamewindow_freeflightbutton; + ui::IconButton *gamewindow_gotobutton; + ui::IconButton *gamewindow_dockbutton; + ui::IconButton *gamewindow_launchbutton; + ui::IconButton *gamewindow_formationbutton; + ui::IconButton *gamewindow_homebutton; + ui::IconButton *gamewindow_chatbutton; + ui::IconButton *gamewindow_mapbutton; + ui::IconButton *gamewindow_inventorybutton; + ui::IconButton *gamewindow_reputationbutton; }; // class GameWindow } // namepace client - #endif // __INCLUDED_CLIENT_GAMEWINDOW_H__ -- cgit v1.2.3