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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/18 09:48:53

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
                * server/sprite_instance.cpp: use 1-based frame numbers in
                  action executions reports (VERBOSE ACTION).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1958&r2=1.1959
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.107&r2=1.108

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1958
retrieving revision 1.1959
diff -u -b -r1.1958 -r1.1959
--- ChangeLog   18 Dec 2006 09:36:58 -0000      1.1958
+++ ChangeLog   18 Dec 2006 09:48:53 -0000      1.1959
@@ -1,5 +1,7 @@
 2006-12-18 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp: use 1-based frame numbers in
+         action executions reports (VERBOSE ACTION).
        * testsuite/misc-ming.all/timeline_var_test.c: turn into
          a self-contained test (still not Dejagnu.swf based).
        * utilities/processor.cpp: allow 10 loop backs before

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- server/sprite_instance.cpp  13 Dec 2006 21:03:56 -0000      1.107
+++ server/sprite_instance.cpp  18 Dec 2006 09:48:53 -0000      1.108
@@ -2129,9 +2129,11 @@
 
        if ( ! m_goto_frame_action_list.empty() )
        {
-#ifdef GNASH_DEBUG
-               log_msg(" Executing %u actions in goto_Frame_action_list", 
m_goto_frame_action_list.size());
-#endif
+               IF_VERBOSE_ACTION(
+                       log_action(" Executing %u actions in "
+                               "goto_frame_action_list",
+                               m_goto_frame_action_list.size());
+               );
                execute_actions(m_goto_frame_action_list);
                assert(m_goto_frame_action_list.empty());
        }
@@ -2178,6 +2180,7 @@
        env.set_local_frame_top(local_stack_top);
 }
 
+// 0-based frame number !
 void
 sprite_instance::execute_frame_tags(size_t frame, bool state_only)
 {
@@ -2195,11 +2198,12 @@
                {
 
                        IF_VERBOSE_ACTION(
+                               // Use 1-based frame numbers
                                log_action("Executing " SIZET_FMT 
                                        " *init* actions in frame " SIZET_FMT
                                        "/" SIZET_FMT
                                        " of sprite %s", init_actions->size(),
-                                       frame, get_frame_count(),
+                                       frame+1, get_frame_count(),
                                        getTargetPath().c_str());
                        );
 
@@ -2217,9 +2221,10 @@
        const PlayList& playlist = m_def->get_playlist(frame);
 
        IF_VERBOSE_ACTION(
+               // Use 1-based frame numbers
                log_action("Executing " SIZET_FMT " actions in frame "
                        SIZET_FMT "/" SIZET_FMT " of sprite %s %s",
-                       playlist.size(), frame, get_frame_count(),
+                       playlist.size(), frame+1, get_frame_count(),
                        getTargetPath().c_str(),
                        state_only ? "(state only)" : "" );
        );