X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.hh;fp=src%2FCharacter.hh;h=bb2d5e6dd69f9efeb920408401df4daa1ccab14a;hp=bdbdb29414f0a6ce436e440691bab99ae53f203a;hb=574af38ed616d1adfa5e6ce35f67cda1f707f89d;hpb=6c9943707d4f33035830eba0587a61a34eaecbc2 diff --git a/src/Character.hh b/src/Character.hh index bdbdb29..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_ @@ -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: @@ -52,7 +48,7 @@ public: //virtual int getOctant(const moof::Aabb<3>& aabb) const; moof::sprite tilemap; - Animation animation; + Animation animation; };