X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=f6a069c2331eb73a695de2a7f1a3a87c858b4243;hb=350233c2834eb36e66220aba490f1876bd6b19bf;hp=0a6882a5c4187897f46697d5b34e2337c6d2e744;hpb=6786f73930b6a0406ddefa792763157ac41298ee;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 0a6882a..f6a069c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -32,6 +32,7 @@
 #include "loader/Parser.h"
 #include "loader/TypeDescription.h"
 #include "map/Area.h"
+#include "map/Entity.h"
 #include "map/Map.h"
 #include "map/MapState.h"
 #include "map/Tile.h"
@@ -74,6 +75,7 @@ using loader::ParsedSource;
 using loader::Parser;
 using loader::TypeDescription;
 using map::Area;
+using map::Entity;
 using map::Map;
 using map::MapState;
 using map::Tile;
@@ -318,6 +320,12 @@ int main(int argc, char **argv) {
 		map.SetTileset(&tileset);
 		map.SetWidth(1);
 
+		SDL_Surface *mapMaximImg(IMG_Load("test-data/maxim-map.png"));
+		Sprite mapMaximSprite(mapMaximImg, 32, 64);
+		Entity mapMaxim;
+		mapMaxim.SetSprite(&mapMaximSprite);
+		mapMaxim.Position() = Vector<float>(80, 160);
+
 		InitScreen screen(width, height);
 
 		app::State *state(0);
@@ -335,6 +343,8 @@ int main(int argc, char **argv) {
 			state = battleState;
 		} else {
 			MapState *mapState(new MapState(&map));
+			mapState->AddEntity(&mapMaxim);
+			mapState->ControlEntity(&mapMaxim);
 			state = mapState;
 		}