Merge branch 'master' into strippedstripped1.1.9.18

Conflicts:
	src/guichan/cliprectangle.cpp
	src/guichan/focushandler.cpp
	src/guichan/gui.cpp
	src/guichan/include/guichan/cliprectangle.hpp
	src/guichan/include/guichan/inputevent.hpp
	src/guichan/include/guichan/keyevent.hpp
	src/guichan/include/guichan/mouseevent.hpp
	src/guichan/include/guichan/widgets/button.hpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/include/guichan/widgets/radiobutton.hpp
	src/guichan/include/guichan/widgets/slider.hpp
	src/guichan/include/guichan/widgets/tab.hpp
	src/guichan/include/guichan/widgets/tabbedarea.hpp
	src/guichan/include/guichan/widgets/textfield.hpp
	src/guichan/include/guichan/widgets/window.hpp
	src/guichan/inputevent.cpp
	src/guichan/keyevent.cpp
	src/guichan/mouseevent.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/button.cpp
	src/guichan/widgets/checkbox.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/radiobutton.cpp
	src/guichan/widgets/slider.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textfield.cpp
	src/guichan/widgets/window.cpp

1 files changed, 4 insertions, 9 deletions

diff --git a/src/map.h b/src/map.h
index c92a3c60f..3fa607116 100644
--- a/src/map.h
+++ b/src/map.h
@@ -96,10 +96,10 @@ struct MetaTile
 class MapObject
 {
     public:
-        MapObject(int type, std::string data)
+        MapObject(int type0, std::string data0)
         {
-            this->type = type;
-            this->data = data;
+            type = type0;
+            data = data0;
         }
 
         int type;
@@ -161,11 +161,6 @@ class MapLayer: public ConfigListener
         void setTile(int index, Image *img) { mTiles[index] = img; }
 
         /**
-         * Get tile image, with x and y in layer coordinates.
-         */
-        Image *getTile(int x, int y) const;
-
-        /**
          * Draws this layer to the given graphics context. The coordinates are
          * expected to be in map range and will be translated to local layer
          * coordinates and clipped to the layer's dimensions.
@@ -223,7 +218,7 @@ class MapLayer: public ConfigListener
 
         void optionChanged(const std::string &value);
 
-        int getTileDrawWidth(int tilePtr, int endX, int &width) const;
+        int getTileDrawWidth(Image *img, int endX, int &width) const;
 
 //        void initTileInfo();