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

[Kirben at users.sourceforge.net]

Revision: 27102
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27102&view=rev
Author:   Kirben
Date:     2007-06-05 02:14:59 -0700 (Tue, 05 Jun 2007)

Log Message:
-----------
Updates, to keep Amiga demo of Elvira 1 working.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/agos/window.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2007-06-05 09:13:42 UTC (rev 27101)
+++ scummvm/trunk/engines/agos/agos.cpp	2007-06-05 09:14:59 UTC (rev 27102)
@@ -1000,7 +1000,7 @@
 	}
 
 	if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) {
-		loadMusic(0);
+		playMusic(0, 0);
 	}
 
 	if ((getPlatform() == Common::kPlatformAmiga || getPlatform() == Common::kPlatformMacintosh) &&

Modified: scummvm/trunk/engines/agos/window.cpp
===================================================================
--- scummvm/trunk/engines/agos/window.cpp	2007-06-05 09:13:42 UTC (rev 27101)
+++ scummvm/trunk/engines/agos/window.cpp	2007-06-05 09:14:59 UTC (rev 27102)
@@ -196,7 +196,9 @@
 	dst += y * _dxSurfacePitch;
 	src += y * _dxSurfacePitch;
 
-	const uint8 paletteMod = (getGameType() == GType_ELVIRA1 && y >= 133) ? 16 : 0;
+	uint8 paletteMod = 0;
+	if (getGameType() == GType_ELVIRA1 && !(getFeatures() & GF_DEMO) && y >= 133)
+		paletteMod = 16;
 
 	while (y < h) {
 		for (i = x; i < w; i++)


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