[Scummvm-cvs-logs] SF.net SVN: scummvm:[44797] scummvm/trunk/engines/kyra

athrxx at users.sourceforge.net athrxx at users.sourceforge.net
Thu Oct 8 22:22:13 CEST 2009


Revision: 44797
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44797&view=rev
Author:   athrxx
Date:     2009-10-08 20:22:12 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
LOLLOL/PC-98: fixed add-spell-to-scroll animation

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/screen.cpp

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-10-08 20:13:52 UTC (rev 44796)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-10-08 20:22:12 UTC (rev 44797)
@@ -3057,17 +3057,21 @@
 			_screen->copyRegion(201, 1, 17, 15, 6, h, 2, 2, Screen::CR_NO_P_CHECK);
 			_screen->copyRegion(208, 1, 89, 15, 6, h, 2, 2, Screen::CR_NO_P_CHECK);
 			int cp = _screen->setCurPage(2);
-			_screen->fillRect(21, 15, 89, h + 15, 206);
+			_screen->fillRect(21, 15, 89, h + 15, _flags.use16ColorMode ? 0xbb : 206);
 			_screen->copyRegion(112, 16, 12, h + 15, 87, 14, 2, 2, Screen::CR_NO_P_CHECK);
 
 			int y = 15;
+			Screen::FontId of = _screen->setFont(Screen::FID_9_FNT);
 			for (int ii = 0; ii < 7; ii++) {
 				if (_availableSpells[ii] == -1)
 					continue;
 				uint8 col = (ii == _selectedSpell) ? 132 : 1;
+				if (_flags.use16ColorMode)
+					col = (ii == _selectedSpell) ? 0x88 : 0x44;
 				_screen->fprintString("%s", 24, y, col, 0, 0, getLangString(_spellProperties[_availableSpells[ii]].spellNameCode));
 				y += 9;
 			}
+			_screen->setFont(of);
 
 			_screen->setCurPage(cp);
 			_screen->copyRegion(8, 0, 8, 0, 96, 120, 3, 0, Screen::CR_NO_P_CHECK);

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2009-10-08 20:13:52 UTC (rev 44796)
+++ scummvm/trunk/engines/kyra/screen.cpp	2009-10-08 20:22:12 UTC (rev 44797)
@@ -3047,6 +3047,8 @@
 			return _sjisOverlayPtrs[3];
 		if (page == 6 || page == 7)
 			return _sjisOverlayPtrs[4];
+		if (page == 12 || page == 13)
+			return _sjisOverlayPtrs[3];
 	}
 
 	return 0;


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