Fixed (yet) another merge screw-up *sigh*

[situare] / src / map / maptile.h

diff --git a/src/map/maptile.h b/src/map/maptile.h
index 9ce60d7..097d827 100644 (file)
--- a/src/map/maptile.h
+++ b/src/map/maptile.h
@@ -39,7 +39,7 @@ public:
     MapTile();
 
 /*******************************************************************************
- * CLASS SPECIFIC MEMBER FUNCTIONS AND SLOTS
+ * MEMBER FUNCTIONS AND SLOTS
  ******************************************************************************/
     /**
     * @brief Set drawing level of the tile based on current zoom level
@@ -63,9 +63,12 @@ public:
     /**
     * @brief Setter for zoom level
     *
-    * @param zoomLevel Zoom level
+    * Does also set the zValue.
+    *
+    * @param tileZoomLevel Zoom level of the tile
+    * @param currentViewZoomLevel Current view zoom level
     */
-    void setZoomLevel(int zoomLevel);
+    void setZoomLevel(int tileZoomLevel, int currentViewZoomLevel);
 
     /**
     * @brief Getter for tile number