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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/08 11:35:03

Modified files:
        server         : character.cpp sprite_instance.cpp 
                         swf_function.cpp 

Log message:
        cleanup some comments about _lockroot

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.430&r2=1.431
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.cpp?cvsroot=gnash&r1=1.44&r2=1.45

Patches:
Index: character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- character.cpp       23 Dec 2007 22:29:56 -0000      1.71
+++ character.cpp       8 Jan 2008 11:35:02 -0000       1.72
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: character.cpp,v 1.71 2007/12/23 22:29:56 strk Exp $ */
+/* $Id: character.cpp,v 1.72 2008/01/08 11:35:02 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -115,7 +115,7 @@
        }
        else if (name == "_root")
        {
-               // TODO: handle lockroot ? or have get_root handle it ?
+               // get_root() will handle _lockroot 
                return get_root();
        }
        else if (name.compare(0, 6, "_level") == 0 && 
name.find_first_not_of("0123456789", 7) == string::npos )

Index: sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -b -r1.430 -r1.431
--- sprite_instance.cpp 8 Jan 2008 10:36:57 -0000       1.430
+++ sprite_instance.cpp 8 Jan 2008 11:35:02 -0000       1.431
@@ -4185,14 +4185,10 @@
        if ( rootParent )
        {
                // if the relative root has a parent we descend
-               // to it unless SWF version of relRoot is >= 7
-               // AND _lockroot is true
-               //if ( relRoot->getSWFVersion() >= 7 )
+               // to it unless SWF version of the VM is >= 7
+               // AND _lockroot of the relative url is true
                if ( getVM().getSWFVersion() >= 7 )
                {
-                       //string_table& st = _vm.getStringTable();
-                       //as_value lockRoot = 
relRoot->getMember(st.find("_lockroot"));
-                       //if ( lockRoot.to_bool() )
                        if ( relRoot->getLockRoot() )
                        {
                                return relRoot;

Index: swf_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- swf_function.cpp    14 Dec 2007 20:51:20 -0000      1.44
+++ swf_function.cpp    8 Jan 2008 11:35:02 -0000       1.45
@@ -235,7 +235,7 @@
                if (m_function2_flags & PRELOAD_ROOT) 
                {
                        // Put '_root' in a register.
-                       // TODO: handle lockroot ? (or let get_root() do that?)
+                       // NOTE: _lockroot will be hanlded by get_root()
                        our_env->local_register(current_reg).set_as_object(
                                our_env->get_target()->get_root());
                        current_reg++;