X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAnimation%2FAnimation.hpp;h=f9e0482e767ac5d1b16e1ad06399ed328576164c;hb=6a8cb464330e92163c8feaf101b8b5837c973bba;hp=912a60ea00aec3073d303105315ae21efac8d9e3;hpb=03fbcc5b5e18dbf62c48849fc8d02cd250aa744e;p=lugaru.git diff --git a/Source/Animation/Animation.hpp b/Source/Animation/Animation.hpp index 912a60e..f9e0482 100644 --- a/Source/Animation/Animation.hpp +++ b/Source/Animation/Animation.hpp @@ -1,5 +1,5 @@ /* -Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) +Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. @@ -24,29 +24,39 @@ along with Lugaru. If not, see . #include -enum anim_attack_type { - neutral, normalattack, reversed, reversal +enum anim_attack_type +{ + neutral, + normalattack, + reversed, + reversal }; -enum anim_height_type { - lowheight, middleheight, highheight +enum anim_height_type +{ + lowheight, + middleheight, + highheight }; -enum animation_types { +enum animation_type +{ #define DECLARE_ANIM(id, ...) id, #include "Animation.def" #undef DECLARE_ANIM animation_count }; -enum animation_bit_offsets { +enum animation_bit_offsets +{ #define DECLARE_ANIM_BIT(bit) o_##bit, #include "Animation.def" #undef DECLARE_ANIM_BIT animation_bit_count }; -enum animation_bits_def { +enum animation_bits_def +{ #define DECLARE_ANIM_BIT(bit) bit = 1 << o_##bit, #include "Animation.def" #undef DECLARE_ANIM_BIT @@ -60,7 +70,7 @@ static const int animation_bits[animation_count] = { struct AnimationFrameJointInfo { - XYZ position; + XYZ position; float twist; float twist2; bool onground;