X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.h;h=dea9c3ad6202c510cf070127b79a06f0503fe80c;hb=cd043e3f9e26c2b3406b40a354c2840941e9db7f;hp=754a046676763e5f138798723124659e11fdad68;hpb=320a287705c0463c6f8943ad9cf4c407c556f703;p=lugaru.git
diff --git a/Source/Person.h b/Source/Person.h
index 754a046..dea9c3a 100644
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -3,20 +3,18 @@ Copyright (C) 2003, 2010 - Wolfire Games
This file is part of Lugaru.
-Lugaru is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
-This program is distributed in the hope that it will be useful,
+Lugaru is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+along with Lugaru. If not, see .
*/
#ifndef _PERSON_H_
@@ -31,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "Terrain.h"
#include "Sprite.h"
#include
+#include
#include "Weapons.h"
#include "Animation.h"
@@ -47,9 +46,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define rabbittype 0
#define wolftype 1
-class Person
+class Person : public enable_shared_from_this
{
public:
+ static std::vector> players;
+
int whichpatchx;
int whichpatchz;
@@ -153,7 +154,7 @@ public:
float grabdelay;
- Person *victim;
+ std::shared_ptr victim;
bool hasvictim;
float updatedelay;
@@ -229,7 +230,7 @@ public:
int creature;
- int id;
+ unsigned id;
Skeleton skeleton;
@@ -326,10 +327,11 @@ public:
- // convenience
- Joint& joint(int);
- XYZ& jointPos(int);
- XYZ& jointVel(int);
+ // convenience functions
+ inline Joint& joint(int bodypart) { return skeleton.joints[skeleton.jointlabels[bodypart]]; }
+ inline XYZ& jointPos(int bodypart) { return joint(bodypart).position; }
+ inline XYZ& jointVel(int bodypart) { return joint(bodypart).velocity; }
+
void CheckKick();
void CatchFire();
@@ -393,5 +395,5 @@ public:
};
const int maxplayers = 10;
-extern Person player[maxplayers];
+
#endif