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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/16 19:00:57

Modified files:
        .              : ChangeLog 
        server         : button_character_instance.cpp 

Log message:
        * server/button_character_instance.cpp (on_button_event): execute 
events handler immediately, not at next 'advance'

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1250&r2=1.1251
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1250
retrieving revision 1.1251
diff -u -b -r1.1250 -r1.1251
--- ChangeLog   16 Oct 2006 18:38:25 -0000      1.1250
+++ ChangeLog   16 Oct 2006 19:00:57 -0000      1.1251
@@ -1,5 +1,7 @@
 2006-10-16 Sandro Santilli <address@hidden>
 
+       * server/button_character_instance.cpp (on_button_event):
+         execute events handler immediately, not at next 'advance'
        * configure.ac: comment out unused OGG and PNG checks
        * testsuite/server/Makefile.amadd libgnashbase explicit
          linking as the one deduced by libgnashserver seems

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/button_character_instance.cpp        16 Oct 2006 14:33:38 -0000      
1.5
+++ server/button_character_instance.cpp        16 Oct 2006 19:00:57 -0000      
1.6
@@ -9,15 +9,9 @@
 #include "button_character_instance.h"
 #include "button_character_def.h"
 
-//#include "action.h"
-//#include "render.h"
-//#include "sound.h"
-//#include "stream.h"
-//#include "movie_definition.h"
+#include "ActionExec.h"
 #include "sprite_instance.h"
 #include "movie_root.h"
-//#include "action_buffer.h"
-
 
 /** \page buttons Buttons and mouse behaviour
 
@@ -466,7 +460,14 @@
                        // Matching action.
                        for (unsigned int j = 0; j < 
m_def->m_button_actions[i].m_actions.size(); j++)
                        {
-                               
get_parent()->add_action_buffer(m_def->m_button_actions[i].m_actions[j]);
+                               action_buffer* ab = 
m_def->m_button_actions[i].m_actions[j];
+                               assert(ab);
+                               sprite_instance* si = 
dynamic_cast<sprite_instance*>(get_parent());
+                               assert(si);
+                               ActionExec exec(*ab, si->get_environment());
+                               exec();
+                               
+                               //get_parent()->add_action_buffer(ab);
                        }
                }
        }}