X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=c1b70af05f1dc492d717c17679a11150fe659285;hb=e6ba365d8f4b261687d4947d6b78f08c7fda1cdb;hp=d92e2940cc1dcb8b7b97fb477a5c17fccb044339;hpb=e42e6570cb7460a1794fdc674d875a2b798d4f43;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index d92e294..c1b70af 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -364,6 +364,14 @@ int main(int argc, char **argv) {
 		mapDekar.SpriteOffset() = Vector<float>(0, -32);
 		mapGuy.AddFollower(&mapDekar);
 
+		SDL_Surface *mapMonsterImg(IMG_Load("test-data/monster-map.png"));
+		Sprite mapMonsterSprite(mapMonsterImg, 32, 32);
+		SimpleAnimation mapMonsterAnimation(&mapMonsterSprite, 500, 2, 0, 0, true);
+		Entity mapMonster;
+		mapMonster.SetAnimation(&mapMonsterAnimation);
+		mapMonster.Position() = Vector<float>(64, 32);
+		mapMonster.SetOrientation(Entity::ORIENTATION_SOUTH);
+
 		InitScreen screen(width, height);
 
 		app::State *state(0);
@@ -381,12 +389,18 @@ int main(int argc, char **argv) {
 			state = battleState;
 		} else {
 			MapState *mapState(new MapState(&map));
+
 			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;
 		}