X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAnimation%2FMuscle.cpp;h=da43de4f02bb5258513ce1bb8f465eadd2d821f1;hb=8b6e8f3ad7390309795eb35c0959264cb7924402;hp=94ed5b15d19e9677c2d682a2f8a8ad3f28b5440e;hpb=bb10d5d29efb774db509c87063f1294980b127c8;p=lugaru.git

diff --git a/Source/Animation/Muscle.cpp b/Source/Animation/Muscle.cpp
index 94ed5b1..da43de4 100644
--- a/Source/Animation/Muscle.cpp
+++ b/Source/Animation/Muscle.cpp
@@ -18,28 +18,38 @@ 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/Muscle.h"
-#include "binio.h"
+#include "Animation/Muscle.hpp"
+
+#include "Utils/binio.h"
 
 extern float multiplier;
 extern bool freeze;
 
 Muscle::Muscle()
+    : length(0)
+    , targetlength(0)
+    , parent1(0)
+    , parent2(0)
+    , maxlength(0)
+    , minlength(0)
+    , type(boneconnect)
+    , visible(false)
+    , rotate1(0)
+    , rotate2(0)
+    , rotate3(0)
+    , lastrotate1(0)
+    , lastrotate2(0)
+    , lastrotate3(0)
+    , oldrotate1(0)
+    , oldrotate2(0)
+    , oldrotate3(0)
+    , newrotate1(0)
+    , newrotate2(0)
+    , newrotate3(0)
+    ,
+
+    strength(0)
 {
-    length = 0;
-    targetlength = 0;
-    parent1 = 0;
-    parent2 = 0;
-    maxlength = 0;
-    minlength = 0;
-    type = boneconnect;
-    visible = 0;
-    rotate1 = 0, rotate2 = 0, rotate3 = 0;
-    lastrotate1 = 0, lastrotate2 = 0, lastrotate3 = 0;
-    oldrotate1 = 0, oldrotate2 = 0, oldrotate3 = 0;
-    newrotate1 = 0, newrotate2 = 0, newrotate3 = 0;
-
-    strength = 0;
 }
 
 void Muscle::load(FILE* tfile, int vertexNum, std::vector<Joint>& joints)
@@ -96,7 +106,6 @@ void Muscle::loadVerticesClothes(FILE* tfile, int vertexNum)
     }
 }
 
-
 /* EFFECT
  * sets strength, length,
  *      parent1->position, parent2->position,
@@ -132,7 +141,7 @@ void Muscle::DoConstraint(bool spinny)
         strength = 1;
 
     length -= (length - relaxlength) * (1 - strength) * multiplier * 10000;
-    length -= (length - targetlength) * (strength) * multiplier * 10000;
+    length -= (length - targetlength) * strength * multiplier * 10000;
     if (strength == 0)
         length = relaxlength;