#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"
TileMap::TileMap()
: solid(false), speed(1), width(0), height(0), layer(LAYER_TILES),
- drawing_effect(0)
+ drawing_effect(NO_EFFECT)
{
tilemanager = tile_manager;
flags |= FLAG_SOLID;
}
-TileMap::TileMap(const lisp::Lisp& reader)
- : solid(false), speed(1), width(0), height(0), layer(LAYER_TILES),
- drawing_effect(0)
+TileMap::TileMap(const lisp::Lisp& reader, TileManager* new_tile_manager)
+ : solid(false), speed(1), width(-1), height(-1), layer(LAYER_TILES),
+ drawing_effect(NO_EFFECT)
{
- tilemanager = tile_manager;
+ tilemanager = new_tile_manager;
+ if(tilemanager == 0)
+ tilemanager = tile_manager;
std::string layer_str;
if(reader.get("layer", layer_str)) {
}
if(solid)
flags |= FLAG_SOLID;
-
- if(!reader.get("width", width) ||
- !reader.get("height", height))
- throw std::runtime_error("No width or height specified in tilemap.");
+
+ reader.get("width", width);
+ reader.get("height", height);
+ if(width < 0 || height < 0)
+ throw std::runtime_error("Invalid/No width/height specified in tilemap.");
if(!reader.get_vector("tiles", tiles))
throw std::runtime_error("No tiles in tilemap.");
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;
}
void
-TileMap::action(float )
+TileMap::update(float )
{
}
/** if we don't round here, we'll have a 1 pixel gap on screen sometimes.
* I have no idea why */
float start_x = roundf(context.get_translation().x);
- if(start_x < 0) start_x = 0;
+ if(start_x < 0)
+ start_x = 0;
float start_y = roundf(context.get_translation().y);
- if(start_y < 0) start_y = 0;
+ if(start_y < 0)
+ start_y = 0;
float end_x = std::min(start_x + SCREEN_WIDTH, float(width * 32));
float end_y = std::min(start_y + SCREEN_HEIGHT, float(height * 32));
start_x -= int(start_x) % 32;
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
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");