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

athrxx at users.sourceforge.net athrxx at users.sourceforge.net
Sat Oct 10 14:29:36 CEST 2009


Revision: 44870
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44870&view=rev
Author:   athrxx
Date:     2009-10-10 12:29:36 +0000 (Sat, 10 Oct 2009)

Log Message:
-----------
LOL/PC-98: fixed two minor bugs

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

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2009-10-10 12:13:34 UTC (rev 44869)
+++ scummvm/trunk/engines/kyra/screen.cpp	2009-10-10 12:29:36 UTC (rev 44870)
@@ -3048,7 +3048,7 @@
 		if (page == 6 || page == 7)
 			return _sjisOverlayPtrs[4];
 		if (page == 12 || page == 13)
-			return _sjisOverlayPtrs[3];
+			return _sjisOverlayPtrs[5];
 	}
 
 	return 0;

Modified: scummvm/trunk/engines/kyra/screen.h
===================================================================
--- scummvm/trunk/engines/kyra/screen.h	2009-10-10 12:13:34 UTC (rev 44869)
+++ scummvm/trunk/engines/kyra/screen.h	2009-10-10 12:29:36 UTC (rev 44870)
@@ -305,7 +305,7 @@
 		SCREEN_PAGE_SIZE = 320 * 200 + 1024,
 		SCREEN_OVL_SJIS_SIZE = 640 * 400,
 		SCREEN_PAGE_NUM = 16,
-		SCREEN_OVLS_NUM = 5
+		SCREEN_OVLS_NUM = 6
 	};
 
 	enum CopyRegionFlags {

Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp	2009-10-10 12:13:34 UTC (rev 44869)
+++ scummvm/trunk/engines/kyra/script_tim.cpp	2009-10-10 12:29:36 UTC (rev 44870)
@@ -1168,18 +1168,16 @@
 
 void TIMInterpreter_LoL::drawDialogueButtons() {
 	int cp = _screen->setCurPage(0);
-	Screen::FontId of;
+	Screen::FontId of = _screen->setFont(_vm->gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
 
 	int x = _dialogueButtonPosX;
 
 	for (int i = 0; i < _dialogueNumButtons; i++) {
 		if (_vm->gameFlags().use16ColorMode) {
-			of = _screen->setFont(Screen::FID_SJIS_FNT);
 			_vm->gui_drawBox(x, (_dialogueButtonPosY & ~7) - 1, 74, 10, 0xee, 0xcc, -1);
 			_screen->printText(_dialogueButtonString[i], (x + 37 - (_screen->getTextWidth(_dialogueButtonString[i])) / 2) & ~3,
 				(_dialogueButtonPosY + 2) & ~7, _dialogueHighlightedButton == i ? 0xc1 : 0xe1, 0);
 		} else {
-			of = _screen->setFont(Screen::FID_6_FNT);
 			_vm->gui_drawBox(x, _dialogueButtonPosY, 74, 9, 136, 251, -1);
 			_screen->printText(_dialogueButtonString[i], x + 37 - (_screen->getTextWidth(_dialogueButtonString[i])) / 2,
 				_dialogueButtonPosY + 2, _dialogueHighlightedButton == i ? 144 : 254, 0);
@@ -1215,18 +1213,15 @@
 
 			if (e == 43 || e == 61) {
 				_vm->snd_stopSpeech(true);
-				//_dlgTimer = 0;
 			}
 		}
 
 		if (_vm->snd_updateCharacterSpeech() != 2) {
-			//if (_dlgTimer < _system->getMillis()) {
 				res = 1;
 				if (!_vm->shouldQuit()) {
 					_vm->removeInputTop();
 					_vm->gui_notifyButtonListChanged();
 				}
-			//}
 		}
 	} else {
 		int e = _vm->checkInput(0, false) & 0xFF;


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