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

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/09/23 16:20:59

Modified files:
        server         : gnash.h sprite_instance.cpp 

Log message:
        The improved version of create_empty_movieclip(). Thanks Sandro Santilli

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.57&r2=1.58

Patches:
Index: gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- gnash.h     21 Sep 2006 16:02:46 -0000      1.48
+++ gnash.h     23 Sep 2006 16:20:59 -0000      1.49
@@ -249,8 +249,7 @@
 enum create_bitmaps_flag
 {
        DO_LOAD_BITMAPS,
-       DO_NOT_LOAD_BITMAPS,
-       DO_EMPTY_MOVIECLIP
+       DO_NOT_LOAD_BITMAPS
 };
 
 /// Use DO_NOT_LOAD_FONT_SHAPES if you know you have

Index: sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- sprite_instance.cpp 21 Sep 2006 16:03:30 -0000      1.57
+++ sprite_instance.cpp 23 Sep 2006 16:20:59 -0000      1.58
@@ -71,7 +71,7 @@
 #include "Key.h"
 #include "movie_root.h"
 #include "swf_event.h"
-
+#include "sprite_definition.h"
 namespace gnash {
 
 //------------------------------------------------
@@ -1058,10 +1058,10 @@
        cxform color_transform;
        matrix matrix;
 
-       // empty_mdef will be deleted during deliting sprite
-       movie_def_impl* empty_mdef = new movie_def_impl(DO_EMPTY_MOVIECLIP, 
DO_LOAD_FONT_SHAPES);
+       // empty_sprite_def will be deleted during deliting sprite
+       sprite_definition* empty_sprite_def = new sprite_definition(NULL, NULL);
 
-       sprite_instance* sprite =       new sprite_instance(empty_mdef, m_root, 
this, 0);
+       sprite_instance* sprite =       new sprite_instance(empty_sprite_def, 
m_root, this, 0);
        sprite->set_name(name);
 
        m_display_list.place_character(