new language, new compiler

[l2e.git] / src / map / Map.cpp

diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index 60c319d4a8d8c8fc6a4c0a974c3129ac3a4d176f..ed6cc06ffd398923cfa4c5ff1aa8e55712a3cea1 100644 (file)
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -104,6 +104,10 @@ Vector<int> Map::TileCoordinates(const Vector<int> &position) const {
        return position / tileset->Size();
 }
 
+Vector<int> Map::PixelCoordinates(const Vector<int> &position) const {
+       return position * tileset->Size();
+}
+
 
 void Map::Render(
                SDL_Surface *dest,
@@ -162,9 +166,9 @@ void Map::CreateTypeDescription() {
 
        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("areas", FieldDescription(((char *)&m.areas) - ((char *)&m), Area::TYPE_ID).SetAggregate());
+       td.AddField("triggers", FieldDescription(((char *)&m.triggers) - ((char *)&m), Trigger::TYPE_ID).SetAggregate());
+       td.AddField("entities", FieldDescription(((char *)&m.entities) - ((char *)&m), Entity::TYPE_ID).SetAggregate());
        td.AddField("width", FieldDescription(((char *)&m.width) - ((char *)&m), Interpreter::NUMBER_ID));
 }