Switched all data access to the new methods

[lugaru.git] / Source / Skeleton.h

diff --git a/Source/Skeleton.h b/Source/Skeleton.h
index 20429af422d25f778ffd8bf335d04beee38140aa..854355f38af564855c2968d9709f133102884049 100644 (file)
--- a/Source/Skeleton.h
+++ b/Source/Skeleton.h
@@ -1,22 +1,21 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
-Lugaru is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+Lugaru is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _SKELETON_H_
@@ -136,7 +135,7 @@ public:
     ~Animation();
     Animation & operator = (const Animation & ani);
 
-    void Load(const char *fileName, int aheight, int aattack);
+    void Load(const std::string& fileName, int aheight, int aattack);
 
 protected:
     void deallocate();
@@ -221,9 +220,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