X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.hh;h=bb2d5e6dd69f9efeb920408401df4daa1ccab14a;hp=651cc885c4f239f10a6779c94481e1060d5b335a;hb=HEAD;hpb=831f04d4bc19a390415ac0bbac4331c7a65509bc diff --git a/src/Character.hh b/src/Character.hh index 651cc88..bb2d5e6 100644 --- a/src/Character.hh +++ b/src/Character.hh @@ -1,13 +1,11 @@ -/*] Copyright (c) 2009-2010, Charles McGarvey [************************** +/*] Copyright (c) 2009-2011, Charles McGarvey [***************************** **] All rights reserved. * -* vi:ts=4 sw=4 tw=75 -* * Distributable under the terms and conditions of the 2-clause BSD license; * see the file COPYING for a complete text of the license. * -**************************************************************************/ +*****************************************************************************/ #ifndef _CHARACTER_HH_ #define _CHARACTER_HH_ @@ -21,7 +19,7 @@ #include #include #include -#include +#include #include "Animation.hh" @@ -29,12 +27,10 @@ class Character; typedef boost::shared_ptr CharacterP; - /** * Parent class of animate objects with "personalities." This basically * includes the heroine herself and the bad guys. */ - class Character : public moof::rigid_body2 { public: @@ -51,7 +47,7 @@ public: //virtual int getOctant(const moof::Aabb<3>& aabb) const; - moof::texture tilemap; + moof::sprite tilemap; Animation animation; };