X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FPerson.h;h=9c6ebe968a31ad5222e299ff3165fa567ae3be24;hb=263a338c0c3648cfa2388d4a21584a09294ffd9e;hp=b831b28448914a1184ded9576b5e56af8d0488cd;hpb=bba3631a5899f8f9f26fd596e13f097ae2d6f8b8;p=lugaru.git

diff --git a/Source/Person.h b/Source/Person.h
index b831b28..9c6ebe9 100644
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Quaternions.h"
 #include "Skeleton.h"
 #include "Models.h"
-#include "Constants.h"
 #include "Terrain.h"
 #include "Sprite.h"
 #include <cmath>
@@ -48,8 +47,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define rabbittype 0
 #define wolftype 1
 
-struct Person
+class Person
 {
+	public:	
 		int whichpatchx;
 		int whichpatchz;
 		
@@ -93,15 +93,15 @@ struct Person
 		bool immobile;
 		
 		float velspeed;
-		float targetrotation;
+		float targetyaw;
 		float targetrot;
 		float rot;
 		float oldrot;
-		float lookrotation;
-		float lookrotation2;
-		float rotation;
-		float rotation2;
-		float lowrotation;
+		float lookyaw;
+		float lookpitch;
+		float yaw;
+		float pitch;
+		float lowyaw;
 		float tilt;
 		float targettilt;
 		float tilt2;
@@ -138,8 +138,8 @@ struct Person
 		int direction;
 		float texupdatedelay;
 		
-		float headrotation,headrotation2;
-		float targetheadrotation,targetheadrotation2;
+		float headyaw,headpitch;
+		float targetheadyaw,targetheadpitch;
 		
 		bool onterrain;
 		bool pause;
@@ -180,7 +180,6 @@ struct Person
 		float turnspeed;
 		
 		int aitype;
-		int aitarget;
 		float aiupdatedelay;
 		float losupdatedelay;
 		int ally;
@@ -426,9 +425,12 @@ struct Person
 		void Puff(int whichlabel);
 		void FootLand(int which, float opacity);
 		void DoStuff();
+		Joint& getJointFor(int);
+		void setAnimation(int);
 		void DoAnimations();
 		void RagDoll(bool checkcollision);
 };
 
+const int maxplayers = 10;
 extern Person player[maxplayers];
 #endif