From 7c7e0c01e25e5fc53f872bd916dcad0a68614f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Sat, 27 Aug 2022 22:53:06 +0200 Subject: [PATCH] =?UTF-8?q?A=C3=B1adidos=20enemigos=20tipo=20path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/actors/enemies/bug.ani | 2 +- data/actors/enemies/flying_eye.ani | 2 +- data/actors/enemies/flying_eye_horn.ani | 2 +- data/actors/enemies/walking_eye.ani | 2 +- source/animatedsprite.cpp | 6 +++--- source/enemy_engine.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/actors/enemies/bug.ani b/data/actors/enemies/bug.ani index 2d0cc0f..11ba1b9 100644 --- a/data/actors/enemies/bug.ani +++ b/data/actors/enemies/bug.ani @@ -3,7 +3,7 @@ frame_width=16 frame_height=16 [animation] -name=walk +name=default speed=8 loop=0 frames=0,1,2,3,4,5 diff --git a/data/actors/enemies/flying_eye.ani b/data/actors/enemies/flying_eye.ani index 2d0cc0f..11ba1b9 100644 --- a/data/actors/enemies/flying_eye.ani +++ b/data/actors/enemies/flying_eye.ani @@ -3,7 +3,7 @@ frame_width=16 frame_height=16 [animation] -name=walk +name=default speed=8 loop=0 frames=0,1,2,3,4,5 diff --git a/data/actors/enemies/flying_eye_horn.ani b/data/actors/enemies/flying_eye_horn.ani index bdfcea2..98b9ec2 100644 --- a/data/actors/enemies/flying_eye_horn.ani +++ b/data/actors/enemies/flying_eye_horn.ani @@ -3,7 +3,7 @@ frame_width=16 frame_height=16 [animation] -name=walk +name=default speed=6 loop=0 frames=0,1,2,3,4,5 diff --git a/data/actors/enemies/walking_eye.ani b/data/actors/enemies/walking_eye.ani index 2d0cc0f..11ba1b9 100644 --- a/data/actors/enemies/walking_eye.ani +++ b/data/actors/enemies/walking_eye.ani @@ -3,7 +3,7 @@ frame_width=16 frame_height=16 [animation] -name=walk +name=default speed=8 loop=0 frames=0,1,2,3,4,5 diff --git a/source/animatedsprite.cpp b/source/animatedsprite.cpp index d433e0d..eaedf5a 100644 --- a/source/animatedsprite.cpp +++ b/source/animatedsprite.cpp @@ -28,15 +28,15 @@ AnimatedSprite::~AnimatedSprite() // Obtiene el indice de la animación a partir del nombre int AnimatedSprite::getIndex(std::string name) { - int result = -1; + int index = 0; for (int i = 0; i < animation.size(); i++) { if (animation[i].name == name) { - result = i; + index = i; } } - return result; + return index; } // Calcula el frame correspondiente a la animación diff --git a/source/enemy_engine.cpp b/source/enemy_engine.cpp index c98bebe..270289c 100644 --- a/source/enemy_engine.cpp +++ b/source/enemy_engine.cpp @@ -89,7 +89,7 @@ bool EnemyEngine::load(std::string file_path) printf("** enemy path loaded\n\n"); //enemies.push_back(new EnemyPath(enemy, p1, p2)); - enemy = new EnemyPath(enemy, p1, p2); + this->enemy = new EnemyPath(enemy, p1, p2); } }