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

[athrxx at users.sourceforge.net]

Revision: 44582
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44582&view=rev
Author:   athrxx
Date:     2009-10-04 01:05:27 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
LOL: fixed minor bugs in text displayer

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_lol.cpp
    scummvm/trunk/engines/kyra/screen_lol.cpp
    scummvm/trunk/engines/kyra/text_lol.cpp

Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp	2009-10-03 23:56:49 UTC (rev 44581)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp	2009-10-04 01:05:27 UTC (rev 44582)
@@ -1211,6 +1211,10 @@
 
 	_selectedCharacter = button->arg;
 	_weaponsDisabled = true;
+
+	if (_flags.use16ColorMode)
+		_screen->fillRect(112, 0, 288, 120, 0, 2);
+
 	gui_displayCharInventory(_selectedCharacter);
 	gui_enableCharInventoryButtons(_selectedCharacter);
 

Modified: scummvm/trunk/engines/kyra/screen_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_lol.cpp	2009-10-03 23:56:49 UTC (rev 44581)
+++ scummvm/trunk/engines/kyra/screen_lol.cpp	2009-10-04 01:05:27 UTC (rev 44582)
@@ -351,7 +351,7 @@
 
 	if (_use16ColorMode) {
 		fadeToBlack(delay);
-		fillRect(112, 0, 288, 120, 68);
+		fillRect(112, 0, 288, 120, 0x44);
 	} else {
 		Palette tpal(getPalette(0).getNumColors());
 		tpal.copy(getPalette(0), 128);

Modified: scummvm/trunk/engines/kyra/text_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_lol.cpp	2009-10-03 23:56:49 UTC (rev 44581)
+++ scummvm/trunk/engines/kyra/text_lol.cpp	2009-10-04 01:05:27 UTC (rev 44582)
@@ -459,7 +459,7 @@
 			break;
 
 		default:
-			_lineWidth += (pc98PrintFlag ? 4 : _screen->getCharWidth(c));
+			_lineWidth += (pc98PrintFlag ? 4 : _screen->getCharWidth((uint8)c));
 			_currentLine[_numCharsLeft++] = c;
 			_currentLine[_numCharsLeft] = 0;
 
@@ -586,7 +586,7 @@
 				//cut off line after last space
 				c = str[n1];
 				
-				lw -= _screen->getCharWidth(c);
+				lw -= _screen->getCharWidth((uint8)c);
 
 				if (!n2 && lw <= w)
 					n2 = n1;
@@ -729,7 +729,7 @@
 			if (_vm->speechEnabled()) {
 				if (((_vm->_system->getMillis() > speechPartTime) || (_vm->snd_updateCharacterSpeech() != 2)) && speechPartTime) {
 					loop = false;
-					inputFlag = 43;
+					inputFlag = _vm->_keyMap[Common::KEYCODE_RETURN];
 					break;
 				}
 			}
@@ -745,15 +745,14 @@
 		} else if (inputFlag == 199 || inputFlag == 201) {
 			if (_vm->posWithinRect(_vm->_mouseX, _vm->_mouseY, x, y, x + 74, y + 9))
 				target = true;
-
-		} else if (inputFlag == 199 || inputFlag == 201) {
+		} else if (inputFlag == 200 || inputFlag == 202) {
 			if (target)
 				loop = false;
 		}
 	} while (loop);
 
 
-	_screen->fillRect(x, y, x + 74, y + 9, _textDimData[_screen->curDimIndex()].color2);
+	_screen->fillRect(x, y, x + 73, y + 8, _textDimData[_screen->curDimIndex()].color2);
 	clearCurDim();
 
 	_vm->_timer->pauseSingleTimer(11, false);


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