Unified Messaging Subsystem

[supertux.git] / src / object / tilemap.cpp

diff --git a/src/object/tilemap.cpp b/src/object/tilemap.cpp
index 15c6125..88c5c08 100644 (file)
--- a/src/object/tilemap.cpp
+++ b/src/object/tilemap.cpp
@@ -24,20 +24,21 @@
 #include <stdexcept>
 #include <cmath>
 
-#include "tilemap.h"
-#include "video/drawing_context.h"
-#include "level.h"
-#include "tile.h"
-#include "resources.h"
-#include "tile_manager.h"
-#include "lisp/lisp.h"
-#include "lisp/writer.h"
-#include "object_factory.h"
-#include "main.h"
+#include "tilemap.hpp"
+#include "video/drawing_context.hpp"
+#include "level.hpp"
+#include "tile.hpp"
+#include "resources.hpp"
+#include "tile_manager.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/writer.hpp"
+#include "object_factory.hpp"
+#include "main.hpp"
+#include "msg.hpp"
 
 TileMap::TileMap()
   : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES),
-    drawing_effect(0)
+    drawing_effect(NO_EFFECT)
 {
   tilemanager = tile_manager;
 
@@ -47,7 +48,7 @@ TileMap::TileMap()
 
 TileMap::TileMap(const lisp::Lisp& reader, TileManager* new_tile_manager)
   : solid(false), speed(1), width(-1), height(-1), layer(LAYER_TILES),
-    drawing_effect(0)
+    drawing_effect(NO_EFFECT)
 {
   tilemanager = new_tile_manager;
   if(tilemanager == 0)
@@ -62,14 +63,14 @@ TileMap::TileMap(const lisp::Lisp& reader, TileManager* new_tile_manager)
     else if(layer_str == "foreground")
       layer = LAYER_FOREGROUNDTILES;
     else
-      std::cerr << "Unknown layer '" << layer_str << "' in tilemap.\n";
+      msg_warning("Unknown layer '" << layer_str << "' in tilemap");
   }
 
   reader.get("solid", solid);
   reader.get("speed", speed);
 
   if(solid && speed != 1) {
-    std::cout << "Speed of solid tilemap is not 1. fixing.\n";
+    msg_warning("Speed of solid tilemap is not 1. fixing");
     speed = 1;
   }
   if(solid)
@@ -94,7 +95,7 @@ TileMap::TileMap(const lisp::Lisp& reader, TileManager* new_tile_manager)
 
 TileMap::TileMap(int layer_, bool solid_, size_t width_, size_t height_)
   : solid(solid_), speed(1), width(0), height(0), layer(layer_),
-    drawing_effect(0)
+    drawing_effect(NO_EFFECT)
 {
   tilemanager = tile_manager;
   
@@ -121,7 +122,7 @@ TileMap::write(lisp::Writer& writer)
     writer.write_string("layer", "foreground");
   else {
     writer.write_string("layer", "unknown");
-    std::cerr << "Warning unknown layer in tilemap.\n";
+    msg_warning("unknown layer in tilemap");
   }
 
   writer.write_bool("solid", solid);
@@ -180,13 +181,13 @@ TileMap::draw(DrawingContext& context)
     for (pos.x = start_x; pos.x < end_x; pos.x += 32)
     {
        context.draw_filled_rect(Vector (pos.x, start_y), Vector(1, fabsf(start_y - end_y)),
-                  Color(225, 225, 225), LAYER_GUI-50);
+                  Color(0.8f, 0.8f, 0.8f), LAYER_GUI-50);
     }
 
     for (pos.y = start_y; pos.y < end_y; pos.y += 32)
     {
        context.draw_filled_rect(Vector (start_x, pos.y), Vector(fabsf(start_x - end_x), 1),
-                  Color(225, 225, 225), LAYER_GUI-50);
+                  Color(1.0f, 1.0f, 1.0f), LAYER_GUI-50);
     }
   }
 #endif
@@ -253,9 +254,7 @@ const Tile*
 TileMap::get_tile(int x, int y) const
 {
   if(x < 0 || x >= width || y < 0 || y >= height) {
-#ifdef DEBUG
-    //std::cout << "Warning: tile outside tilemap requested!\n";
-#endif
+    //msg_warning("tile outside tilemap requested");
     return tilemanager->get(0);
   }
 
@@ -281,4 +280,13 @@ TileMap::change_at(const Vector& pos, uint32_t newtile)
   change(int(pos.x)/32, int(pos.y)/32, newtile);
 }
 
+void
+TileMap::change_all(uint32_t oldtile, uint32_t newtile)
+{
+  for (size_t x = 0; x < get_width(); x++)
+    for (size_t y = 0; y < get_height(); y++) {
+      if (get_tile(x,y)->getID() == oldtile) change(x,y,newtile);
+    }
+}
+
 IMPLEMENT_FACTORY(TileMap, "tilemap");