[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/03 13:43:32

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

Log message:
                * server/sprite_instance.{cpp,h}: split the
                  DisplayList reset code from execute_frame_tags()
                  to a resetDisplayList() method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2761&r2=1.2762
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.217&r2=1.218
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.86&r2=1.87

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2761
retrieving revision 1.2762
diff -u -b -r1.2761 -r1.2762
--- ChangeLog   3 Apr 2007 13:22:23 -0000       1.2761
+++ ChangeLog   3 Apr 2007 13:43:32 -0000       1.2762
@@ -1,5 +1,11 @@
 2007-04-03 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.{cpp,h}: split the
+         DisplayList reset code from execute_frame_tags()
+         to a resetDisplayList() method.
+
+2007-04-03 Sandro Santilli <address@hidden>
+
        * server/asobj/xmlattrs.{cpp,h}: use std::string
          for name and value, access trough members, initialize
          trought contructor.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -b -r1.217 -r1.218
--- server/sprite_instance.cpp  2 Apr 2007 15:45:22 -0000       1.217
+++ server/sprite_instance.cpp  3 Apr 2007 13:43:32 -0000       1.218
@@ -2238,18 +2238,9 @@
        //env.set_local_frame_top(local_stack_top);
 }
 
-// 0-based frame number !
 void
-sprite_instance::execute_frame_tags(size_t frame, int typeflags)
+sprite_instance::resetDisplayList()
 {
-       testInvariant();
-
-       assert(frame < m_def->get_frame_count());
-
-       m_is_reverse_execution = false;
-
-       if ( frame == 0 && has_looped() )
-       {
                // Resort frame0 DisplayList as depth of
                // characters in it might have been
                // externally changed.
@@ -2268,7 +2259,8 @@
                //       of static objects (change second argument to switch)
                _frame0_chars.addAll(charsToAdd, false);
                
-               if ( ! (m_display_list == _frame0_chars) ) {
+       if ( ! (m_display_list == _frame0_chars) )
+       {
        
                        // Set this character as invalidated *before*
                        // actually updating the displaylist !
@@ -2276,6 +2268,22 @@
        
                        m_display_list = _frame0_chars;                 
                };
+}
+
+// 0-based frame number !
+void
+sprite_instance::execute_frame_tags(size_t frame, int typeflags)
+{
+       testInvariant();
+
+       assert(frame < m_def->get_frame_count());
+
+       m_is_reverse_execution = false;
+
+       if ( frame == 0 && has_looped() )
+       {
+               resetDisplayList();
+
        }
 
        // Execute this frame's init actions, if necessary.

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/sprite_instance.h    2 Apr 2007 15:45:22 -0000       1.86
+++ server/sprite_instance.h    3 Apr 2007 13:43:32 -0000       1.87
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.86 2007/04/02 15:45:22 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.87 2007/04/03 13:43:32 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -700,6 +700,12 @@
 
 private:
 
+       /// Reset the DisplayList for proper loop-back or goto_frame
+       //
+       /// The DisplayList is cleared by all but dynamic characters
+       ///
+       void resetDisplayList();
+
        /// Queue actions in the action list
        //
        /// The list of action will be pushed on the current