CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/02/16 13:51:49
Modified files:
server : sprite_instance.cpp
Log message:
cleanups
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.168&r2=1.169
Patches:
Index: sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -b -r1.168 -r1.169
--- sprite_instance.cpp 16 Feb 2007 13:49:22 -0000 1.168
+++ sprite_instance.cpp 16 Feb 2007 13:51:49 -0000 1.169
@@ -2985,9 +2985,6 @@
return NULL;
}
- std::string instance_name;
- if ( name ) instance_name = name;
-
character* existing_char = m_display_list.get_character_at_depth(depth);
if (existing_char)
@@ -3003,6 +3000,7 @@
sameEvents(existing_char->get_event_handlers(),
event_handlers) )
{
+ // TODO: update name ?
move_display_object(depth, true, color_transform,
true, matrix, ratio, clip_depth);
return NULL;
@@ -3025,7 +3023,9 @@
// TODO: check if we need to do this *only* for sprite characters
// also, consider asking for "nextInstanceName" to the character
// definition...
- if ( instance_name.empty() ) instance_name =
getNextUnnamedInstanceName();
+ std::string instance_name;
+ if ( name ) instance_name = name;
+ else instance_name = getNextUnnamedInstanceName();
ch->set_name(instance_name.c_str());
_______________________________________________
Gnash-commit mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnash-commit
