[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.19,1.20

Robert G?ffringmann lavosspawn at users.sourceforge.net
Fri Jul 4 19:34:06 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv11809/sky

Modified Files:
	control.cpp 
Log Message:
fixed control panel palette for v. 0.0348

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- control.cpp	5 Jul 2003 00:29:16 -0000	1.19
+++ control.cpp	5 Jul 2003 02:33:56 -0000	1.20
@@ -350,9 +350,9 @@
 		return; // I don't think this can even happen
 	initPanel();
 	_skyScreen->clearScreen();
-	if (SkyState::_systemVars.gameVersion < 368)
+	if ((!SkyState::isCDVersion()) && (SkyState::_systemVars.gameVersion != 348)) 
 		_skyScreen->setPalette(60509);
-	else 
+	else
 		_skyScreen->setPalette(60510);
 
 	_savedMouse = _skyMouse->giveCurrentMouseType();
@@ -380,9 +380,9 @@
 	initPanel();
 
 	_skyScreen->clearScreen();
-	if (SkyState::_systemVars.gameVersion < 368) 
+	if ((!SkyState::isCDVersion()) && (SkyState::_systemVars.gameVersion != 348)) 
 		_skyScreen->setPalette(60509);
-	else 
+	else
 		_skyScreen->setPalette(60510);
 	
 	drawMainPanel();





More information about the Scummvm-git-logs mailing list