* 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, 8 insertions, 13 deletions

diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index ec8a7946..246e2ffa 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -216,21 +216,21 @@ void ScrollArea::draw(gcn::Graphics *graphics)
 
 void ScrollArea::drawBorder(gcn::Graphics *graphics)
 {
-    int w, h, bs;
-    bs = getBorderSize();
-    w = getWidth() + bs * 2;
-    h = getHeight() + bs * 2;
+    int bs = getBorderSize();
+    int w = getWidth() + bs * 2;
+    int h = getHeight() + bs * 2;
 
-    if (isOpaque()) {
-        dynamic_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, background);
+    if (mOpaque) {
+        dynamic_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h,
+                                                         background);
     }
 }
 
 void ScrollArea::setOpaque(bool opaque)
 {
-    this->opaque = opaque;
+    mOpaque = opaque;
 
-    if (opaque) {
+    if (mOpaque) {
         setBorderSize(2);
     }
     else {
@@ -238,11 +238,6 @@ void ScrollArea::setOpaque(bool opaque)
     }
 }
 
-bool ScrollArea::isOpaque()
-{
-    return opaque;
-}
-
 void ScrollArea::drawButton(gcn::Graphics *graphics, BUTTON_DIR dir)
 {
     int state = 0;