* 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.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 1e190102..280339a1 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -33,6 +33,7 @@
 #include "skill.h"
 
 #include "../graphics.h"
+
 extern Graphics *graphics;
 extern Window *setupWindow;
 
@@ -78,8 +79,8 @@ MenuWindow::MenuWindow():
 
     int menuWidth = setupButton->getX() + setupButton->getWidth();
     setDefaultSize((graphics->getWidth() - menuWidth - 5), 0,
-                menuWidth,
-                (setupButton->getY() + setupButton->getHeight()));
+                   menuWidth,
+                   (setupButton->getY() + setupButton->getHeight()));
 }
 
 MenuWindow::~MenuWindow()
@@ -91,9 +92,9 @@ MenuWindow::~MenuWindow()
     delete setupButton;
 }
 
-void MenuWindow::draw(gcn::Graphics *graphics)
+void MenuWindow::draw(gcn::Graphics *g)
 {
-    Window::drawContent(graphics);
+    Window::drawContent(g);
 }
 
 void MenuWindow::action(const std::string& eventId)