diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-10-09 03:34:45 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-10-09 03:34:45 +0000 |
commit | 8bde9095c5840b8d62ebafe11beaed98877d6ac2 (patch) | |
tree | 537f717a339d1247cae222eb7a354ea5dbe8babf /src/gui/status.cpp | |
parent | a246c08cef5e4d598fc07a681eb971bfbcf01519 (diff) | |
download | mana-8bde9095c5840b8d62ebafe11beaed98877d6ac2.tar.gz mana-8bde9095c5840b8d62ebafe11beaed98877d6ac2.tar.bz2 mana-8bde9095c5840b8d62ebafe11beaed98877d6ac2.tar.xz mana-8bde9095c5840b8d62ebafe11beaed98877d6ac2.zip |
* Made Sprite into an interface implemented by both FloorItem and Being, which
hook themselves into the map on construction. The improved fringe layer is
working as expected now.
* Made sure TMW compiles without warnings even when using "-Wconversion
-Wshadow -Wcast-qual -Wwrite-strings -ansi -pedantic", lots of cleanups.
* Added two new small tilesets that contain the desert tiles that are twice and
three times the height of a normal tile. One well in new_3-1 has been
converted to use the new double tiles for testing purposes.
Diffstat (limited to 'src/gui/status.cpp')
-rw-r--r-- | src/gui/status.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/status.cpp b/src/gui/status.cpp index 1a858297..1ba09b98 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -35,6 +35,7 @@ #include "../net/protocol.h" #include "../graphics.h" + extern Graphics *graphics; StatusWindow::StatusWindow(): @@ -43,7 +44,7 @@ StatusWindow::StatusWindow(): setWindowName("Status"); setResizable(true); setDefaultSize((graphics->getWidth() - 365) / 2, - (graphics->getHeight() - 255) / 2, 365, 255); + (graphics->getHeight() - 255) / 2, 365, 255); loadWindowState(); // ---------------------- @@ -428,11 +429,11 @@ void StatusWindow::update() jobValueLabel->setPosition(290, jobXpLabel->getY()); } -void StatusWindow::draw(gcn::Graphics *graphics) +void StatusWindow::draw(gcn::Graphics *g) { update(); - Window::draw(graphics); + Window::draw(g); } void StatusWindow::action(const std::string& eventId) |