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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/20 10:06:50

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
                * server/sprite_instance.cpp (get_member): fixed
                  CHECK_FOR_NAME_CLASHES block.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1976&r2=1.1977
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.109&r2=1.110

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1976
retrieving revision 1.1977
diff -u -b -r1.1976 -r1.1977
--- ChangeLog   20 Dec 2006 09:09:26 -0000      1.1976
+++ ChangeLog   20 Dec 2006 10:06:50 -0000      1.1977
@@ -1,5 +1,7 @@
 2006-12-20 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (get_member): fixed 
+         CHECK_FOR_NAME_CLASHES block.
        * testsuite/movies.all/README: filled 'origin' field
          for gravity.swf and gravity-embed.swf.
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- server/sprite_instance.cpp  18 Dec 2006 15:51:35 -0000      1.109
+++ server/sprite_instance.cpp  20 Dec 2006 10:06:50 -0000      1.110
@@ -1443,12 +1443,12 @@
 //#define CHECK_FOR_NAME_CLASHES 1
 #ifdef CHECK_FOR_NAME_CLASHES
                IF_VERBOSE_ASCODING_ERRORS(
-               if (  
m_display_list.get_character_by_name_i(std::string(name.c_str())));
+               if (  
m_display_list.get_character_by_name_i(std::string(name.c_str())) )
                {
-                       log_warning("A variable name (%s) clashes with "
+                       log_warning("A sprite member (%s) clashes with "
                                        "the name of an existing character "
-                                       "in the display list! "
-                                       "The variable will hide the "
+                                       "in its display list! "
+                                       "The member will hide the "
                                        "character.", name.c_str());
                }
                );