merge

[lugaru.git] / Source / Person.h

diff --git a/Source/Person.h b/Source/Person.h
index 88826338cf724c738fa103b1a8f3112e6508be2f..7f09302c080790a2cc48e61c90536da9ccc1f1bc 100644 (file)
--- 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>
@@ -180,7 +179,6 @@ struct Person
                float turnspeed;
                
                int aitype;
-               int aitarget;
                float aiupdatedelay;
                float losupdatedelay;
                int ally;
@@ -411,7 +409,16 @@ struct Person
                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);
@@ -421,5 +428,6 @@ struct Person
                void RagDoll(bool checkcollision);
 };
 
+const int maxplayers = 10;
 extern Person player[maxplayers];
 #endif