[Enigma-cvs] enigma/src objects.hh,1.58,1.59

[Daniel Heck <address@hidden>]

Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv2466/src

Modified Files:
        objects.hh 
Log Message:

- Derive Actor from display::ModelCallback.  
- Added Actor::set_anim().  
- Actor::get_sprite() returns non-const reference (so we can
  modify the sprite handle of the CannonBall).


Index: objects.hh
===================================================================
RCS file: /cvsroot/enigma/enigma/src/objects.hh,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** objects.hh  9 Nov 2003 11:51:37 -0000       1.58
--- objects.hh  20 Nov 2003 20:24:42 -0000      1.59
***************
*** 369,373 ****
  namespace world
  {
!     class Actor : public Object {
      public:
          // Actor interface.
--- 369,373 ----
  namespace world
  {
!     class Actor : public Object, public display::ModelCallback {
      public:
          // Actor interface.
***************
*** 419,426 ****
          static double get_max_radius(); // max. radius of all actors
  
      protected:
!         Actor(const char *name, const px::V2 &pos);
!         void set_model(const string &mname);
!         const display::SpriteHandle &get_sprite() const { return m_sprite; }
  
      private:
--- 419,431 ----
          static double get_max_radius(); // max. radius of all actors
  
+         // ModelCallback interface
+         void animcb ();
+ 
      protected:
!         Actor(const char *name);
!         void set_model (const string &modelname);
!         void set_anim (const string &modelname);
! 
!         display::SpriteHandle &get_sprite() { return m_sprite; }
  
      private: