[Scummvm-cvs-logs] SF.net SVN: scummvm:[43055] scummvm/branches/gsoc2009-mods/engines/scumm

[nolange at users.sourceforge.net]

Revision: 43055
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43055&view=rev
Author:   nolange
Date:     2009-08-04 20:27:25 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
remove a former workaround for Amiga MI

Modified Paths:
--------------
    scummvm/branches/gsoc2009-mods/engines/scumm/scumm.cpp
    scummvm/branches/gsoc2009-mods/engines/scumm/scumm.h

Modified: scummvm/branches/gsoc2009-mods/engines/scumm/scumm.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/scumm/scumm.cpp	2009-08-04 19:53:13 UTC (rev 43054)
+++ scummvm/branches/gsoc2009-mods/engines/scumm/scumm.cpp	2009-08-04 20:27:25 UTC (rev 43055)
@@ -279,7 +279,6 @@
 	_useTalkAnims = false;
 	_defaultTalkDelay = 0;
 	_musicType = MDT_NONE;
-	_tempMusic = 0;
 	_saveSound = 0;
 	memset(_extraBoxFlags, 0, sizeof(_extraBoxFlags));
 	memset(_scaleSlots, 0, sizeof(_scaleSlots));
@@ -1266,7 +1265,6 @@
 void ScummEngine::resetScumm() {
 	int i;
 
-	_tempMusic = 0;
 	debug(9, "resetScumm");
 
 	if (_game.version == 0) {
@@ -1881,17 +1879,6 @@
 		if (_musicEngine) {
 			// The music engine generates the timer data for us.
 			VAR(VAR_MUSIC_TIMER) = _musicEngine->getMusicTimer();
-		} else {
-			// Used for Money Island 1 (Amiga)
-			// TODO: The music delay (given in milliseconds) might have to be tuned a little
-			// to get it correct for all games. Without the ability to watch/listen to the
-			// original games, I can't do that myself.
-			const int MUSIC_DELAY = 350;
-			_tempMusic += delta * 1000 / 60;	// Convert delta to milliseconds
-			if (_tempMusic >= MUSIC_DELAY) {
-				_tempMusic -= MUSIC_DELAY;
-				VAR(VAR_MUSIC_TIMER) += 1;
-			}
 		}
 	}
 

Modified: scummvm/branches/gsoc2009-mods/engines/scumm/scumm.h
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/scumm/scumm.h	2009-08-04 19:53:13 UTC (rev 43054)
+++ scummvm/branches/gsoc2009-mods/engines/scumm/scumm.h	2009-08-04 20:27:25 UTC (rev 43055)
@@ -1127,7 +1127,6 @@
 	bool _haveActorSpeechMsg;
 	bool _useTalkAnims;
 	uint16 _defaultTalkDelay;
-	int _tempMusic;
 	int _saveSound;
 	bool _native_mt32;
 	bool _enable_gs;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.