CVSROOT: /sources/gnash
Module name: gnash
Changes by: Zou Lunkai <zoulunkai> 07/09/20 09:51:12
Modified files:
. : ChangeLog
server : sprite_instance.cpp
Log message:
* server/sprite_instance.cpp: goto_frame(), revert a few changes,
which I believe caused the infinite loop when executing
get_frame_number_test.swf
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4357&r2=1.4358
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.348&r2=1.349
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4357
retrieving revision 1.4358
diff -u -b -r1.4357 -r1.4358
--- ChangeLog 20 Sep 2007 08:13:22 -0000 1.4357
+++ ChangeLog 20 Sep 2007 09:51:11 -0000 1.4358
@@ -1,5 +1,10 @@
2007-09-20 Zou Lunkai <[EMAIL PROTECTED]>
+ * server/sprite_instance.cpp: goto_frame(), revert a few changes,
+ which I believe caused the infinite loop when executing
get_frame_number_test.swf
+
+2007-09-20 Zou Lunkai <[EMAIL PROTECTED]>
+
* server/asobj/Key.cpp: use key::codeMap instead of key::code.
2007-09-20 Zou Lunkai <[EMAIL PROTECTED]>
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -b -r1.348 -r1.349
--- server/sprite_instance.cpp 19 Sep 2007 23:24:44 -0000 1.348
+++ server/sprite_instance.cpp 20 Sep 2007 09:51:12 -0000 1.349
@@ -2466,8 +2466,10 @@
if(target_frame_number > m_def->get_frame_count() - 1)
{
- // TODO: should we assert this is never the case ?
- target_frame_number = m_def->get_frame_count() - 1;
+ // Just set _currentframe and return.
+ m_current_frame = m_def->get_frame_count() - 1;
+ // don't push actions, already tested.
+ return;
}
if(target_frame_number == m_current_frame)
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
