[Scummvm-cvs-logs] SF.net SVN: scummvm:[45363] scummvm/trunk/engines/sci/gui/gui.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 45363
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45363&view=rev
Author:   m_kiewitz
Date:     2009-10-24 19:47:53 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
SCI/newgui: dont react on paletteSet when playing an EGA game (fixes Xmas card EGA)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui.cpp

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-24 19:29:06 UTC (rev 45362)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-24 19:47:53 UTC (rev 45363)
@@ -457,6 +457,9 @@
 
 
 void SciGui::paletteSet(GuiResourceId resourceId, uint16 flags) {
+	// we are also called on EGA games as well, this doesnt make sense. doing this would actually break the system EGA palette
+	if (!_s->resMan->isVGA())
+		return;
    _palette->setFromResource(resourceId, flags);
 }
 


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