X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAnimation%2FAnimation.cpp;h=4433800db337622be2b242c7c17373fe8de3c515;hb=b84825978803615f45a9f128232e62431042aec0;hp=af6c31955293c23826739819478f8f8832b26d92;hpb=9bd0be2befdf81aa4b5d377eaf29656935044faf;p=lugaru.git

diff --git a/Source/Animation/Animation.cpp b/Source/Animation/Animation.cpp
index af6c319..4433800 100644
--- a/Source/Animation/Animation.cpp
+++ b/Source/Animation/Animation.cpp
@@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Animation/Skeleton.h"
 #include "Animation/Animation.h"
+#include "Animation/Skeleton.h"
 #include "Utils/Folders.h"
 #include "Game.h"
 
@@ -28,8 +28,7 @@ std::vector<Animation> Animation::animations;
 
 void Animation::loadAll()
 {
-    int i = 0;
-#define DECLARE_ANIM(id, file, height, attack, ...) if (i++ < loadable_anim_end) animations.emplace_back(file, height, attack);
+#define DECLARE_ANIM(id, file, height, attack, ...) if (id < loadable_anim_end) animations.emplace_back(file, height, attack);
 #include "Animation.def"
 #undef DECLARE_ANIM
 }
@@ -73,8 +72,8 @@ void AnimationFrame::loadWeaponTarget(FILE* tfile)
 }
 
 Animation::Animation():
-    height(0),
-    attack(0),
+    height(lowheight),
+    attack(neutral),
     numjoints(0)
 {
 }
@@ -82,7 +81,7 @@ Animation::Animation():
 /* EFFECT
  * load an animation from file
  */
-Animation::Animation(const std::string& filename, int aheight, int aattack):
+Animation::Animation(const std::string& filename, anim_height_type aheight, anim_attack_type aattack):
     Animation()
 {
     FILE *tfile;
@@ -150,7 +149,3 @@ Animation::Animation(const std::string& filename, int aheight, int aattack):
     offset = endoffset;
     offset.y = 0;
 }
-
-Animation::~Animation()
-{
-}