X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=bebeed106e14bf8520b80b00aa8affaa2b07bc14;hb=93cd8cb0f16c1809d76faa33ed6f281a3276140b;hp=eed7397ff548a4d65ce968dc4c07f37936ba8288;hpb=e845e0acd0c097c84510499ebc17d74373db829f;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index eed7397..bebeed1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,7 +17,6 @@ #include "common/Inventory.h" #include "common/Item.h" #include "common/Spell.h" -#include "geometry/Point.h" #include "geometry/Vector.h" #include "graphics/ComplexAnimation.h" #include "graphics/Font.h" @@ -48,7 +47,6 @@ using common::Ikari; using common::Inventory; using common::Item; using common::Spell; -using geometry::Point; using geometry::Vector; using graphics::ComplexAnimation; using graphics::Font; @@ -82,15 +80,15 @@ int main(int argc, char **argv) { // temporary test data SDL_Surface *bg(IMG_Load("test-data/battle-bg.png")); PartyLayout monstersLayout; - monstersLayout.AddPosition(Point(88, 88)); - monstersLayout.AddPosition(Point(128, 88)); - monstersLayout.AddPosition(Point(168, 88)); - monstersLayout.AddPosition(Point(208, 88)); + monstersLayout.AddPosition(Vector(88, 88)); + monstersLayout.AddPosition(Vector(128, 88)); + monstersLayout.AddPosition(Vector(168, 88)); + monstersLayout.AddPosition(Vector(208, 88)); PartyLayout heroesLayout; - heroesLayout.AddPosition(Point(48, 136)); - heroesLayout.AddPosition(Point(128, 136)); - heroesLayout.AddPosition(Point(80, 152)); - heroesLayout.AddPosition(Point(160, 152)); + heroesLayout.AddPosition(Vector(48, 136)); + heroesLayout.AddPosition(Vector(128, 136)); + heroesLayout.AddPosition(Vector(80, 152)); + heroesLayout.AddPosition(Vector(160, 152)); SDL_Surface *monsterImg(IMG_Load("test-data/monster.png")); Sprite monsterSprite(monsterImg, 64, 64);