X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=20eb55b4adf4aa9f61dbd2cb9ea91da21579817a;hb=c055b357c50dd871b49c38191a9d867ff42ea420;hp=aa2089043ebe2100990645c9d2b99240604424b5;hpb=65f855e8181613291670bf1ef84623fabc4594d9;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index aa20890..20eb55b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,6 +36,7 @@
 #include "map/Map.h"
 #include "map/MapState.h"
 #include "map/Tile.h"
+#include "map/Trigger.h"
 #include "sdl/InitImage.h"
 #include "sdl/InitScreen.h"
 #include "sdl/InitSDL.h"
@@ -79,6 +80,7 @@ using map::Entity;
 using map::Map;
 using map::MapState;
 using map::Tile;
+using map::Trigger;
 using sdl::InitImage;
 using sdl::InitScreen;
 using sdl::InitSDL;
@@ -311,16 +313,20 @@ int main(int argc, char **argv) {
 		tiles[62].SetOffset(Vector<int>(1, 1));
 		tiles[63].SetOffset(Vector<int>(1, 1));
 
-		Area area;
-		area.SetTiles(tiles, 64);
-		area.SetWidth(8);
+		Area areas[1];
+		areas[0].SetTiles(tiles, 64);
+		areas[0].SetWidth(8);
+
+		Trigger triggers[1];
+		triggers[0].SetTilePosition(Vector<int>(2, 0));
 
 		SDL_Surface *tilesetImg(IMG_Load("test-data/tileset.png"));
 		Sprite tileset(tilesetImg, tileSize, tileSize);
 
 		Map map;
-		map.SetAreas(&area, 1);
+		map.SetAreas(areas, 1);
 		map.SetTileset(&tileset);
+		map.SetTriggers(triggers, 1);
 		map.SetWidth(1);
 
 		SDL_Surface *mapMaximImg(IMG_Load("test-data/maxim-map.png"));