X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAnimation%2FAnimation.h;h=4a74c5c1d0afbcdacb0fc8d9e0ad04319b75bd0d;hb=8a32dc9e4e1011b10f009e999d7d008aa2711d8a;hp=4ed5dbefa88926c21a36b38c3be1d43e48ec21d9;hpb=9bd0be2befdf81aa4b5d377eaf29656935044faf;p=lugaru.git diff --git a/Source/Animation/Animation.h b/Source/Animation/Animation.h index 4ed5dbe..4a74c5c 100644 --- a/Source/Animation/Animation.h +++ b/Source/Animation/Animation.h @@ -84,8 +84,8 @@ public: static std::vector animations; static void loadAll(); - int height; - int attack; + anim_height_type height; + anim_attack_type attack; int numjoints; std::vector frames; @@ -93,7 +93,6 @@ public: XYZ offset; Animation(); - Animation(const std::string& fileName, int aheight, int aattack); - ~Animation(); + Animation(const std::string& fileName, anim_height_type aheight, anim_attack_type aattack); }; #endif