X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMap.cpp;h=60c319d4a8d8c8fc6a4c0a974c3129ac3a4d176f;hb=d97b7038c28058a76e7214e0dce0394fd8b67cff;hp=3f05962a43b2e55db519f84565b362b16d748cc0;hpb=7c43158af1abf38fa896a442cb3c6d8a5bc630e7;p=l2e.git

diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index 3f05962..60c319d 100644
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -1,23 +1,20 @@
-/*
- * Map.cpp
- *
- *  Created on: Sep 29, 2012
- *      Author: holy
- */
-
 #include "Map.h"
 
 #include "Area.h"
 #include "Tile.h"
 #include "Trigger.h"
 #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;
 using loader::TypeDescription;
 
 namespace map {
@@ -80,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) {
@@ -91,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();
@@ -108,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);
 	}
 }
 
@@ -156,23 +156,16 @@ void Map::RenderDebug(SDL_Surface *dest, const Vector<int> &inOffset) const {
 void Map::CreateTypeDescription() {
 	Map m;
 
-	int areaId(TypeDescription::GetTypeId("Area"));
-	int entityId(TypeDescription::GetTypeId("Entity"));
-	int imageId(TypeDescription::GetTypeId("Image"));
-	int numberId(TypeDescription::GetTypeId("Number"));
-	int spriteId(TypeDescription::GetTypeId("Sprite"));
-	int triggerId(TypeDescription::GetTypeId("Trigger"));
-
-	TypeDescription &td(TypeDescription::CreateOrGet("Map"));
+	TypeDescription &td(TypeDescription::Create(TYPE_ID, "Map"));
 	td.SetConstructor(&Construct);
 	td.SetSize(sizeof(Map));
 
-	td.AddField("tileset", FieldDescription(((char *)&m.tileset) - ((char *)&m), spriteId).SetReferenced());
-	td.AddField("battlebg", FieldDescription(((char *)&m.battlebg) - ((char *)&m), imageId).SetReferenced());
-	td.AddField("areas", FieldDescription(((char *)&m.areas) - ((char *)&m), areaId).SetReferenced().SetAggregate());
-	td.AddField("triggers", FieldDescription(((char *)&m.triggers) - ((char *)&m), triggerId).SetReferenced().SetAggregate());
-	td.AddField("entities", FieldDescription(((char *)&m.entities) - ((char *)&m), entityId).SetReferenced().SetAggregate());
-	td.AddField("width", FieldDescription(((char *)&m.width) - ((char *)&m), numberId));
+	td.AddField("tileset", FieldDescription(((char *)&m.tileset) - ((char *)&m), Sprite::TYPE_ID).SetReferenced());
+	td.AddField("battlebg", FieldDescription(((char *)&m.battlebg) - ((char *)&m), Interpreter::IMAGE_ID).SetReferenced());
+	td.AddField("areas", FieldDescription(((char *)&m.areas) - ((char *)&m), Area::TYPE_ID).SetReferenced().SetAggregate());
+	td.AddField("triggers", FieldDescription(((char *)&m.triggers) - ((char *)&m), Trigger::TYPE_ID).SetReferenced().SetAggregate());
+	td.AddField("entities", FieldDescription(((char *)&m.entities) - ((char *)&m), Entity::TYPE_ID).SetReferenced().SetAggregate());
+	td.AddField("width", FieldDescription(((char *)&m.width) - ((char *)&m), Interpreter::NUMBER_ID));
 }
 
 void Map::Construct(void *data) {