diff --git a/data/map/06.tmx b/data/map/06.tmx index 615cd1d..fa4c0f2 100644 --- a/data/map/06.tmx +++ b/data/map/06.tmx @@ -27,8 +27,8 @@ 312,312,311,312,311,312,311,312,311,312,311,312,311,312,311,312,311,312,311,312,483,312,311,312,311,312,483,312,311,312,311,312,311,312,311,312,311,312,311,312, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826, -823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826,823,824,825,826 +823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824, +857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858 diff --git a/source/enemy.cpp b/source/enemy.cpp index 68d590b..da2c66e 100644 --- a/source/enemy.cpp +++ b/source/enemy.cpp @@ -27,7 +27,6 @@ Enemy::Enemy(enemy_t enemy) sprite->setVelX(enemy.vx); sprite->setVelY(enemy.vy); - sprite->setCurrentAnimation(); sprite->setFlip(enemy.vx > 0 ? SDL_FLIP_NONE : SDL_FLIP_HORIZONTAL); collider = getRect(); diff --git a/source/game.cpp b/source/game.cpp index 9e205cb..443ee36 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -15,7 +15,6 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input) map = new Map(asset->get("01.map"), renderer, asset, itemTracker); player = new Player(renderer, asset, input, map); enemyEngine = new EnemyEngine(renderer, asset, player, map, asset->get(map->getEnemyFile())); - // enemyEngine->setEnemies(asset->get(map->getEnemyFile())); debugText = new Text(asset->get("debug.png"), asset->get("debug.txt"), renderer); music = JA_LoadMusic(asset->get("music_surface.ogg").c_str());