X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=c4bc0bfb378d76ab9cba18f990a3814d362dc7f3;hb=7fb774ec1df3d550cd8a6805bdc69c11ad36e498;hp=2a49ad585f50c09a8d5e487dc9bba6adf5b06079;hpb=d8d0982340fc10e5161251a4b50223fabc7b4431;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 2a49ad5..c4bc0bf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -543,6 +543,7 @@ int main(int argc, char **argv) { mapMonster.SetAnimation(&mapMonsterAnimation); mapMonster.Position() = Vector(64, 32); mapMonster.SetOrientation(Entity::ORIENTATION_SOUTH); + map1.SetEntities(&mapMonster, 1); InitScreen screen(width, height); @@ -562,15 +563,8 @@ int main(int argc, char **argv) { } else { MapState *mapState(new MapState(&map1)); - 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;