[Gnash-commit] gnash ChangeLog server/as_environment.h server/...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/06/28 17:33:38

Modified files:
        .              : ChangeLog 
        server         : as_environment.h Function.cpp 
        server/swf     : ASHandlers.cpp 

Log message:
        * server/swf/ASHandlers.cpp, server/Function.cpp: updated to work with 
the private as_environment::m_target.
        * server/as_environment.h: m_target made private.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.436&r2=1.437
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Function.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -b -r1.436 -r1.437
--- ChangeLog   28 Jun 2006 11:57:37 -0000      1.436
+++ ChangeLog   28 Jun 2006 17:33:37 -0000      1.437
@@ -1,5 +1,8 @@
 2006-06-28 Sandro Santilli <address@hidden>
 
+       * server/swf/ASHandlers.cpp, server/Function.cpp: updated to work
+       with the private as_environment::m_target.
+       * server/as_environment.h:  m_target made private.
        * server/as_environment.cpp (find_target): assert that
        an as_value of type OBJECT can be cast to an object.
        * server/Makefile.am, server/character_def.cpp, server/impl.cpp:

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/as_environment.h     21 Jun 2006 23:06:41 -0000      1.4
+++ server/as_environment.h     28 Jun 2006 17:33:38 -0000      1.5
@@ -64,6 +64,7 @@
 /// ActionScript "environment", essentially VM state?
 struct as_environment
 {
+
        /// Stack of as_values in this environment
        std::vector<as_value>   m_stack;
 
@@ -72,9 +73,6 @@
        /// function2 uses this
        std::vector<as_value>   m_local_register;
 
-       /// Movie target. 
-       movie*  m_target;
-
        /// Variables available in this environment
        stringi_hash<as_value>  m_variables;
 
@@ -226,6 +224,9 @@
 
 private:
 
+       /// Movie target. (change to sprite_instance)
+       movie*  m_target;
+
        /// Given a variable name, set its value (no support for path)
        void set_variable_raw(const tu_string& path, const as_value& val,
                const std::vector<with_stack_entry>& with_stack);

Index: server/Function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/Function.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/Function.cpp 26 Jun 2006 10:12:10 -0000      1.20
+++ server/Function.cpp 28 Jun 2006 17:33:38 -0000      1.21
@@ -285,7 +285,7 @@
                if (m_function2_flags & 0x01)
                {
                        // preload 'this' into a register.
-                       
(*(our_env->local_register_ptr(current_reg))).set_as_object(our_env->m_target);
+                       
(*(our_env->local_register_ptr(current_reg))).set_as_object(our_env->get_target());
                        current_reg++;
                }
 
@@ -296,7 +296,7 @@
                else
                {
                        // Put 'this' in a local var.
-                       our_env->add_local("this", as_value(our_env->m_target));
+                       our_env->add_local("this", 
as_value(our_env->get_target()));
                }
 
                // Init arguments array, if it's going to be needed.
@@ -352,7 +352,7 @@
                {
                        // Put '_root' in a register.
                        
(*(our_env->local_register_ptr(current_reg))).set_as_object(
-                               our_env->m_target->get_root_movie());
+                               our_env->get_target()->get_root_movie());
                        current_reg++;
                }
 

Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/swf/ASHandlers.cpp   27 Jun 2006 18:45:26 -0000      1.15
+++ server/swf/ASHandlers.cpp   28 Jun 2006 17:33:38 -0000      1.16
@@ -1100,7 +1100,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
-    env.push(floorf(env.m_target->get_timer() * 1000.0f));
+    env.push(floorf(env.get_target()->get_timer() * 1000.0f));
 }
 
 void
@@ -1342,8 +1342,8 @@
        as_environment& env = thread.env;
 
        // Note: no extra data in this instruction!
-       assert(env.m_target);
-       env.m_target->call_frame_actions(env.top(0));
+       assert(env.get_target());
+       env.get_target()->call_frame_actions(env.top(0));
        env.drop(1);
 }