* 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, 6 insertions, 5 deletions

diff --git a/src/gui/window.h b/src/gui/window.h
index 66330350..ee85c97f 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -138,7 +138,8 @@ class Window : public gcn::Window
          *
          * @return The parent window or <code>NULL</code> if there is none.
          */
-        Window *getParentWindow();
+        Window*
+        getParentWindow() { return mParent; }
 
         /**
          * Schedule this window for deletion. It will be deleted at the start
@@ -195,12 +196,12 @@ class Window : public gcn::Window
         virtual void resetToDefaultSize();
 
     protected:
-        gcn::Container *chrome;    /**< Contained container */
-        Window *parent;            /**< The parent window */
+        gcn::Container *mChrome;   /**< Contained container */
+        Window *mParent;           /**< The parent window */
         std::string mWindowName;   /**< Name of the window */
         int snapSize;              /**< Snap distance to window edge */
-        bool title;                /**< Window has a title bar */
-        bool modal;                /**< Window is modal */
+        bool mShowTitle;           /**< Window has a title bar */
+        bool mModal;               /**< Window is modal */
         bool resizable;            /**< Window can be resized */
         bool mMouseResize;         /**< Window is being resized */
         int minWinWidth;           /**< Minimum window width */