1 files changed, 174 insertions, 115 deletions

diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text_rpg.cpp
index 52c14c7223..a19d678e35 100644
--- a/engines/kyra/text_rpg.cpp
+++ b/engines/kyra/text_rpg.cpp
@@ -36,7 +36,7 @@ enum {
 
 TextDisplayer_rpg::TextDisplayer_rpg(KyraRpgEngine *engine, Screen *scr) : _vm(engine), _screen(scr),
 	_lineCount(0), _printFlag(false), _lineWidth(0), _numCharsTotal(0), _allowPageBreak(true),
-	_numCharsLeft(0), _numCharsPrinted(0), _sjisLineBreakFlag(false), _waitButtonMode(1) {
+	_numCharsLeft(0), _numCharsPrinted(0), _sjisTextModeLineBreak(false), _waitButtonMode(1) {
 
 	_dialogueBuffer = new char[kEoBTextBufferSize];
 	memset(_dialogueBuffer, 0, kEoBTextBufferSize);
@@ -88,8 +88,8 @@ void TextDisplayer_rpg::resetDimTextPositions(int dim) {
 }
 
 void TextDisplayer_rpg::resetPageBreakString() {
-	if (vm()->_moreStrings)
-		strcpy(_pageBreakString, vm()->_moreStrings[0]);
+	if (_vm->_moreStrings)
+		strcpy(_pageBreakString, _vm->_moreStrings[0]);
 }
 
 void TextDisplayer_rpg::setPageBreakFlag() {
@@ -102,8 +102,6 @@ void TextDisplayer_rpg::removePageBreakFlag() {
 }
 
 void TextDisplayer_rpg::displayText(char *str, ...) {
-	const bool isPc98 = (_vm->gameFlags().platform == Common::kPlatformPC98);
-
 	_printFlag = false;
 
 	_lineWidth = 0;
@@ -125,7 +123,9 @@ void TextDisplayer_rpg::displayText(char *str, ...) {
 	const ScreenDim *sd = _screen->_curDim;
 	int sdx = _screen->curDimIndex();
 
-	bool pc98PrintFlag = (isPc98 && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
+	bool sjisTextMode = (_vm->gameFlags().lang == Common::JA_JPN && _vm->gameFlags().use16ColorMode && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
+	int sjisOffs = sjisTextMode ? 8 : 9;
+
 	uint16 charsPerLine = (sd->w << 3) / (_screen->getFontWidth() + _screen->_charWidth);
 
 	while (c) {
@@ -146,15 +146,25 @@ void TextDisplayer_rpg::displayText(char *str, ...) {
 			c = parseCommand();
 		}
 
-		if (isPc98) {
+		if (_vm->gameFlags().lang == Common::JA_JPN) {
 			uint8 cu = (uint8) c;
 			if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0)) {
-				_currentLine[_numCharsLeft++] = c;
-				_currentLine[_numCharsLeft++] = parseCommand();
-				_currentLine[_numCharsLeft] = '\0';
-				_lineWidth += 8;
-				if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
+				if (sjisTextMode) {
+					_currentLine[_numCharsLeft++] = c;
+					_currentLine[_numCharsLeft++] = parseCommand();
+					_currentLine[_numCharsLeft] = '\0';
+				}
+
+				if ((_textDimData[sdx].column + _lineWidth + sjisOffs) > (sd->w << 3))
 					printLine(_currentLine);
+
+				if (!sjisTextMode) {
+					_currentLine[_numCharsLeft++] = c;
+					_currentLine[_numCharsLeft++] = parseCommand();
+					_currentLine[_numCharsLeft] = '\0';
+				}
+
+				_lineWidth += sjisOffs;
 				c = parseCommand();
 				continue;
 			}
@@ -182,17 +192,17 @@ void TextDisplayer_rpg::displayText(char *str, ...) {
 		case 8:
 			printLine(_currentLine);
 			dv = _textDimData[sdx].column / (_screen->getFontWidth() + _screen->_charWidth);
-			dv = ((dv + 8) & 0xfff8) - 1;
+			dv = ((dv + 8) & 0xFFF8) - 1;
 			if (dv >= charsPerLine)
 				dv = 0;
 			_textDimData[sdx].column = (_screen->getFontWidth() + _screen->_charWidth) * dv;
 			break;
 
 		case 12:
-			if (isPc98)
-				_sjisLineBreakFlag = true;
+			if (sjisTextMode)
+				_sjisTextModeLineBreak = true;
 			printLine(_currentLine);
-			_sjisLineBreakFlag = false;
+			_sjisTextModeLineBreak = false;
 			_lineCount++;
 			_textDimData[sdx].column = 0;
 			_textDimData[sdx].line++;
@@ -208,7 +218,7 @@ void TextDisplayer_rpg::displayText(char *str, ...) {
 
 		default:
 			if (_vm->game() == GI_LOL || (unsigned char)c > 30) {
-				_lineWidth += (pc98PrintFlag ? 4 : _screen->getCharWidth((uint8)c));
+				_lineWidth += (sjisTextMode ? 4 : (_screen->_currentFont == Screen::FID_SJIS_FNT ? 9 : _screen->getCharWidth((uint8)c)));
 				_currentLine[_numCharsLeft++] = c;
 				_currentLine[_numCharsLeft] = 0;
 
@@ -266,7 +276,7 @@ void TextDisplayer_rpg::readNextPara() {
 	// versions depend on this code we'll have to look at this again.
 #if 0
 	if ((_vm->game() != GI_LOL) && (d & 0x80)) {
-		d &= 0x7f;
+		d &= 0x7F;
 		c = d & 7;
 		d = (d & 0x78) >> 3;
 		uint8 l = d;
@@ -280,10 +290,9 @@ void TextDisplayer_rpg::readNextPara() {
 }
 
 void TextDisplayer_rpg::printLine(char *str) {
-	const bool isPc98 = (_vm->gameFlags().platform == Common::kPlatformPC98);
 	const ScreenDim *sd = _screen->_curDim;
 	int sdx = _screen->curDimIndex();
-	bool pc98PrintFlag = (isPc98 && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
+	bool sjisTextMode = (_vm->gameFlags().lang == Common::JA_JPN && _vm->gameFlags().use16ColorMode && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
 
 	int fh = (_screen->_currentFont == Screen::FID_SJIS_FNT) ? 9 : (_screen->getFontHeight() + _screen->_charOffset);
 	int lines = (sd->h - _screen->_charOffset) / fh;
@@ -307,25 +316,27 @@ void TextDisplayer_rpg::printLine(char *str) {
 	}
 
 	int x1 = (sd->sx << 3) + _textDimData[sdx].column;
-	int y = sd->sy + (pc98PrintFlag ? (_textDimData[sdx].line << 3) : (fh * _textDimData[sdx].line));
+	int y = sd->sy + (sjisTextMode ? (_textDimData[sdx].line << 3) : (fh * _textDimData[sdx].line));
 	int w = sd->w << 3;
 	int lw = _lineWidth;
 	int s = _numCharsLeft;
 	char c = 0;
+	uint8 twoByteCharOffs = 0;
 
-	if (pc98PrintFlag) {
+
+	if (sjisTextMode) {
 		bool ct = true;
 
 		if ((lw + _textDimData[sdx].column) > w) {
 			if ((lines - 1 - (_waitButtonSpace << 1)) <= _lineCount)
 				// cut off line to leave space for "MORE" button
-				w -= vm()->guiSettings()->buttons.waitReserve;
+				w -= _vm->guiSettings()->buttons.waitReserve;
 		} else {
-			if (!_sjisLineBreakFlag || (_lineCount + 1 < lines - 1))
+			if (!_sjisTextModeLineBreak || (_lineCount + 1 < lines - 1))
 				ct = false;
 			else
 				// cut off line to leave space for "MORE" button
-				w -= vm()->guiSettings()->buttons.waitReserve;
+				w -= _vm->guiSettings()->buttons.waitReserve;
 		}
 
 		if (ct) {
@@ -344,41 +355,88 @@ void TextDisplayer_rpg::printLine(char *str) {
 			s = n2;
 		}
 	} else {
-		if ((lw + _textDimData[sdx].column) > w) {
+		if (_vm->gameFlags().lang == Common::JA_JPN) {
+			for (int i = 0; i < s; ++i) {
+				uint8 cu = (uint8) str[i];
+				if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0))
+					twoByteCharOffs = 8;
+			}
+		}
+
+		if ((lw + _textDimData[sdx].column) >= w) {
 			if ((lines - 1) <= _lineCount && _allowPageBreak)
 				// cut off line to leave space for "MORE" button
-				w -= vm()->guiSettings()->buttons.waitReserve;
+				w -= _vm->guiSettings()->buttons.waitReserve;
 
 			w -= _textDimData[sdx].column;
 
-			int n2 = 0;
-			int n1 = s - 1;
+			int lineLastCharPos = 0;
+			int strPos = s - 1;
+
+			if (twoByteCharOffs) {
+				lw = 0;
+				int prevStrPos = 0;
+				c = str[0];
+
+				for (strPos = 0; strPos < s; ++strPos) {
+					uint8 cu = (uint8) str[strPos];
+					if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0)) {
+						lw += 9;
+						strPos++;
+					} else {
+						lw += _screen->getCharWidth((uint8)c);
+					}
+
+					if (!lineLastCharPos && w < lw + twoByteCharOffs)
+						lineLastCharPos = prevStrPos;
+
+					if (lineLastCharPos && c == ' ') {
+						s = strPos;
+						_printFlag = false;
+						break;
+					}
+					prevStrPos = strPos;
+					c = (char) cu;
+				}
+
+				if (!lineLastCharPos) {
+					lineLastCharPos = s - 1;
+					if (lineLastCharPos && str[lineLastCharPos] == ' ') {
+						s = strPos;
+						_printFlag = false;
+					}
+				}
 
-			while (n1 > 0) {
-				//cut off line after last space
-				c = str[n1];
+				lw = _lineWidth;
 
-				lw -= _screen->getCharWidth((uint8)c);
+			} else {
+				while (strPos > 0) {
+					//cut off line after last space
+					c = str[strPos];
 
-				if (!n2 && lw <= w)
-					n2 = n1;
+					lw -= _screen->getCharWidth((uint8)c);
 
-				if (n2 && c == ' ') {
-					s = n1;
-					_printFlag = false;
-					break;
+					if (!lineLastCharPos && lw <= w)
+						lineLastCharPos = strPos;
+
+					if (lineLastCharPos && c == ' ') {
+						s = strPos;
+						_printFlag = false;
+						break;
+					}
+					strPos--;
 				}
-				n1--;
 			}
 
-			if (!n1) {
+			if (!strPos) {
 				if (_textDimData[sdx].column && !_printFlag) {
 					s = lw = 0;
 					_printFlag = true;
 				} else {
-					s = n2;
+					s = lineLastCharPos;
 				}
 			}
+
 		}
 	}
 
@@ -386,7 +444,7 @@ void TextDisplayer_rpg::printLine(char *str) {
 	str[s] = 0;
 
 	uint8 col = _textDimData[sdx].color1;
-	if (isPc98 && (sdx == 2 || sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) {
+	if (sjisTextMode && (sdx == 2 || sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) {
 		switch (_textDimData[sdx].color1) {
 		case 0x88:
 			col = 0x41;
@@ -394,14 +452,14 @@ void TextDisplayer_rpg::printLine(char *str) {
 		case 0x55:
 			col = 0x81;
 			break;
-		case 0xaa:
+		case 0xAA:
 			col = 0x21;
 			break;
 		case 0x99:
-			col = 0xa1;
+			col = 0xA1;
 			break;
 		case 0x33:
-			col = 0xe1;
+			col = 0xE1;
 			break;
 		case 0x18:
 			col = 0x61;
@@ -413,6 +471,7 @@ void TextDisplayer_rpg::printLine(char *str) {
 		_screen->printText(str, x1 & ~3, (y + 8) & ~7, col, 0);
 	} else {
 		_screen->printText(str, x1, y, col, _textDimData[sdx].color2);
+		_screen->updateScreen();
 	}
 
 	_textDimData[sdx].column += lw;
@@ -432,9 +491,9 @@ void TextDisplayer_rpg::printLine(char *str) {
 	str[len] = 0;
 
 	_numCharsLeft = strlen(str);
-	_lineWidth = pc98PrintFlag ? (_numCharsLeft << 2) : _screen->getTextWidth(str);
+	_lineWidth = sjisTextMode ? (_numCharsLeft << 2) : (_screen->_currentFont == Screen::FID_SJIS_FNT ? _numCharsLeft * 9: _screen->getTextWidth(str));
 
-	if (!_numCharsLeft && _textDimData[sdx].column < (sd->w << 3))
+	if (!_numCharsLeft && (_textDimData[sdx].column + twoByteCharOffs) <= (sd->w << 3))
 		return;
 
 	_textDimData[sdx].column = 0;
@@ -483,7 +542,7 @@ void TextDisplayer_rpg::printMessage(const char *str, int textColor, ...) {
 
 	displayText(_dialogueBuffer);
 
-	if (vm()->game() != GI_EOB1)
+	if (_vm->game() != GI_EOB1)
 		_textDimData[_screen->curDimIndex()].color1 = tc;
 
 	if (!_screen->_curPage)
@@ -494,7 +553,7 @@ int TextDisplayer_rpg::clearDim(int dim) {
 	int res = _screen->curDimIndex();
 	_screen->setScreenDim(dim);
 	_textDimData[dim].color1 = _screen->_curDim->unk8;
-	_textDimData[dim].color2 = vm()->game() == GI_LOL ? _screen->_curDim->unkA : vm()->guiSettings()->colors.fill;
+	_textDimData[dim].color2 = _vm->game() == GI_LOL ? _screen->_curDim->unkA : _vm->guiSettings()->colors.fill;
 	clearCurDim();
 	return res;
 }
@@ -502,7 +561,7 @@ int TextDisplayer_rpg::clearDim(int dim) {
 void TextDisplayer_rpg::clearCurDim() {
 	int d = _screen->curDimIndex();
 	const ScreenDim *tmp = _screen->getScreenDim(d);
-	if (vm()->gameFlags().use16ColorMode) {
+	if (_vm->gameFlags().use16ColorMode) {
 		_screen->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 2, (tmp->sy + tmp->h) - 2, _textDimData[d].color2);
 	} else
 		_screen->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 1, (tmp->sy + tmp->h) - 1, _textDimData[d].color2);
@@ -512,40 +571,40 @@ void TextDisplayer_rpg::clearCurDim() {
 }
 
 void TextDisplayer_rpg::textPageBreak() {
-	if (vm()->game() != GI_LOL)
-		SWAP(vm()->_dialogueButtonLabelColor1, vm()->_dialogueButtonLabelColor2);
+	if (_vm->game() != GI_LOL)
+		SWAP(_vm->_dialogueButtonLabelColor1, _vm->_dialogueButtonLabelColor2);
 
 	int cp = _screen->setCurPage(0);
-	Screen::FontId cf = _screen->setFont(vm()->gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
+	Screen::FontId cf = _screen->setFont((_vm->gameFlags().lang == Common::JA_JPN && _vm->gameFlags().use16ColorMode) ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
 
-	if (vm()->game() == GI_LOL)
-		vm()->_timer->pauseSingleTimer(11, true);
+	if (_vm->game() == GI_LOL)
+		_vm->_timer->pauseSingleTimer(11, true);
 
-	vm()->_fadeText = false;
+	_vm->_fadeText = false;
 	int resetPortraitAfterSpeechAnim = 0;
 	int updatePortraitSpeechAnimDuration = 0;
 
-	if (vm()->_updateCharNum != -1)  {
-		resetPortraitAfterSpeechAnim = vm()->_resetPortraitAfterSpeechAnim;
-		vm()->_resetPortraitAfterSpeechAnim = 0;
-		updatePortraitSpeechAnimDuration = vm()->_updatePortraitSpeechAnimDuration;
-		if (vm()->_updatePortraitSpeechAnimDuration > 36)
-			vm()->_updatePortraitSpeechAnimDuration = 36;
+	if (_vm->_updateCharNum != -1)  {
+		resetPortraitAfterSpeechAnim = _vm->_resetPortraitAfterSpeechAnim;
+		_vm->_resetPortraitAfterSpeechAnim = 0;
+		updatePortraitSpeechAnimDuration = _vm->_updatePortraitSpeechAnimDuration;
+		if (_vm->_updatePortraitSpeechAnimDuration > 36)
+			_vm->_updatePortraitSpeechAnimDuration = 36;
 	}
 
 	uint32 speechPartTime = 0;
-	if (vm()->speechEnabled() && vm()->_activeVoiceFileTotalTime && _numCharsTotal)
-		speechPartTime = vm()->_system->getMillis() + ((_numCharsPrinted * vm()->_activeVoiceFileTotalTime) / _numCharsTotal);
+	if (_vm->speechEnabled() && _vm->_activeVoiceFileTotalTime && _numCharsTotal)
+		speechPartTime = _vm->_system->getMillis() + ((_numCharsPrinted * _vm->_activeVoiceFileTotalTime) / _numCharsTotal);
 
 	const ScreenDim *dim = _screen->getScreenDim(_screen->curDimIndex());
 
 	int x = ((dim->sx + dim->w) << 3) - (_vm->_dialogueButtonWidth + 3);
 	int y = 0;
-	int w = vm()->_dialogueButtonWidth;
+	int w = _vm->_dialogueButtonWidth;
 
-	if (vm()->game() == GI_LOL) {
-		if (vm()->_needSceneRestore && (vm()->_updateFlags & 2)) {
-			if (vm()->_currentControlMode || !(vm()->_updateFlags & 2)) {
+	if (_vm->game() == GI_LOL) {
+		if (_vm->_needSceneRestore && (_vm->_updateFlags & 2)) {
+			if (_vm->_currentControlMode || !(_vm->_updateFlags & 2)) {
 				y = dim->sy + dim->h - 5;
 			} else {
 				x += 6;
@@ -555,49 +614,49 @@ void TextDisplayer_rpg::textPageBreak() {
 			y = dim->sy + dim->h - 10;
 		}
 	} else {
-		y = vm()->guiSettings()->buttons.waitY[_waitButtonMode];
-		x = vm()->guiSettings()->buttons.waitX[_waitButtonMode];
-		w = vm()->guiSettings()->buttons.waitWidth[_waitButtonMode];
+		y = _vm->guiSettings()->buttons.waitY[_waitButtonMode];
+		x = _vm->guiSettings()->buttons.waitX[_waitButtonMode];
+		w = _vm->guiSettings()->buttons.waitWidth[_waitButtonMode];
 	}
 
-	if (vm()->gameFlags().use16ColorMode) {
-		vm()->gui_drawBox(x + 8, (y & ~7) - 1, 66, 10, 0xee, 0xcc, -1);
-		_screen->printText(_pageBreakString, (x + 37 - (strlen(_pageBreakString) << 1) + 4) & ~3, (y + 2) & ~7, 0xc1, 0);
+	if (_vm->gameFlags().use16ColorMode) {
+		_vm->gui_drawBox(x + 8, (y & ~7) - 1, 66, 10, 0xEE, 0xCC, -1);
+		_screen->printText(_pageBreakString, (x + 37 - (strlen(_pageBreakString) << 1) + 4) & ~3, (y + 2) & ~7, 0xC1, 0);
 	} else {
-		vm()->gui_drawBox(x, y, w, vm()->guiSettings()->buttons.height, vm()->guiSettings()->colors.frame1, vm()->guiSettings()->colors.frame2, vm()->guiSettings()->colors.fill);
-		_screen->printText(_pageBreakString, x + (w >> 1) - (vm()->screen()->getTextWidth(_pageBreakString) >> 1), y + 2, vm()->_dialogueButtonLabelColor1, 0);
+		_vm->gui_drawBox(x, y, w, _vm->guiSettings()->buttons.height, _vm->guiSettings()->colors.frame1, _vm->guiSettings()->colors.frame2, _vm->guiSettings()->colors.fill);
+		_screen->printText(_pageBreakString, x + (w >> 1) - (_vm->screen()->getTextWidth(_pageBreakString) >> 1), y + 2, _vm->_dialogueButtonLabelColor1, 0);
 	}
 
-	vm()->removeInputTop();
+	_vm->removeInputTop();
 
 	bool loop = true;
 	bool target = false;
 
 	do {
-		int inputFlag = vm()->checkInput(0, false) & 0xFF;
-		vm()->removeInputTop();
+		int inputFlag = _vm->checkInput(0, false) & 0xFF;
+		_vm->removeInputTop();
 
 		while (!inputFlag && !_vm->shouldQuit()) {
-			vm()->update();
+			_vm->update();
 
-			if (vm()->speechEnabled()) {
-				if (((vm()->_system->getMillis() > speechPartTime) || (vm()->snd_updateCharacterSpeech() != 2)) && speechPartTime) {
+			if (_vm->speechEnabled()) {
+				if (((_vm->_system->getMillis() > speechPartTime) || (_vm->snd_updateCharacterSpeech() != 2)) && speechPartTime) {
 					loop = false;
-					inputFlag = vm()->_keyMap[Common::KEYCODE_RETURN];
+					inputFlag = _vm->_keyMap[Common::KEYCODE_RETURN];
 					break;
 				}
 			}
 
-			inputFlag = vm()->checkInput(0, false) & 0xFF;
-			vm()->removeInputTop();
+			inputFlag = _vm->checkInput(0, false) & 0xFF;
+			_vm->removeInputTop();
 		}
 
-		vm()->gui_notifyButtonListChanged();
+		_vm->gui_notifyButtonListChanged();
 
-		if (inputFlag == vm()->_keyMap[Common::KEYCODE_SPACE] || inputFlag == vm()->_keyMap[Common::KEYCODE_RETURN]) {
+		if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
 			loop = false;
 		} else if (inputFlag == 199 || inputFlag == 201) {
-			if (vm()->posWithinRect(vm()->_mouseX, vm()->_mouseY, x, y, x + w, y + 9)) {
+			if (_vm->posWithinRect(_vm->_mouseX, _vm->_mouseY, x, y, x + w, y + 9)) {
 				if (_vm->game() == GI_LOL)
 					target = true;
 				else
@@ -609,7 +668,7 @@ void TextDisplayer_rpg::textPageBreak() {
 		}
 	} while (loop && !_vm->shouldQuit());
 
-	if (vm()->gameFlags().use16ColorMode)
+	if (_vm->gameFlags().use16ColorMode)
 		_screen->fillRect(x + 8, y, x + 57, y + 9, _textDimData[_screen->curDimIndex()].color2);
 	else
 		_screen->fillRect(x, y, x + w - 1, y + 8, _textDimData[_screen->curDimIndex()].color2);
@@ -617,52 +676,52 @@ void TextDisplayer_rpg::textPageBreak() {
 	clearCurDim();
 	_screen->updateScreen();
 
-	if (vm()->game() == GI_LOL)
-		vm()->_timer->pauseSingleTimer(11, false);
+	if (_vm->game() == GI_LOL)
+		_vm->_timer->pauseSingleTimer(11, false);
 
-	if (vm()->_updateCharNum != -1) {
-		vm()->_resetPortraitAfterSpeechAnim = resetPortraitAfterSpeechAnim;
+	if (_vm->_updateCharNum != -1) {
+		_vm->_resetPortraitAfterSpeechAnim = resetPortraitAfterSpeechAnim;
 		if (updatePortraitSpeechAnimDuration > 36)
 			updatePortraitSpeechAnimDuration -= 36;
 		else
 			updatePortraitSpeechAnimDuration >>= 1;
 
-		vm()->_updatePortraitSpeechAnimDuration = updatePortraitSpeechAnimDuration;
+		_vm->_updatePortraitSpeechAnimDuration = updatePortraitSpeechAnimDuration;
 	}
 
 	_screen->setFont(cf);
 	_screen->setCurPage(cp);
 
-	if (vm()->game() != GI_LOL)
-		SWAP(vm()->_dialogueButtonLabelColor1, vm()->_dialogueButtonLabelColor2);
+	if (_vm->game() != GI_LOL)
+		SWAP(_vm->_dialogueButtonLabelColor1, _vm->_dialogueButtonLabelColor2);
 
-	vm()->removeInputTop();
+	_vm->removeInputTop();
 }
 
 void TextDisplayer_rpg::displayWaitButton() {
-	vm()->_dialogueNumButtons = 1;
-	vm()->_dialogueButtonString[0] = _pageBreakString;
-	vm()->_dialogueButtonString[1] = 0;
-	vm()->_dialogueButtonString[2] = 0;
-	vm()->_dialogueHighlightedButton = 0;
+	_vm->_dialogueNumButtons = 1;
+	_vm->_dialogueButtonString[0] = _pageBreakString;
+	_vm->_dialogueButtonString[1] = 0;
+	_vm->_dialogueButtonString[2] = 0;
+	_vm->_dialogueHighlightedButton = 0;
 
-	vm()->_dialogueButtonPosX = &vm()->guiSettings()->buttons.waitX[_waitButtonMode];
-	vm()->_dialogueButtonPosY = &vm()->guiSettings()->buttons.waitY[_waitButtonMode];
-	vm()->_dialogueButtonWidth = vm()->guiSettings()->buttons.waitWidth[_waitButtonMode];
-	vm()->_dialogueButtonYoffs = 0;
+	_vm->_dialogueButtonPosX = &_vm->guiSettings()->buttons.waitX[_waitButtonMode];
+	_vm->_dialogueButtonPosY = &_vm->guiSettings()->buttons.waitY[_waitButtonMode];
+	_vm->_dialogueButtonWidth = _vm->guiSettings()->buttons.waitWidth[_waitButtonMode];
+	_vm->_dialogueButtonYoffs = 0;
 
-	SWAP(vm()->_dialogueButtonLabelColor1, vm()->_dialogueButtonLabelColor2);
-	vm()->drawDialogueButtons();
+	SWAP(_vm->_dialogueButtonLabelColor1, _vm->_dialogueButtonLabelColor2);
+	_vm->drawDialogueButtons();
 
-	if (!vm()->shouldQuit())
-		vm()->removeInputTop();
+	if (!_vm->shouldQuit())
+		_vm->removeInputTop();
 
-	while (!vm()->processDialogue() && !vm()->shouldQuit()) {}
+	while (!_vm->processDialogue() && !_vm->shouldQuit()) {}
 
-	_screen->fillRect(vm()->_dialogueButtonPosX[0], vm()->_dialogueButtonPosY[0], vm()->_dialogueButtonPosX[0] + vm()->_dialogueButtonWidth - 1, vm()->_dialogueButtonPosY[0] + vm()->guiSettings()->buttons.height - 1, vm()->guiSettings()->colors.fill);
+	_screen->fillRect(_vm->_dialogueButtonPosX[0], _vm->_dialogueButtonPosY[0], _vm->_dialogueButtonPosX[0] + _vm->_dialogueButtonWidth - 1, _vm->_dialogueButtonPosY[0] + _vm->guiSettings()->buttons.height - 1, _vm->guiSettings()->colors.fill);
 	_screen->updateScreen();
-	vm()->_dialogueButtonWidth = 95;
-	SWAP(vm()->_dialogueButtonLabelColor1, vm()->_dialogueButtonLabelColor2);
+	_vm->_dialogueButtonWidth = 95;
+	SWAP(_vm->_dialogueButtonLabelColor1, _vm->_dialogueButtonLabelColor2);
 	clearCurDim();
 }