[Gnash-commit] gnash/server sprite_instance.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/26 13:05:17

Modified files:
        server         : sprite_instance.cpp 

Log message:
        Oops, fixed typo in last commit, and also a conceptual bug related to 
init actions execution

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.422&r2=1.423

Patches:
Index: sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -b -r1.422 -r1.423
--- sprite_instance.cpp 26 Dec 2007 12:35:13 -0000      1.422
+++ sprite_instance.cpp 26 Dec 2007 13:05:17 -0000      1.423
@@ -2449,7 +2449,7 @@
 void
 sprite_instance::execute_init_action_buffer(const action_buffer& a, int cid)
 {
-       movie_instance* mi = get_root();
+       movie_instance* mi = m_root; // get_root(); // WARNING! get_root() 
would depend on _lockroot !!
        if ( mi->setCharacterInitialized(cid) )
        {
 #ifdef GNASH_DEBUG
@@ -3590,7 +3590,7 @@
                extern_movie->setVariables(vars);
 
                // Set lockroot to our value of it
-               extern_movie->set_member( PROP_uLOCKROOT, getLockRoot() );
+               extern_movie->setLockRoot( getLockRoot() );
 
                save_extern_movie(extern_movie.get());