summaryrefslogtreecommitdiff
path: root/src/game.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-07-31 20:05:33 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-08-01 23:05:45 +0200
commita61c57070aa618ac749e4a90a2b83c0e3a15e5fd (patch)
tree797bf52349e73aaeb2d46e421e8a798478deecb7 /src/game.h
parent9dd1d4339fd186927b35b64024ee88ba615f2a25 (diff)
downloadmana-client-a61c57070aa618ac749e4a90a2b83c0e3a15e5fd.tar.gz
mana-client-a61c57070aa618ac749e4a90a2b83c0e3a15e5fd.tar.bz2
mana-client-a61c57070aa618ac749e4a90a2b83c0e3a15e5fd.tar.xz
mana-client-a61c57070aa618ac749e4a90a2b83c0e3a15e5fd.zip
Some positioning changes in the game UI
Moved player status bars to the top-right, next to the window menu. Used the layout for dynamic adjustments to screen resolution.
Diffstat (limited to 'src/game.h')
-rw-r--r--src/game.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game.h b/src/game.h
index 3287ff43..4986d591 100644
--- a/src/game.h
+++ b/src/game.h
@@ -24,9 +24,9 @@
#include <string>
-#include "gui/windowmenu.h"
-
class Map;
+class WindowMenu;
+class MiniStatusWindow;
/**
* The main class responsible for running the game. The game starts after you
@@ -77,8 +77,7 @@ class Game
/**
* Update the key shortcuts in the window menu.
*/
- void updateWindowMenuCaptions()
- { mWindowMenu->updatePopUpCaptions(); }
+ void updateWindowMenuCaptions();
void videoResized(int width, int height);
@@ -87,6 +86,7 @@ class Game
bool mDisconnected;
WindowMenu *mWindowMenu;
+ MiniStatusWindow *mMiniStatusWindow;
Map *mCurrentMap;
std::string mMapName;