X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=bf57b848a280d12fbb94b8b0ed179e18e211e24b;hb=5519942fa584ee30a0fde3752adff030c3dc42b8;hp=d92e2940cc1dcb8b7b97fb477a5c17fccb044339;hpb=0fc36d261ef8129debbd4aa15594bc46cb82eb27;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index d92e294..bf57b84 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -344,6 +344,7 @@ int main(int argc, char **argv) {
 		mapSelan.SetAnimation(&mapSelanAnimation);
 		mapSelan.Position() = Vector<float>(64, 128);
 		mapSelan.SpriteOffset() = Vector<float>(0, -32);
+		mapSelan.SetFlags(Entity::FLAG_NONBLOCKING);
 		mapMaxim.AddFollower(&mapSelan);
 
 		SDL_Surface *mapGuyImg(IMG_Load("test-data/guy-map.png"));
@@ -353,6 +354,7 @@ int main(int argc, char **argv) {
 		mapGuy.SetAnimation(&mapGuyAnimation);
 		mapGuy.Position() = Vector<float>(64, 128);
 		mapGuy.SpriteOffset() = Vector<float>(0, -32);
+		mapGuy.SetFlags(Entity::FLAG_NONBLOCKING);
 		mapSelan.AddFollower(&mapGuy);
 
 		SDL_Surface *mapDekarImg(IMG_Load("test-data/dekar-map.png"));
@@ -362,8 +364,17 @@ int main(int argc, char **argv) {
 		mapDekar.SetAnimation(&mapDekarAnimation);
 		mapDekar.Position() = Vector<float>(64, 128);
 		mapDekar.SpriteOffset() = Vector<float>(0, -32);
+		mapDekar.SetFlags(Entity::FLAG_NONBLOCKING);
 		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 +392,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;
 		}