X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.h;h=7f09302c080790a2cc48e61c90536da9ccc1f1bc;hb=bbf8873b80baf3cb468ac12b3f62b0938320fef1;hp=a4eeae9bc457c6119ad6c47e645cc12bbd2c5217;hpb=6f3fa5a970fa12cf6529c56a1f859b2668a8a232;p=lugaru.git

diff --git a/Source/Person.h b/Source/Person.h
index a4eeae9..7f09302 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,12 +47,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define rabbittype 0
 #define wolftype 1
 
-class Person
+struct Person
 {
-	public:
-		Person();
-		~Person();
-
 		int whichpatchx;
 		int whichpatchz;
 		
@@ -184,7 +179,6 @@ class Person
 		float turnspeed;
 		
 		int aitype;
-		int aitarget;
 		float aiupdatedelay;
 		float losupdatedelay;
 		int ally;
@@ -403,16 +397,28 @@ class Person
 		}
 		bool isFlip()
 		{
-		  return animation_bits[targetanimation] & ab_flip;;
+		  return animation_bits[targetanimation] & ab_flip;
 		}
 
 		bool jumpclimb;
-		
-		bool isWallJump();
+
+		bool isWallJump()
+		{
+		  return animation_bits[targetanimation] & ab_walljump;
+		}
 		void Reverse();
 		void DoDamage(float howmuch);
 		void DoHead();
-		void DoMipmaps(int howmanylevels, float startx, float endx, float starty, float endy);
+		void DoMipmaps()
+		{
+		  glBindTexture(GL_TEXTURE_2D, skeleton.drawmodel.textureptr);
+		  gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB,
+				    skeleton.skinsize,
+				    skeleton.skinsize,
+				    GL_RGB, GL_UNSIGNED_BYTE,
+				    &skeleton.skinText[0]);
+		}
+
 		int SphereCheck(XYZ *p1,float radius, XYZ *p, XYZ *move, float *rotate, Model *model);
 		int DrawSkeleton();
 		void Puff(int whichlabel);
@@ -422,5 +428,6 @@ class Person
 		void RagDoll(bool checkcollision);
 };
 
+const int maxplayers = 10;
 extern Person player[maxplayers];
 #endif