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

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/10/05 14:19:55

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
        server/sprite_instance.cpp: Allow attachMovie() to accept also button 
definitions, not just movie clips

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4538&r2=1.4539
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.366&r2=1.367

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4538
retrieving revision 1.4539
diff -u -b -r1.4538 -r1.4539
--- ChangeLog   5 Oct 2007 11:26:00 -0000       1.4538
+++ ChangeLog   5 Oct 2007 14:19:54 -0000       1.4539
@@ -1,3 +1,8 @@
+2007-10-05 Udo Giacomozzi <address@hidden>
+
+       * server/sprite_instance.cpp: Allow attachMovie() to accept also
+         button definitions, not just movie clips
+
 2007-10-05 Sandro Santilli <address@hidden>
 
        * testsuite/misc-swfmill.all/: Makefile.am, jump_after_end.xml:

Index: server/sprite_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -b -r1.366 -r1.367
--- server/sprite_instance.cpp  4 Oct 2007 12:01:35 -0000       1.366
+++ server/sprite_instance.cpp  5 Oct 2007 14:19:55 -0000       1.367
@@ -175,12 +175,13 @@
                );
                return rv; 
        }
-       movie_definition* exported_movie = 
dynamic_cast<movie_definition*>(exported.get());
+       
+       character_def* exported_movie = 
dynamic_cast<character_def*>(exported.get());
        if ( ! exported_movie )
        {
                IF_VERBOSE_ASCODING_ERRORS(
                log_aserror(_("attachMovie: exported resource '%s' "
-                       "is not a movie definition (%s) -- "
+                       "is not a character definition (%s) -- "
                        "returning undefined"),
                        id_name.c_str(),
                        typeid(*(exported.get())).name());
@@ -194,7 +195,6 @@
        int depth_val = uint16_t(fn.arg(2).to_number());
 
        boost::intrusive_ptr<character> newch = 
exported_movie->create_character_instance(sprite.get(), depth_val);
-       assert( dynamic_cast<sprite_instance*>(newch.get()) );
        assert( newch.get() > (void*)0xFFFF );
 #ifndef GNASH_USE_GC
        assert(newch->get_ref_count() > 0);