implemented followers

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 951eccc4c311220612748565e88b52f63d079692..d92e2940cc1dcb8b7b97fb477a5c17fccb044339 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -334,14 +334,16 @@ int main(int argc, char **argv) {
                SimpleAnimation mapMaximAnimation(&mapMaximSprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true);
                Entity mapMaxim;
                mapMaxim.SetAnimation(&mapMaximAnimation);
-               mapMaxim.Position() = Vector<float>(80, 128);
+               mapMaxim.Position() = Vector<float>(64, 128);
+               mapMaxim.SpriteOffset() = Vector<float>(0, -32);
 
                SDL_Surface *mapSelanImg(IMG_Load("test-data/selan-map.png"));
                Sprite mapSelanSprite(mapSelanImg, 32, 64);
                SimpleAnimation mapSelanAnimation(&mapSelanSprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true);
                Entity mapSelan;
                mapSelan.SetAnimation(&mapSelanAnimation);
-               mapSelan.Position() = Vector<float>(80, 128);
+               mapSelan.Position() = Vector<float>(64, 128);
+               mapSelan.SpriteOffset() = Vector<float>(0, -32);
                mapMaxim.AddFollower(&mapSelan);
 
                SDL_Surface *mapGuyImg(IMG_Load("test-data/guy-map.png"));
@@ -349,7 +351,8 @@ int main(int argc, char **argv) {
                SimpleAnimation mapGuyAnimation(&mapGuySprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true);
                Entity mapGuy;
                mapGuy.SetAnimation(&mapGuyAnimation);
-               mapGuy.Position() = Vector<float>(80, 128);
+               mapGuy.Position() = Vector<float>(64, 128);
+               mapGuy.SpriteOffset() = Vector<float>(0, -32);
                mapSelan.AddFollower(&mapGuy);
 
                SDL_Surface *mapDekarImg(IMG_Load("test-data/dekar-map.png"));
@@ -357,7 +360,8 @@ int main(int argc, char **argv) {
                SimpleAnimation mapDekarAnimation(&mapDekarSprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true);
                Entity mapDekar;
                mapDekar.SetAnimation(&mapDekarAnimation);
-               mapDekar.Position() = Vector<float>(80, 128);
+               mapDekar.Position() = Vector<float>(64, 128);
+               mapDekar.SpriteOffset() = Vector<float>(0, -32);
                mapGuy.AddFollower(&mapDekar);
 
                InitScreen screen(width, height);
@@ -378,9 +382,9 @@ int main(int argc, char **argv) {
                } else {
                        MapState *mapState(new MapState(&map));
                        mapState->AddEntity(&mapMaxim);
-//                     mapState->AddEntity(&mapSelan);
-//                     mapState->AddEntity(&mapGuy);
-//                     mapState->AddEntity(&mapDekar);
+                       mapState->AddEntity(&mapSelan);
+                       mapState->AddEntity(&mapGuy);
+                       mapState->AddEntity(&mapDekar);
                        mapState->ControlEntity(&mapMaxim);
                        mapState->SetWalkingSpeed(walkSpeed);
                        state = mapState;