made convenience functions inlineable to avoid performance hit

diff --git a/Source/Person.cpp b/Source/Person.cpp
index 33a57f3c324c745a1de57cd1bc5fd748247688b5..6cee8020e15bedc95eae9ecf7dd9bae33ec2371e 100644 (file)
--- a/Source/Person.cpp
+++ b/Source/Person.cpp
@@ -85,21 +85,6 @@ extern bool gamestarted;
 
 Person player[maxplayers];
 
-/* convenience functions
- */
-Joint& Person::joint(int bodypart)
-{
-    return skeleton.joints[skeleton.jointlabels[bodypart]];
-}
-XYZ& Person::jointPos(int bodypart)
-{
-    return joint(bodypart).position;
-}
-XYZ& Person::jointVel(int bodypart)
-{
-    return joint(bodypart).velocity;
-}
-
 /* EFFECT
  *
  * USES:

diff --git a/Source/Person.h b/Source/Person.h
index 754a046676763e5f138798723124659e11fdad68..7f8364e49ce0dc69ab6e0cd8a7aa83a7a5192204 100644 (file)
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -326,10 +326,11 @@ public:
 
 
 
-    // convenience
-    Joint& joint(int);
-    XYZ& jointPos(int);
-    XYZ& jointVel(int);
+    // convenience functions
+    inline Joint& joint(int bodypart) { return skeleton.joints[skeleton.jointlabels[bodypart]]; }
+    inline XYZ& jointPos(int bodypart) { return joint(bodypart).position; }
+    inline XYZ& jointVel(int bodypart) { return joint(bodypart).velocity; }
+
 
     void CheckKick();
     void CatchFire();
@@ -394,4 +395,5 @@ public:
 
 const int maxplayers = 10;
 extern Person player[maxplayers];
+
 #endif

diff --git a/Source/Skeleton.cpp b/Source/Skeleton.cpp
index 90f854121197aa3c04b99c87e958abc131d3238f..115b1ccbf7006a34343f9be1fd08d814cfc1b808 100644 (file)
--- a/Source/Skeleton.cpp
+++ b/Source/Skeleton.cpp
@@ -45,22 +45,6 @@ extern int whichjointendarray[26];
 
 extern bool visibleloading;
 
-/* convenience functions
- */
-Joint& Skeleton::joint(int bodypart)
-{
-    return joints[jointlabels[bodypart]];
-}
-XYZ& Skeleton::jointPos(int bodypart)
-{
-    return joint(bodypart).position;
-}
-XYZ& Skeleton::jointVel(int bodypart)
-{
-    return joint(bodypart).velocity;
-}
-
-
 /* EFFECT
  */
 void dealloc2(void* param)

diff --git a/Source/Skeleton.h b/Source/Skeleton.h
index 20429af422d25f778ffd8bf335d04beee38140aa..63e1ad6239a6cb69d9284abda3a539e0b9017c89 100644 (file)
--- a/Source/Skeleton.h
+++ b/Source/Skeleton.h
@@ -221,9 +221,12 @@ public:
     ~Skeleton();
 
 private:
-    Joint& joint(int bodypart);
-    XYZ& jointPos(int bodypart);
-    XYZ& jointVel(int bodypart);
+    // convenience functions
+    // only for Skeleton.cpp
+    inline Joint& joint(int bodypart) { return joints[jointlabels[bodypart]]; }
+    inline XYZ& jointPos(int bodypart) { return joint(bodypart).position; }
+    inline XYZ& jointVel(int bodypart) { return joint(bodypart).velocity; }
+
 };
 
 #endif