X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FPerson.h;h=9faac6a2f4d214162bc9d8924049516a567cb048;hb=2ce8e2f8ac6921286ebd6b30362c35b38e935977;hp=7f8364e49ce0dc69ab6e0cd8a7aa83a7a5192204;hpb=f0cb4c53631fd29fd490d3b94d6786543a53ce9b;p=lugaru.git diff --git a/Source/Person.h b/Source/Person.h index 7f8364e..9faac6a 100644 --- a/Source/Person.h +++ b/Source/Person.h @@ -31,6 +31,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 +48,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 +156,7 @@ public: float grabdelay; - Person *victim; + std::shared_ptr victim; bool hasvictim; float updatedelay; @@ -394,6 +397,6 @@ public: }; const int maxplayers = 10; -extern Person player[maxplayers]; +//~ extern Person player[maxplayers]; #endif