X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=c4bc0bfb378d76ab9cba18f990a3814d362dc7f3;hb=e02068d51f5e7f82d4d3195e9a9ce5c9d76f727d;hp=15073111afd3bc5e94356c149ece0edb61a37ee9;hpb=42e75a9b9341a7c0446e29431a08980eca7de8c1;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 1507311..c4bc0bf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -492,6 +492,12 @@ int main(int argc, char **argv) {
 		map2.SetTriggers(triggers2, 1);
 		map2.SetWidth(1);
 
+		triggers1[0].map = &map2;
+		triggers1[0].target = Vector<int>(6, 2);
+
+		triggers2[0].map = &map1;
+		triggers2[0].target = Vector<int>(8, 3);
+
 		SDL_Surface *mapMaximImg(IMG_Load("test-data/maxim-map.png"));
 		Sprite mapMaximSprite(mapMaximImg, 32, 64);
 		SimpleAnimation mapMaximAnimation(&mapMaximSprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true);
@@ -537,6 +543,7 @@ int main(int argc, char **argv) {
 		mapMonster.SetAnimation(&mapMonsterAnimation);
 		mapMonster.Position() = Vector<float>(64, 32);
 		mapMonster.SetOrientation(Entity::ORIENTATION_SOUTH);
+		map1.SetEntities(&mapMonster, 1);
 
 		InitScreen screen(width, height);
 
@@ -556,15 +563,8 @@ int main(int argc, char **argv) {
 		} else {
 			MapState *mapState(new MapState(&map1));
 
-			mapState->AddEntity(&mapMaxim);
-			mapState->AddEntity(&mapSelan);
-			mapState->AddEntity(&mapGuy);
-			mapState->AddEntity(&mapDekar);
-
 			mapState->ControlEntity(&mapMaxim);
 			mapState->SetWalkingSpeed(walkSpeed);
-
-			mapState->AddEntity(&mapMonster);
 			mapMonster.StartAnimation(*mapState);
 
 			state = mapState;