diff --git a/data/enemies/arounder_stop.ani b/data/enemies/stopped_arounder.ani similarity index 100% rename from data/enemies/arounder_stop.ani rename to data/enemies/stopped_arounder.ani diff --git a/data/enemies/arounder_stop.png b/data/enemies/stopped_arounder.png similarity index 100% rename from data/enemies/arounder_stop.png rename to data/enemies/stopped_arounder.png diff --git a/data/room/38.room b/data/room/38.room index df063a4..0ef9943 100644 --- a/data/room/38.room +++ b/data/room/38.room @@ -9,8 +9,8 @@ roomLeft=39.room roomRight=37.room [enemy] -tileSetFile=arounder_stop.png -animation=arounder_stop.ani +tileSetFile=stopped_arounder.png +animation=stopped_arounder.ani width=7 height=8 x=9 @@ -25,8 +25,8 @@ color=white [/enemy] [enemy] -tileSetFile=arounder_stop.png -animation=arounder_stop.ani +tileSetFile=stopped_arounder.png +animation=stopped_arounder.ani width=7 height=8 x=18 diff --git a/data/room/41.room b/data/room/41.room index 676c6bb..e5369e3 100644 --- a/data/room/41.room +++ b/data/room/41.room @@ -25,8 +25,8 @@ color=bright_cyan [/enemy] [enemy] -tileSetFile=arounder_stop.png -animation=arounder_stop.ani +tileSetFile=stopped_arounder.png +animation=stopped_arounder.ani width=7 height=8 x=8 @@ -41,8 +41,8 @@ color=bright_cyan [/enemy] [enemy] -tileSetFile=arounder_stop.png -animation=arounder_stop.ani +tileSetFile=stopped_arounder.png +animation=stopped_arounder.ani width=7 height=8 x=11 @@ -57,8 +57,8 @@ color=bright_cyan [/enemy] [enemy] -tileSetFile=arounder_stop.png -animation=arounder_stop.ani +tileSetFile=stopped_arounder.png +animation=stopped_arounder.ani width=7 height=8 x=24 diff --git a/source/director.cpp b/source/director.cpp index c37ad01..45e2856 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -18,7 +18,7 @@ Director::Director(int argc, char *argv[]) section.subsection = SUBSECTION_LOGO_TO_INTRO; #ifdef DEBUG - section.name = SECTION_PROG_ENDING2; + section.name = SECTION_PROG_GAME; #endif // Crea e inicializa las opciones del programa @@ -561,7 +561,7 @@ void Director::loadResources(section_t section) textureList.push_back("abad_bell.png"); textureList.push_back("amstrad_cs.png"); textureList.push_back("flying_arounder.png"); - textureList.push_back("arounder_stop.png"); + textureList.push_back("stopped_arounder.png"); textureList.push_back("walking_arounder.png"); textureList.push_back("arounders_door.png"); textureList.push_back("arounders_machine.png"); @@ -624,7 +624,7 @@ void Director::loadResources(section_t section) animationList.push_back("abad_bell.ani"); animationList.push_back("amstrad_cs.ani"); animationList.push_back("flying_arounder.ani"); - animationList.push_back("arounder_stop.ani"); + animationList.push_back("stopped_arounder.ani"); animationList.push_back("walking_arounder.ani"); animationList.push_back("arounders_door.ani"); animationList.push_back("arounders_machine.ani"); @@ -735,7 +735,7 @@ void Director::loadResources(section_t section) textureList.push_back("aerojailer.png"); textureList.push_back("amstrad_cs.png"); textureList.push_back("flying_arounder.png"); - textureList.push_back("arounder_stop.png"); + textureList.push_back("stopped_arounder.png"); textureList.push_back("walking_arounder.png"); textureList.push_back("arounder.png"); textureList.push_back("arounders_door.png"); @@ -816,7 +816,7 @@ void Director::loadResources(section_t section) animationList.push_back("aerojailer.ani"); animationList.push_back("amstrad_cs.ani"); animationList.push_back("flying_arounder.ani"); - animationList.push_back("arounder_stop.ani"); + animationList.push_back("stopped_arounder.ani"); animationList.push_back("walking_arounder.ani"); animationList.push_back("arounder.ani"); animationList.push_back("arounders_door.ani"); @@ -1495,8 +1495,8 @@ bool Director::setFileList() asset->add(prefix + "/data/enemies/amstrad_cs.png", t_bitmap); asset->add(prefix + "/data/enemies/flying_arounder.ani", t_data); asset->add(prefix + "/data/enemies/flying_arounder.png", t_bitmap); - asset->add(prefix + "/data/enemies/arounder_stop.ani", t_data); - asset->add(prefix + "/data/enemies/arounder_stop.png", t_bitmap); + asset->add(prefix + "/data/enemies/stopped_arounder.ani", t_data); + asset->add(prefix + "/data/enemies/stopped_arounder.png", t_bitmap); asset->add(prefix + "/data/enemies/walking_arounder.ani", t_data); asset->add(prefix + "/data/enemies/walking_arounder.png", t_bitmap); asset->add(prefix + "/data/enemies/arounders_door.ani", t_data); diff --git a/source/ending2.cpp b/source/ending2.cpp index ddde9f2..6712593 100644 --- a/source/ending2.cpp +++ b/source/ending2.cpp @@ -305,7 +305,7 @@ void Ending2::iniSpriteList() spriteList.push_back("breakout"); spriteList.push_back("flying_arounder"); - spriteList.push_back("arounder_stop"); + spriteList.push_back("stopped_arounder"); spriteList.push_back("walking_arounder"); spriteList.push_back("arounders_door"); spriteList.push_back("arounders_machine"); @@ -327,7 +327,7 @@ void Ending2::iniSpriteList() spriteList.push_back("jailbattle_alien"); spriteList.push_back("jailbattle_human"); - spriteList.push_back("jailer"); + spriteList.push_back("jailer_#1"); spriteList.push_back("jailer_#2"); spriteList.push_back("jailer_#3"); spriteList.push_back("bry"); diff --git a/source/game.cpp b/source/game.cpp index c24225f..8b145f9 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -47,7 +47,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *as ticksSpeed = 15; board.lives = 9; #ifdef DEBUG - board.lives = 0; + board.lives = 9; #endif board.items = 0; board.rooms = 1;