[Scummvm-cvs-logs] SF.net SVN: scummvm:[40884] scummvm/trunk/engines/tinsel

Hkz at users.sourceforge.net Hkz at users.sourceforge.net
Mon May 25 13:18:29 CEST 2009


Revision: 40884
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40884&view=rev
Author:   Hkz
Date:     2009-05-25 11:18:29 +0000 (Mon, 25 May 2009)

Log Message:
-----------
tinsel: remove the ugly psx l-space workaround, and instead add a check into PlayMidi for psx version

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/play.cpp
    scummvm/trunk/engines/tinsel/tinlib.cpp

Modified: scummvm/trunk/engines/tinsel/play.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/play.cpp	2009-05-25 11:14:42 UTC (rev 40883)
+++ scummvm/trunk/engines/tinsel/play.cpp	2009-05-25 11:18:29 UTC (rev 40884)
@@ -978,16 +978,6 @@
 
 	CORO_BEGIN_CODE(_ctx);
 
-	// FIXME: (PSX_THIEF_BUG) this fixes a (script?) bug in Discworld PSX:
-	// If the player follows immediately the thief that steals the evocation book
-	// from the "past" unseen university, the stack seems to get loaded with wrong
-	// values and the game crashes when going into past-ankh map, if instead the 
-	// player interacts with other objects or goes back to L-space, the past-ankh
-	// map works perfectly.
-	// This is just a workaround.
-	if (TinselV1PSX && hFilm == 4 && actorid == 77)
-		return;
-
 	pFilm = (const FILM *)LockMem(hFilm);
 	PPINIT ppi;
 

Modified: scummvm/trunk/engines/tinsel/tinlib.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinlib.cpp	2009-05-25 11:14:42 UTC (rev 40883)
+++ scummvm/trunk/engines/tinsel/tinlib.cpp	2009-05-25 11:18:29 UTC (rev 40884)
@@ -1599,7 +1599,7 @@
  */
 static void PlayMidi(CORO_PARAM, SCNHANDLE hMidi, int loop, bool complete) {
 	// FIXME: This is a workaround for the FIXME below
-	if (GetMidiVolume() == 0)
+	if (GetMidiVolume() == 0 || TinselV1PSX)
 		return;
 
 	CORO_BEGIN_CONTEXT;
@@ -3834,11 +3834,6 @@
 	bool bQuick = hold != 0;
 	PMOVER pMover = GetMover(actor);
 	
-	// FIXME: This is part of the workaround for PSX_THIEF_BUG,
-	// See the other code and description in PlayFilm() (play.cpp)
-	if (TinselV1PSX && actor == 77 && hFilm == 0)
-		return;
-
 	assert(pMover); // Can't walk a non-moving actor
 
 	CORO_BEGIN_CODE(_ctx);


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