merge

[lugaru.git] / Source / Person.h

diff --git a/Source/Person.h b/Source/Person.h
index b831b28448914a1184ded9576b5e56af8d0488cd..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;
@@ -430,5 +428,6 @@ struct Person
                void RagDoll(bool checkcollision);
 };
 
+const int maxplayers = 10;
 extern Person player[maxplayers];
 #endif