Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-07-31 18:24:01 +0000
committerStijn Buys <ingar@osirion.org>2011-07-31 18:24:01 +0000
commit45054b224d8f0f8b6d7db4bcd0b0abf6763a60ab (patch)
treec23ea79d4564037673312ea1d4cb936272c65a06 /src/client/gamewindow.cc
parentf0cbe1d0655013d14dd4f1807ddb88789ae8d27a (diff)
Improved map window, moved the actual map widget into a seperate class.
Diffstat (limited to 'src/client/gamewindow.cc')
-rw-r--r--src/client/gamewindow.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/gamewindow.cc b/src/client/gamewindow.cc
index d539f53..3404703 100644
--- a/src/client/gamewindow.cc
+++ b/src/client/gamewindow.cc
@@ -31,7 +31,7 @@ GameWindow::GameWindow(ui::Widget *parent) : ui::Window(parent)
label_viewname->set_font(ui::root()->font_large());
// sub menus
- gamewindow_map = new Map(this);
+ gamewindow_map = new MapWindow(this);
gamewindow_entitymenu = new EntityMenu(this);
gamewindow_buymenu = new BuyMenu(this);
gamewindow_trademenu = new TradeMenu(this);
@@ -304,6 +304,8 @@ void GameWindow::resize()
void GameWindow::draw()
{
+ ui::Window::draw();
+
const float smallmargin = ui::UI::elementsize.height();
if (core::localcontrol()->state() == core::Entity::Docked) {
@@ -364,8 +366,6 @@ void GameWindow::draw()
} else {
gamewindow_homebutton->disable();
- //gamewindow_notify->set_geometry(gamewindow_map->location(), gamewindow_map->size());
-
if (gamewindow_entitymenu->visible()) {
gamewindow_entitymenu->hide();
}