From 350233c2834eb36e66220aba490f1876bd6b19bf Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Sun, 30 Sep 2012 16:26:27 +0200 Subject: [PATCH] added test entity --- src/main.cpp | 10 ++++++++++ test-data/maxim-map.png | Bin 0 -> 8993 bytes 2 files changed, 10 insertions(+) create mode 100644 test-data/maxim-map.png 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(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; } diff --git a/test-data/maxim-map.png b/test-data/maxim-map.png new file mode 100644 index 0000000000000000000000000000000000000000..65df7ddcc152a88ef2ae276b66fb2fa9c2886a6e GIT binary patch literal 8993 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 F{ug@BUHt$6 literal 0 HcmV?d00001 -- 2.39.2