[Gnash-commit] gnash ChangeLog server/character.h server/sprit...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/02 10:07:50

Modified files:
        .              : ChangeLog 
        server         : character.h sprite_instance.h 

Log message:
                * server/: character.h, sprite_instance.h: get_current_frame()
                  and has_looped() removed from character class (meaningless) 
and
                  left as non-virtuals of sprite_instance.
                  Added some comments about character::restart().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2228&r2=1.2229
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.59&r2=1.60

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2228
retrieving revision 1.2229
diff -u -b -r1.2228 -r1.2229
--- ChangeLog   2 Feb 2007 08:45:40 -0000       1.2228
+++ ChangeLog   2 Feb 2007 10:07:50 -0000       1.2229
@@ -1,5 +1,8 @@
 2007-02-02 Sandro Santilli <address@hidden>
 
+       * server/: character.h, sprite_instance.h: get_current_frame()
+         and has_looped() removed from character class (meaningless).
+         Added some comments about restart().
        * plugin/klash/Makefile.am: defined kde_moduledir
          and kde_servicesdir as required by automake 1.9.6.
          Used KDE_MODULESDIR and KDE_SERVICESDIR, which are

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/character.h  31 Jan 2007 15:11:58 -0000      1.43
+++ server/character.h  2 Feb 2007 10:07:50 -0000       1.44
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.43 2007/01/31 15:11:58 strk Exp $ */
+/* $Id: character.h,v 1.44 2007/02/02 10:07:50 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -358,9 +358,18 @@
                return get_relative_target_common(name);
        }
 
-    virtual size_t     get_current_frame() const { assert(0); return 0; }
-    virtual bool       has_looped() const { assert(0); return false; }
-    virtual void       restart() { /*assert(0);*/ }
+    //virtual size_t   get_current_frame() const { assert(0); return 0; }
+    //virtual bool     has_looped() const { assert(0); return false; }
+
+       /// Restart the character
+       //
+       /// This is only meaningful for sprite instances, but default
+       /// it's a no-op.
+       ///
+       /// It is needed by button_character_instance
+       /// TODO: have button_character_instance cast to_movie()
+       ///       and drop this one
+       virtual void    restart() { }
 
     virtual void       advance(float /*delta_time*/)
     {

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/sprite_instance.h    29 Jan 2007 07:33:14 -0000      1.59
+++ server/sprite_instance.h    2 Feb 2007 10:07:50 -0000       1.60
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.59 2007/01/29 07:33:14 zoulunkai Exp $ */
+/* $Id: sprite_instance.h,v 1.60 2007/02/02 10:07:50 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -201,7 +201,7 @@
        void    restart();
 
 
-       virtual bool has_looped() const
+       bool has_looped() const
        {
                return m_has_looped;
        }