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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/08 09:33:41

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

Log message:
                * server/sprite_instance.{h,cpp}: drop unused
                  m_update_frame variable. (restart): simplify
                  and properly reset the displayList backup.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2575&r2=1.2576
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.188&r2=1.189
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.74&r2=1.75

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2575
retrieving revision 1.2576
diff -u -b -r1.2575 -r1.2576
--- ChangeLog   8 Mar 2007 08:05:00 -0000       1.2575
+++ ChangeLog   8 Mar 2007 09:33:40 -0000       1.2576
@@ -1,4 +1,10 @@
-2007-03-05 Zou Lunkai <address@hidden>
+2007-03-07 Sandro Santilli <address@hidden>
+
+       * server/sprite_instance.{h,cpp}: drop unused
+         m_update_frame variable. (restart): simplify
+         and properly reset the displayList backup.
+
+2007-03-07 Zou Lunkai <address@hidden>
 
        * testsuite/misc-ming.all/action_execution_order_extend_test.c:
          Add a check, seems PlaceObject2 tag should not define any functions

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- server/sprite_instance.cpp  8 Mar 2007 00:11:13 -0000       1.188
+++ server/sprite_instance.cpp  8 Mar 2007 09:33:40 -0000       1.189
@@ -1555,7 +1555,6 @@
        m_goto_frame_action_list(),
        m_play_state(PLAY),
        m_current_frame(0),
-       m_update_frame(true),
        m_has_looped(false),
        m_init_actions_executed(),
        m_as_environment(),
@@ -3370,25 +3369,26 @@
 {
        GNASH_REPORT_FUNCTION;
 
-    // forgive me udo, I'll leave correct thing to you
-    set_invalidated();
     m_current_frame = 0;
-    m_update_frame = true;
+
     m_has_looped = false;
     m_play_state = PLAY;
 
-    // DisplayList::clear is bogus in that
-    // id won't recursively call character::unload
-    // unless we pass 'true' as the second argument.
-    // But passing 'true' will also call the onLoad
-    // method, which is wrong.
-    // This will likely be fixed as soon as we get
-    // the action execution list correctly implemented.
-    m_display_list.clear(true);
-
-    // Not sure we should re-execute this, anyway
-    // elvis.swf restarts fine...
-    execute_frame_tags(m_current_frame);
+    // We're about to reset the displayList,
+    // so take note of the current bounds
+    // for the renderer to know what to 
+    // redraw.
+    set_invalidated();
+
+    // Clear current display list and 
+    // its backup
+    m_display_list.clear();
+    oldDisplayList.clear();
+
+    // setting on_event_load_called will trigger
+    // a call to ::construct next time we advance
+    m_on_event_load_called = false;
+
 }
 
 float sprite_instance::get_height() const

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- server/sprite_instance.h    5 Mar 2007 21:53:48 -0000       1.74
+++ server/sprite_instance.h    8 Mar 2007 09:33:40 -0000       1.75
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.74 2007/03/05 21:53:48 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.75 2007/03/08 09:33:40 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -705,11 +705,11 @@
        ActionList      m_goto_frame_action_list;
 
        play_state      m_play_state;
+
        // the _currentframe property
        size_t          m_current_frame;
-       // the frame which contains the current executing actions
-       //size_t      m_executing_frame; 
-       bool            m_update_frame;
+
+       // true if this sprite reached the last frame and restarted
        bool            m_has_looped;