trigger handling in map state

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 1979aac400499be06913e270804a1915c242d7fa..20eb55b4adf4aa9f61dbd2cb9ea91da21579817a 100644 (file)
--- 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;
@@ -94,6 +96,7 @@ int main(int argc, char **argv) {
        const int width = 800;
        const int height = 480;
 
+       const int tileSize = 32;
        const float walkSpeed = 128.0f;
 
        const bool battle(false);
@@ -310,21 +313,25 @@ 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, 32, 32);
+               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"));
                Sprite mapMaximSprite(mapMaximImg, 32, 64);
-               SimpleAnimation mapMaximAnimation(&mapMaximSprite, 128, 2, 0, 0, true);
+               SimpleAnimation mapMaximAnimation(&mapMaximSprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true);
                Entity mapMaxim;
                mapMaxim.SetAnimation(&mapMaximAnimation);
                mapMaxim.Position() = Vector<float>(80, 128);