[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.129,1.130

Johannes Schickel lordhoto at users.sourceforge.net
Sat Jan 21 10:44:01 CET 2006


Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5983

Modified Files:
	kyra.cpp 
Log Message:
Fixes bug # 1411432 (KYRA: graphics glitch when using the ice scroll)


Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- kyra.cpp	21 Jan 2006 13:01:18 -0000	1.129
+++ kyra.cpp	21 Jan 2006 18:43:17 -0000	1.130
@@ -1287,6 +1287,7 @@
 		_animator->sprites()[0].active = 0;
 		_sprites->_anims[1].play = true;
 		_animator->sprites()[1].active = 1;
+		setGameFlag(0xA2);
 	}
 	
 	for (int i = 147; i <= 157; ++i) {
@@ -1304,6 +1305,9 @@
 		memcpy(tmpPal, _screen->_currentPalette, 768);
 		memcpy(&tmpPal[684], palTable2()[0], 60);
 		_screen->fadePalette(tmpPal, 72);
+		memcpy(&_screen->_currentPalette[684], palTable2()[0], 60);
+		_screen->setScreenPalette(_screen->_currentPalette);
+		setGameFlag(0xB3);
 	} else {
 		delayWithTicks(120);
 	}





More information about the Scummvm-git-logs mailing list