[Gnash-commit] gnash ChangeLog server/button_character_instanc...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/12 22:41:05

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

Log message:
                * server/: button_character_instance.cpp, sprite_instance.cpp:
                  introduce button actions execution IF_VERBOSE_ACTION; include
                  total frame count in sprite's frame action executions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1922&r2=1.1923
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.104&r2=1.105

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1922
retrieving revision 1.1923
diff -u -b -r1.1922 -r1.1923
--- ChangeLog   12 Dec 2006 19:48:04 -0000      1.1922
+++ ChangeLog   12 Dec 2006 22:41:05 -0000      1.1923
@@ -1,5 +1,11 @@
 2006-12-12 Sandro Santilli <address@hidden>
 
+       * server/: button_character_instance.cpp, sprite_instance.cpp:
+         introduce button actions execution IF_VERBOSE_ACTION; include
+         total frame count in sprite's frame action executions.
+
+2006-12-12 Sandro Santilli <address@hidden>
+
        * server/: button_character_instance.h, character.h,
          edit_text_character.h, generic_character.h, sprite_instance.cpp,
          sprite_instance.h, video_stream_instance.h:

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/button_character_instance.cpp        9 Dec 2006 23:14:49 -0000       
1.22
+++ server/button_character_instance.cpp        12 Dec 2006 22:41:05 -0000      
1.23
@@ -491,6 +491,10 @@
                        {
                                action_buffer* ab = 
m_def->m_button_actions[i].m_actions[j];
                                assert(ab);
+                               IF_VERBOSE_ACTION(
+                                       log_action("Executing actions for "
+                                               "button condition %d\n", c);
+                               );
                                ActionExec exec(*ab, get_environment());
                                exec();
                                

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- server/sprite_instance.cpp  12 Dec 2006 19:48:04 -0000      1.104
+++ server/sprite_instance.cpp  12 Dec 2006 22:41:05 -0000      1.105
@@ -2141,8 +2141,10 @@
                        IF_VERBOSE_ACTION(
                                log_action("Executing " SIZET_FMT 
                                        " *init* actions in frame " SIZET_FMT
+                                       "/" SIZET_FMT
                                        " of sprite %s", init_actions->size(),
-                                       frame, getTargetPath().c_str());
+                                       frame, get_frame_count(),
+                                       getTargetPath().c_str());
                        );
 
 
@@ -2160,8 +2162,9 @@
 
        IF_VERBOSE_ACTION(
                log_action("Executing " SIZET_FMT " actions in frame "
-                       SIZET_FMT " of sprite %s %s",
-                       playlist.size(), frame, getTargetPath().c_str(),
+                       SIZET_FMT "/" SIZET_FMT " of sprite %s %s",
+                       playlist.size(), frame, get_frame_count(),
+                       getTargetPath().c_str(),
                        state_only ? "(state only)" : "" );
        );