[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/12/12 08:38:16

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

Log message:
        * server/sprite_instance.{h,cpp}: clone_display_object(), remove dead 
function.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5140&r2=1.5141
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.409&r2=1.410
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.155&r2=1.156

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5140
retrieving revision 1.5141
diff -u -b -r1.5140 -r1.5141
--- ChangeLog   12 Dec 2007 06:16:30 -0000      1.5140
+++ ChangeLog   12 Dec 2007 08:38:15 -0000      1.5141
@@ -4,6 +4,7 @@
          forget to set charcter depth and id.
        * server/swf/PlaceObject2Tag.cpp: readPlaceObject2() and 
readPlaceObject3(),
          replace 8 read_bit() with one read_u8().
+       * server/sprite_instance.{h,cpp}: clone_display_object(), remove dead 
function.
          
 2007-12-12 Sandro Santilli <address@hidden>
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -b -r1.409 -r1.410
--- server/sprite_instance.cpp  12 Dec 2007 03:23:30 -0000      1.409
+++ server/sprite_instance.cpp  12 Dec 2007 08:38:16 -0000      1.410
@@ -2175,38 +2175,6 @@
        return newsprite;
 }
 
-#if 0
-void sprite_instance::clone_display_object(const std::string& name,
-       const std::string& newname, int depth)
-{
-//            GNASH_REPORT_FUNCTION;
-
-    character* ch = m_display_list.get_character_by_name(name);
-    if (ch) // TODO: should we check for isActionScriptReferenceable here ?
-       {
-
-           std::vector<swf_event*>     dummy_event_handlers;
-
-           add_display_object(
-               ch->get_id(),
-               newname.c_str(),
-               dummy_event_handlers,
-               depth,
-               ch->get_cxform(),
-               ch->get_matrix(),
-               ch->get_ratio(),
-               ch->get_clip_depth());
-           // @@ TODO need to duplicate ch's event handlers, and presumably 
other members?
-           // Probably should make a character::clone() function to handle 
this.
-       }
-    else
-    {
-           log_error(_("clone_display_object(%s, %s, %d): could not find a 
character named %s to clone"),
-                           name.c_str(), newname.c_str(), depth, name.c_str());
-    }
-}
-#endif
-
 /* public */
 void
 sprite_instance::queueAction(const action_buffer& action)

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -b -r1.155 -r1.156
--- server/sprite_instance.h    10 Dec 2007 20:17:17 -0000      1.155
+++ server/sprite_instance.h    12 Dec 2007 08:38:16 -0000      1.156
@@ -875,12 +875,6 @@
        ///     Member name. 
        ///
        void checkForKeyOrMouseEvent(const std::string& name);
-#if 0
-       /// Duplicate the object with the specified name
-       /// and add it with a new name  at a new depth.
-       void clone_display_object(const std::string& name,
-               const std::string& newname, int depth);
-#endif
 
        /// Advance to a previous frame.
        //