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

diff --git a/src/main.cpp b/src/main.cpp
index 20eb55b..951eccc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -336,6 +336,30 @@ int main(int argc, char **argv) {
 		mapMaxim.SetAnimation(&mapMaximAnimation);
 		mapMaxim.Position() = Vector<float>(80, 128);
 
+		SDL_Surface *mapSelanImg(IMG_Load("test-data/selan-map.png"));
+		Sprite mapSelanSprite(mapSelanImg, 32, 64);
+		SimpleAnimation mapSelanAnimation(&mapSelanSprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true);
+		Entity mapSelan;
+		mapSelan.SetAnimation(&mapSelanAnimation);
+		mapSelan.Position() = Vector<float>(80, 128);
+		mapMaxim.AddFollower(&mapSelan);
+
+		SDL_Surface *mapGuyImg(IMG_Load("test-data/guy-map.png"));
+		Sprite mapGuySprite(mapGuyImg, 32, 64);
+		SimpleAnimation mapGuyAnimation(&mapGuySprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true);
+		Entity mapGuy;
+		mapGuy.SetAnimation(&mapGuyAnimation);
+		mapGuy.Position() = Vector<float>(80, 128);
+		mapSelan.AddFollower(&mapGuy);
+
+		SDL_Surface *mapDekarImg(IMG_Load("test-data/dekar-map.png"));
+		Sprite mapDekarSprite(mapDekarImg, 32, 64);
+		SimpleAnimation mapDekarAnimation(&mapDekarSprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true);
+		Entity mapDekar;
+		mapDekar.SetAnimation(&mapDekarAnimation);
+		mapDekar.Position() = Vector<float>(80, 128);
+		mapGuy.AddFollower(&mapDekar);
+
 		InitScreen screen(width, height);
 
 		app::State *state(0);
@@ -354,6 +378,9 @@ int main(int argc, char **argv) {
 		} else {
 			MapState *mapState(new MapState(&map));
 			mapState->AddEntity(&mapMaxim);
+//			mapState->AddEntity(&mapSelan);
+//			mapState->AddEntity(&mapGuy);
+//			mapState->AddEntity(&mapDekar);
 			mapState->ControlEntity(&mapMaxim);
 			mapState->SetWalkingSpeed(walkSpeed);
 			state = mapState;