X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMap.cpp;h=60c319d4a8d8c8fc6a4c0a974c3129ac3a4d176f;hb=0b11a24a8b08c49d6e4301573602fb6d01e7a8c8;hp=8ff7f18dc9802ea58bd537075bc6ae481e733f07;hpb=1907ca03c5e865c4d398170042aa384c67ffff29;p=l2e.git

diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index 8ff7f18..60c319d 100644
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -1,10 +1,3 @@
-/*
- * Map.cpp
- *
- *  Created on: Sep 29, 2012
- *      Author: holy
- */
-
 #include "Map.h"
 
 #include "Area.h"
@@ -13,11 +6,12 @@
 #include "../graphics/Sprite.h"
 #include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
+#include "../math/Vector.h"
 #include "../sdl/utility.h"
 
 #include <stdexcept>
 
-using geometry::Vector;
+using math::Vector;
 using graphics::Sprite;
 using loader::FieldDescription;
 using loader::Interpreter;
@@ -83,7 +77,7 @@ const Tile *Map::TileAt(const Vector<int> &offset) const {
 	}
 }
 
-Trigger *Map::TriggerAt(const geometry::Vector<int> &offset) {
+Trigger *Map::TriggerAt(const math::Vector<int> &offset) {
 	// TODO: add support for multiple triggers on a tile?
 	Vector<int> coords(TileCoordinates(offset));
 	for (Trigger *i(triggers); i != triggers + numTriggers; ++i) {
@@ -94,7 +88,7 @@ Trigger *Map::TriggerAt(const geometry::Vector<int> &offset) {
 	return 0;
 }
 
-SDL_Surface *Map::BattleBackgroundAt(const geometry::Vector<int> &position) {
+SDL_Surface *Map::BattleBackgroundAt(const math::Vector<int> &position) {
 	Tile *tile(TileAt(position));
 	if (tile && tile->BattleBackground()) {
 		return tile->BattleBackground();
@@ -111,12 +105,15 @@ Vector<int> Map::TileCoordinates(const Vector<int> &position) const {
 }
 
 
-void Map::Render(SDL_Surface *dest, const Vector<int> &inOffset) const {
+void Map::Render(
+		SDL_Surface *dest,
+		const Vector<int> &inOffset,
+		unsigned int frame) const {
 	// TODO: skip invisible areas
 	for (int i(0); i < numAreas; ++i) {
 		const Area &area(areas[i]);
 		Vector<int> offset(inOffset + Vector<int>::FromIndex(i, width) * area.Size() * tileset->Size());
-		area.Render(dest, tileset, offset);
+		area.Render(dest, tileset, offset, frame);
 	}
 }