X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=Source%2FAnimation%2FAnimation.cpp;h=a8ad6e19cf448dba073e62923b5d527d84af1290;hp=8ee1fd662ea0b171008980a2f0df62af506ed520;hb=8b6e8f3ad7390309795eb35c0959264cb7924402;hpb=531fd8d27258d6c15d6fd221272c74b48602a85a

diff --git a/Source/Animation/Animation.cpp b/Source/Animation/Animation.cpp
index 8ee1fd6..a8ad6e1 100644
--- a/Source/Animation/Animation.cpp
+++ b/Source/Animation/Animation.cpp
@@ -27,7 +27,9 @@ std::vector<Animation> Animation::animations;
 
 void Animation::loadAll()
 {
-#define DECLARE_ANIM(id, file, height, attack, ...) if (id < 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
 }
@@ -70,27 +72,27 @@ void AnimationFrame::loadWeaponTarget(FILE* tfile)
     funpackf(tfile, "Bf Bf Bf", &weapontarget.x, &weapontarget.y, &weapontarget.z);
 }
 
-Animation::Animation():
-    height(lowheight),
-    attack(neutral),
-    numjoints(0)
+Animation::Animation()
+    : height(lowheight)
+    , attack(neutral)
+    , numjoints(0)
 {
 }
 
 /* EFFECT
  * load an animation from file
  */
-Animation::Animation(const std::string& filename, anim_height_type aheight, anim_attack_type aattack):
-    Animation()
+Animation::Animation(const std::string& filename, anim_height_type aheight, anim_attack_type aattack)
+    : Animation()
 {
-    FILE *tfile;
+    FILE* tfile;
     int numframes;
     unsigned i;
 
     LOGFUNC;
 
     // Changing the filename into something the OS can understand
-    std::string filepath = Folders::getResourcePath("Animations/"+filename);
+    std::string filepath = Folders::getResourcePath("Animations/" + filename);
 
     LOG(std::string("Loading animation...") + filepath);
 
@@ -100,7 +102,7 @@ Animation::Animation(const std::string& filename, anim_height_type aheight, anim
     Game::LoadingScreen();
 
     // read file in binary mode
-    tfile = Folders::openMandatoryFile( filepath, "rb" );
+    tfile = Folders::openMandatoryFile(filepath, "rb");
 
     // read numframes, joints to know how much memory to allocate
     funpackf(tfile, "Bi Bi", &numframes, &numjoints);