[Scummvm-cvs-logs] SF.net SVN: scummvm:[41395] scummvm/trunk/engines/agos

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Tue Jun 9 08:37:42 CEST 2009


Revision: 41395
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41395&view=rev
Author:   Kirben
Date:     2009-06-09 06:37:42 +0000 (Tue, 09 Jun 2009)

Log Message:
-----------
Remove unused old code.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/animation.cpp
    scummvm/trunk/engines/agos/animation.h

Modified: scummvm/trunk/engines/agos/animation.cpp
===================================================================
--- scummvm/trunk/engines/agos/animation.cpp	2009-06-09 05:25:23 UTC (rev 41394)
+++ scummvm/trunk/engines/agos/animation.cpp	2009-06-09 06:37:42 UTC (rev 41395)
@@ -367,12 +367,7 @@
 	copyFrameToBuffer((byte *)screen->pixels, (_vm->_screenWidth - getWidth()) / 2, (_vm->_screenHeight - getHeight()) / 2, _vm->_screenWidth);
 	_vm->_system->unlockScreen();
 
-	if ((_bgSoundStream == NULL) || ((int)(_mixer->getSoundElapsedTime(_bgSound) * getFrameRate()) / 1000 < getCurFrame() + 1) ||
-		_frameSkipped > getFrameRate()) {
-		if (_frameSkipped > getFrameRate()) {
-			warning("force frame %i redraw", getCurFrame());
-			_frameSkipped = 0;
-		}
+	if ((_bgSoundStream == NULL) || ((int)(_mixer->getSoundElapsedTime(_bgSound) * getFrameRate()) / 1000 < getCurFrame() + 1)) {
 
 		if (_bgSoundStream && _mixer->isSoundHandleActive(_bgSound)) {
 			while (_mixer->isSoundHandleActive(_bgSound) && (_mixer->getSoundElapsedTime(_bgSound) * getFrameRate()) / 1000 < (uint32)getCurFrame()) {
@@ -392,7 +387,6 @@
 	}
 
 	warning("dropped frame %i", getCurFrame());
-	_frameSkipped++;
 	return false;
 }
 

Modified: scummvm/trunk/engines/agos/animation.h
===================================================================
--- scummvm/trunk/engines/agos/animation.h	2009-06-09 05:25:23 UTC (rev 41394)
+++ scummvm/trunk/engines/agos/animation.h	2009-06-09 06:37:42 UTC (rev 41395)
@@ -52,7 +52,6 @@
 	bool _rightButtonDown;
 	bool _skipMovie;
 	uint32 _ticks;
-	uint16 _frameSkipped;
 
 	char baseName[40];
 public:


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