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

diff --git a/Source/Person.h b/Source/Person.h
index 5c5a969..7f09302 100644
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -28,11 +28,11 @@ 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>
 #include "Weapons.h"
+#include "Animation.h"
 
 #define passivetype 0
 #define guardtype 1
@@ -47,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;
 		
@@ -183,7 +179,6 @@ class Person
 		float turnspeed;
 		
 		int aitype;
-		int aitarget;
 		float aiupdatedelay;
 		float losupdatedelay;
 		int ally;
@@ -322,48 +317,108 @@ class Person
 		void DoBloodBig(float howmuch, int which);
 		bool DoBloodBigWhere(float howmuch, int which, XYZ where);
 		
-		bool wasIdle();
-		bool isIdle();
+		bool wasIdle()
+		{
+		  return animation_bits[currentanimation] & ab_idle;
+		}
+		bool isIdle()
+		{
+		  return animation_bits[targetanimation] & ab_idle;
+		}
 		int getIdle();
 		
-		bool isSitting();
-		bool isSleeping();
-		
-		
-		bool wasCrouch();
-		bool isCrouch();
+		bool isSitting()
+		{
+		  return animation_bits[targetanimation] & ab_sit;
+		}
+
+		bool isSleeping()
+		{
+		  return animation_bits[targetanimation] & ab_sleep;
+		}
+
+		bool wasCrouch()
+		{
+		  return animation_bits[currentanimation] & ab_crouch;
+		}
+		bool isCrouch()
+		{
+		  return animation_bits[targetanimation] & ab_crouch;
+		}
 		int getCrouch();
 		
-		bool wasStop();
-		bool isStop();
+		bool wasStop()
+		{
+		  return animation_bits[currentanimation] & ab_stop;
+		}
+		bool isStop()
+		{
+		  return animation_bits[targetanimation] & ab_stop;
+		}
 		int getStop();
 		
 		bool wasSneak();
 		bool isSneak();
 		int getSneak();
 		
-		bool wasRun();
-		bool isRun();
+		bool wasRun()
+		{
+		  return animation_bits[currentanimation] & ab_run;
+		}
+		bool isRun()
+		{
+		  return animation_bits[targetanimation] & ab_run;
+		}
 		int getRun();
-		
-		bool wasLanding();
-		bool isLanding();
+
+		bool wasLanding()
+		{
+		  return animation_bits[currentanimation] & ab_land;
+		}
+		bool isLanding()
+		{
+		  return animation_bits[targetanimation] & ab_land;
+		}
 		int getLanding();
-		
-		bool wasLandhard();
-		bool isLandhard();
+
+		bool wasLandhard()
+		{
+		  return animation_bits[currentanimation] & ab_landhard;
+		}
+		bool isLandhard()
+		{
+		  return animation_bits[targetanimation] & ab_landhard;
+		}
 		int getLandhard();
-		
-		bool isFlip();
-		bool wasFlip();
-		
+
+		bool wasFlip()
+		{
+		  return animation_bits[currentanimation] & ab_flip;
+		}
+		bool isFlip()
+		{
+		  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);
@@ -373,5 +428,6 @@ class Person
 		void RagDoll(bool checkcollision);
 };
 
+const int maxplayers = 10;
 extern Person player[maxplayers];
 #endif