Got rid of malloc in Muscle

[lugaru.git] / Source / Animation / Muscle.h

diff --git a/Source/Animation/Muscle.h b/Source/Animation/Muscle.h
index cb85f856f1fcc59d9ac64db76835d0f757d79f77..5f51161af3926f9895732be2bb1f8c0711ba618c 100644 (file)
--- a/Source/Animation/Muscle.h
+++ b/Source/Animation/Muscle.h
@@ -21,6 +21,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef _MUSCLE_H_
 #define _MUSCLE_H_
 
+#include <vector>
 #include "Animation/Joint.h"
 
 enum muscle_type {boneconnect, constraint, muscle};
@@ -28,12 +29,9 @@ enum muscle_type {boneconnect, constraint, muscle};
 class Muscle
 {
 public:
-    int numvertices;
-    int* vertices;
-    int numverticeslow;
-    int* verticeslow;
-    int numverticesclothes;
-    int* verticesclothes;
+    std::vector<int> vertices;
+    std::vector<int> verticeslow;
+    std::vector<int> verticesclothes;
     float length;
     float targetlength;
     Joint* parent1;
@@ -51,6 +49,9 @@ public:
 
     Muscle();
     ~Muscle();
+    void load(FILE* tfile, int vertexNum, Joint* joints);
+    void loadVerticesLow(FILE* tfile, int vertexNum);
+    void loadVerticesClothes(FILE* tfile, int vertexNum);
     void DoConstraint(bool spinny);
 };