Migrate some definitions from Constants.h

diff --git a/Source/Constants.h b/Source/Constants.h
index 985e378279999380697da8b06f9b02638c739f7b..2858cdf7b7c01583eef0d6d238826d340807c022 100644 (file)
--- a/Source/Constants.h
+++ b/Source/Constants.h
@@ -42,10 +42,6 @@ static const char *editortypenames[] = {
   "dead1", "dead2", "dead3", "dead4"
 };
 
-const int boneconnect = 0;
-const int constraint = 1;
-const int muscle = 2;
-
 const int head = 0; // DO NOT CONFLICT WITH ZLIB's variable head
 const int neck = 1;
 const int leftshoulder = 2;
@@ -67,10 +63,6 @@ const int rightknee = 17;
 const int rightankle = 18;
 const int rightfoot = 19;
 
-const int max_joints = 50;
-const int max_frames = 50;
-const int max_muscles = 100;
-
 const int max_dialogues = 20;
 const int max_dialoguelength = 20;
 

diff --git a/Source/Skeleton.cpp b/Source/Skeleton.cpp
index ff195387e5227d044a6df8a193e92beab28c5389..8d4247bae71b5d9341aaab96dce3da4e7a25ff93 100644 (file)
--- a/Source/Skeleton.cpp
+++ b/Source/Skeleton.cpp
@@ -52,6 +52,8 @@ void dealloc2(void* param){
        param=0;
 }
 
+enum {boneconnect, constraint, muscle};
+
 void Muscle::DoConstraint(bool spinny)
 {
        static XYZ vel;
@@ -712,6 +714,7 @@ void Skeleton::SetJoint(float x, float y, float z, int which, int whichjoint)
 
 void Skeleton::AddMuscle(int attach1,int attach2,float minlength,float maxlength,int type)
 {
+       const int max_muscles = 100; // FIXME: Probably can be dropped
        if(num_muscles<max_muscles-1&&attach1<num_joints&&attach1>=0&&attach2<num_joints&&attach2>=0&&attach1!=attach2){
                muscles[num_muscles].parent1=&joints[attach1];
                muscles[num_muscles].parent2=&joints[attach2];

diff --git a/Source/Skeleton.h b/Source/Skeleton.h
index 8186b1824cc391a758b724310d2c7be0f96d716d..fa57c9a1845a47128599453b40d03ff09937952e 100644 (file)
--- a/Source/Skeleton.h
+++ b/Source/Skeleton.h
@@ -142,6 +142,8 @@ protected:
 };
 
 
+const int max_joints = 50;
+
 class Skeleton
 {
 public: