[Scummvm-cvs-logs] SF.net SVN: scummvm:[47606] scummvm/trunk/engines/sci/engine/kgraphics.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Wed Jan 27 20:28:21 CET 2010


Revision: 47606
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47606&view=rev
Author:   m_kiewitz
Date:     2010-01-27 19:28:13 +0000 (Wed, 27 Jan 2010)

Log Message:
-----------
SCI: changed the pharkas workaround to also cover pharkas-floppy demo

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-27 18:11:49 UTC (rev 47605)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-27 19:28:13 UTC (rev 47606)
@@ -934,14 +934,14 @@
 	bool hiresMode = (argc > 7) ? true : false;
 	reg_t upscaledHiresHandle = (argc > 7) ? argv[7] : NULL_REG;
 
-	if (s->_gameId == "freddypharkas") {
+	if ((s->_gameId == "freddypharkas") || (s->_gameId == "freddypharkas-demo")) {
 		// WORKAROUND
 		// Script 24 contains code that draws the game menu on screen. It uses a temp variable for setting priority that
 		//  is not set. in Sierra sci this happens to be 8250h. In our sci temporary variables are initialized thus we would
 		//  get 0 here resulting in broken menus.
-		if ((viewId == 995) && (x == 0x33) && (y == 0x26)) // game menu
+		if ((viewId == 995) && (loopNo == 0) && (celNo == 0) && (priority == 0)) // game menu
 			priority = 15;
-		if ((viewId == 992) && (x == 48) && (y == 24)) // quit game
+		if ((viewId == 992) && (loopNo == 0) && (celNo == 0) && (priority == 0)) // quit game
 			priority = 15;
 	}
 


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