[Scummvm-cvs-logs] SF.net SVN: scummvm: [22138] scummvm/trunk/engines/simon/animation.cpp
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Mon Apr 24 03:33:07 CEST 2006
Revision: 22138
Author: kirben
Date: 2006-04-24 03:32:36 -0700 (Mon, 24 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22138&view=rev
Log Message:
-----------
Remove duplicate code
Modified Paths:
--------------
scummvm/trunk/engines/simon/animation.cpp
Modified: scummvm/trunk/engines/simon/animation.cpp
===================================================================
--- scummvm/trunk/engines/simon/animation.cpp 2006-04-24 10:28:48 UTC (rev 22137)
+++ scummvm/trunk/engines/simon/animation.cpp 2006-04-24 10:32:36 UTC (rev 22138)
@@ -148,14 +148,9 @@
startSound();
- while (_frameNum < _framesCount) {
+ while (_frameNum < _framesCount)
handleNextFrame();
- if (_leftButtonDown && _rightButtonDown && !_vm->getBitFlag(41)) {
- _frameNum = _framesCount;
- }
- }
-
close();
_vm->o_killAnimate();
@@ -167,6 +162,12 @@
}
}
+void MoviePlayer::close() {
+ _fd.close();
+ free(_frameBuffer1);
+ free(_frameBuffer2);
+}
+
void MoviePlayer::startSound() {
uint32 tag = _fd.readUint32BE();
if (tag == MKID_BE('WAVE')) {
@@ -182,12 +183,6 @@
}
}
-void MoviePlayer::close() {
- _fd.close();
- free(_frameBuffer1);
- free(_frameBuffer2);
-}
-
void MoviePlayer::nextFrame() {
if (!_omniTV)
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list