1 files changed, 0 insertions, 739 deletions

diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text_rpg.cpp
deleted file mode 100644
index 1280d8c076..0000000000
--- a/engines/kyra/text_rpg.cpp
+++ /dev/null
@@ -1,739 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-
-#include "kyra/kyra_rpg.h"
-#include "kyra/timer.h"
-
-#include "common/system.h"
-
-namespace Kyra {
-
-enum {
-	kEoBTextBufferSize = 2560
-};
-
-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), _sjisTextModeLineBreak(false), _waitButtonMode(1) {
-
-	_dialogueBuffer = new char[kEoBTextBufferSize];
-	memset(_dialogueBuffer, 0, kEoBTextBufferSize);
-
-	_currentLine = new char[85];
-	memset(_currentLine, 0, 85);
-
-	_textDimData = new TextDimData[_screen->screenDimTableCount()];
-
-	for (int i = 0; i < _screen->screenDimTableCount(); i++) {
-		const ScreenDim *d = _screen->getScreenDim(i);
-		_textDimData[i].color1 = d->unk8;
-		_textDimData[i].color2 = d->unkA;
-		_textDimData[i].line = d->unkC;
-		_textDimData[i].column = d->unkE;
-	}
-
-	_table1 = new char[128];
-	memset(_table1, 0, 128);
-	_table2 = new char[16];
-	memset(_table2, 0, 16);
-
-	_waitButtonSpace = 0;
-}
-
-TextDisplayer_rpg::~TextDisplayer_rpg() {
-	delete[] _dialogueBuffer;
-	delete[] _currentLine;
-	delete[] _textDimData;
-	delete[] _table1;
-	delete[] _table2;
-}
-
-void TextDisplayer_rpg::setupField(int dim, bool mode) {
-	setPageBreakFlag();
-
-	_textDimData[dim].color2 = _vm->guiSettings()->colors.fill;
-	_screen->setScreenDim(dim);
-
-	if (mode) {
-		_screen->set16bitShadingLevel(4);
-		clearCurDim();
-		_screen->set16bitShadingLevel(0);
-	} else {
-		resetDimTextPositions(dim);
-	}
-}
-
-void TextDisplayer_rpg::resetDimTextPositions(int dim) {
-	_textDimData[dim].column = 0;
-	_textDimData[dim].line = 0;
-}
-
-void TextDisplayer_rpg::resetPageBreakString() {
-	if (_vm->_moreStrings)
-		strcpy(_pageBreakString, _vm->_moreStrings[0]);
-}
-
-void TextDisplayer_rpg::setPageBreakFlag() {
-	_allowPageBreak = true;
-	_lineCount = 0;
-}
-
-void TextDisplayer_rpg::removePageBreakFlag() {
-	_allowPageBreak = false;
-}
-
-void TextDisplayer_rpg::displayText(char *str, ...) {
-	_printFlag = false;
-
-	_lineWidth = 0;
-	_numCharsLeft = 0;
-	_numCharsPrinted = 0;
-
-	_tempString1 = str;
-	_tempString2 = 0;
-
-	_currentLine[0] = 0;
-
-	memset(_ctrl, 0, 3);
-
-	char c = parseCommand();
-
-	va_list args;
-	va_start(args, str);
-
-	const ScreenDim *sd = _screen->_curDim;
-	int sdx = _screen->curDimIndex();
-
-	bool sjisTextMode = (_vm->gameFlags().lang == Common::JA_JPN && _vm->gameFlags().use16ColorMode && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
-	int sjisOffs = (sjisTextMode || _vm->game() == GI_EOB2) ? 8 : 9;
-	Screen::FontId of = (_vm->game() == GI_EOB2 && _vm->gameFlags().platform == Common::kPlatformFMTowns) ? _screen->setFont(Screen::FID_8_FNT) : _screen->_currentFont;
-
-	uint16 charsPerLine = (sd->w << 3) / (_screen->getFontWidth() + _screen->_charWidth);
-
-	while (c) {
-		char a = tolower((unsigned char)_ctrl[1]);
-
-		if (!_tempString2 && c == '%') {
-			if (a == 'd') {
-				strcpy(_scriptParaString, Common::String::format("%d", va_arg(args, int)).c_str());
-				_tempString2 = _scriptParaString;
-			} else if (a == 's') {
-				_tempString2 = va_arg(args, char *);
-			} else {
-				break;
-			}
-
-			_ctrl[0] = _ctrl[2];
-			_ctrl[2] = _ctrl[1] = 0;
-			c = parseCommand();
-		}
-
-		if (_vm->gameFlags().lang == Common::JA_JPN) {
-			uint8 cu = (uint8) c;
-			if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0)) {
-				if ((_textDimData[sdx].column + _lineWidth + sjisOffs) > (sd->w << 3))
-					printLine(_currentLine);
-
-				_currentLine[_numCharsLeft++] = c;
-				_currentLine[_numCharsLeft++] = parseCommand();
-				_currentLine[_numCharsLeft] = '\0';
-
-				_lineWidth += sjisOffs;
-				c = parseCommand();
-				continue;
-			}
-		}
-
-		uint16 dv = _textDimData[sdx].column / (_screen->getFontWidth() + _screen->_charWidth);
-
-		switch (c - 1) {
-		case 0:
-			printLine(_currentLine);
-			textPageBreak();
-			_numCharsPrinted = 0;
-			break;
-
-		case 1:
-			printLine(_currentLine);
-			_textDimData[sdx].color2 = parseCommand();
-			break;
-
-		case 5:
-			printLine(_currentLine);
-			_textDimData[sdx].color1 = parseCommand();
-			break;
-
-		case 8:
-			printLine(_currentLine);
-			dv = _textDimData[sdx].column / (_screen->getFontWidth() + _screen->_charWidth);
-			dv = ((dv + 8) & 0xFFF8) - 1;
-			if (dv >= charsPerLine)
-				dv = 0;
-			_textDimData[sdx].column = (_screen->getFontWidth() + _screen->_charWidth) * dv;
-			break;
-
-		case 12:
-			if (sjisTextMode)
-				_sjisTextModeLineBreak = true;
-			printLine(_currentLine);
-			_sjisTextModeLineBreak = false;
-			_lineCount++;
-			_textDimData[sdx].column = 0;
-			_textDimData[sdx].line++;
-			break;
-
-		case 11: case 18: case 23:
-		case 24: case 26: case 28:
-			// These are at the time of writing this comment not known to be
-			// used. In case there is some use of them in some odd version
-			// we display this warning here.
-			warning("TextDisplayer_rpg::displayText: Triggered stub function %d", c - 1);
-			break;
-
-		default:
-			if (_vm->game() == GI_EOB1 || _vm->game() == GI_LOL || (unsigned char)c > 30) {
-				_lineWidth += (sjisTextMode ? 4 : (_screen->_currentFont == Screen::FID_SJIS_FNT ? 9 : _screen->getCharWidth((uint8)c)));
-				_currentLine[_numCharsLeft++] = c;
-				_currentLine[_numCharsLeft] = 0;
-
-				if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
-					printLine(_currentLine);
-			}
-		}
-
-		c = parseCommand();
-	}
-
-	va_end(args);
-
-	if (_numCharsLeft)
-		printLine(_currentLine);
-
-	_screen->setFont(of);
-}
-
-char TextDisplayer_rpg::parseCommand() {
-	if (!_ctrl[1])
-		readNextPara();
-
-	char res = _ctrl[1];
-	_ctrl[1] = _ctrl[2];
-	_ctrl[2] = 0;
-
-	if (!_ctrl[1])
-		readNextPara();
-
-	return res;
-}
-
-void TextDisplayer_rpg::readNextPara() {
-	char c = 0;
-	char d = 0;
-
-	if (_tempString2) {
-		if (*_tempString2) {
-			d = *_tempString2++;
-		} else {
-			_tempString2 = 0;
-			d = _ctrl[0];
-		}
-	}
-
-	if (!d && _tempString1) {
-		if (*_tempString1)
-			d = *_tempString1++;
-		else
-			_tempString1 = 0;
-	}
-
-	// This seems to be some sort of character conversion mechanism. The original doesn't make any use of it, however.
-	// All necessary conversions take place somewhere else. This code actually causes issues if the character conversions
-	// don't take place before calling displayText(). So we disable it for now. If some (not yet supported) localized
-	// versions depend on this code we'll have to look at this again.
-#if 0
-	if ((_vm->game() != GI_LOL) && (d & 0x80)) {
-		d &= 0x7F;
-		c = d & 7;
-		d = (d & 0x78) >> 3;
-		uint8 l = d;
-		c = _table1[(l << 3) + c];
-		d = _table2[l];
-	}
-#endif
-
-	_ctrl[1] = d;
-	_ctrl[2] = c;
-}
-
-void TextDisplayer_rpg::printLine(char *str) {
-	const ScreenDim *sd = _screen->_curDim;
-	int sdx = _screen->curDimIndex();
-	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;
-
-	while (_textDimData[sdx].line >= lines) {
-		if ((lines - _waitButtonSpace) <= _lineCount && _allowPageBreak) {
-			_lineCount = 0;
-			textPageBreak();
-			_numCharsPrinted = 0;
-		}
-
-		int h1 = ((sd->h / fh) - 1) * fh;
-		int h2 = sd->h - fh;
-
-		if (h2)
-			_screen->copyRegion(sd->sx << 3, sd->sy + fh, sd->sx << 3, sd->sy, sd->w << 3, h2, _screen->_curPage, _screen->_curPage, Screen::CR_NO_P_CHECK);
-
-		_screen->set16bitShadingLevel(4);
-		_screen->fillRect(sd->sx << 3, sd->sy + h1, ((sd->sx + sd->w) << 3) - 1, sd->sy + sd->h - 1, _textDimData[sdx].color2);
-		_screen->set16bitShadingLevel(0);
-
-		if (_textDimData[sdx].line)
-			_textDimData[sdx].line--;
-	}
-
-	int x1 = (sd->sx << 3) + _textDimData[sdx].column;
-	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 (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;
-		} else {
-			if (!_sjisTextModeLineBreak || (_lineCount + 1 < lines - 1))
-				ct = false;
-			else
-				// cut off line to leave space for "MORE" button
-				w -= _vm->guiSettings()->buttons.waitReserve;
-		}
-
-		if (ct) {
-			w -= _textDimData[sdx].column;
-
-			int n2 = 0;
-			int n1 = (w / 4) - 1;
-
-			while (n2 < n1 && n2 < s) {
-				c = str[n2];
-				uint8 cu = (uint8) c;
-				if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0))
-					n2++;
-				n2++;
-			}
-			s = n2;
-		}
-	} else {
-		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 -= _textDimData[sdx].column;
-
-			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;
-					}
-				}
-
-				lw = _lineWidth;
-
-			} else {
-				while (strPos > 0) {
-					//cut off line after last space
-					c = str[strPos];
-
-					lw -= _screen->getCharWidth((uint8)c);
-
-					if (!lineLastCharPos && lw <= w)
-						lineLastCharPos = strPos;
-
-					if (lineLastCharPos && c == ' ') {
-						s = strPos;
-						_printFlag = false;
-						break;
-					}
-					strPos--;
-				}
-			}
-
-			if (!strPos) {
-				if (_textDimData[sdx].column && !_printFlag) {
-					s = lw = 0;
-					_printFlag = true;
-				} else {
-					s = lineLastCharPos;
-				}
-			}
-
-		}
-	}
-
-	c = str[s];
-	str[s] = 0;
-
-	uint8 col = _textDimData[sdx].color1;
-	if (sjisTextMode && (sdx == 2 || sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) {
-		switch (_textDimData[sdx].color1) {
-		case 0x88:
-			col = 0x41;
-			break;
-		case 0x55:
-			col = 0x81;
-			break;
-		case 0xAA:
-			col = 0x21;
-			break;
-		case 0x99:
-			col = 0xA1;
-			break;
-		case 0x33:
-			col = 0xE1;
-			break;
-		case 0x18:
-			col = 0x61;
-			break;
-		default:
-			col = 1;
-			break;
-		}
-		_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;
-	_numCharsPrinted += strlen(str);
-
-	str[s] = c;
-
-	if (c == ' ')
-		s++;
-
-	if (str[s] == ' ')
-		s++;
-
-	uint32 len = strlen(&str[s]);
-	for (uint32 i = 0; i < len; i++)
-		str[i] = str[s + i];
-	str[len] = 0;
-
-	_numCharsLeft = strlen(str);
-	_lineWidth = sjisTextMode ? (_numCharsLeft << 2) : (_screen->_currentFont == Screen::FID_SJIS_FNT ? _numCharsLeft * 9 : _screen->getTextWidth(str));
-
-	if (!_numCharsLeft && (_textDimData[sdx].column + twoByteCharOffs) <= (sd->w << 3))
-		return;
-
-	_textDimData[sdx].column = 0;
-	_textDimData[sdx].line++;
-	_lineCount++;
-
-	printLine(str);
-}
-
-void TextDisplayer_rpg::printDialogueText(int stringId, const char *pageBreakString) {
-	const char *str = (const char *)(_screen->getCPagePtr(5) + READ_LE_UINT16(&_screen->getCPagePtr(5)[(stringId - 1) << 1]));
-	assert(strlen(str) < kEoBTextBufferSize);
-	Common::strlcpy(_dialogueBuffer, str, kEoBTextBufferSize);
-
-	_screen->set16bitShadingLevel(4);
-	displayText(_dialogueBuffer);
-	_screen->set16bitShadingLevel(0);
-
-	if (pageBreakString) {
-		if (pageBreakString[0]) {
-			strcpy(_pageBreakString, pageBreakString);
-			displayWaitButton();
-			resetPageBreakString();
-		}
-	}
-}
-
-void TextDisplayer_rpg::printDialogueText(const char *str, bool wait) {
-	assert(strlen(str) < kEoBTextBufferSize);
-	Common::strlcpy(_dialogueBuffer, str, kEoBTextBufferSize);
-
-	strcpy(_dialogueBuffer, str);
-	displayText(_dialogueBuffer);
-	if (wait)
-		displayWaitButton();
-}
-
-void TextDisplayer_rpg::printMessage(const char *str, int textColor, ...) {
-	int tc = _textDimData[_screen->curDimIndex()].color1;
-
-	if (textColor != -1)
-		_textDimData[_screen->curDimIndex()].color1 = textColor;
-
-	va_list args;
-	va_start(args, textColor);
-	vsnprintf(_dialogueBuffer, kEoBTextBufferSize - 1, str, args);
-	va_end(args);
-
-	displayText(_dialogueBuffer);
-
-	if (_vm->game() != GI_EOB1)
-		_textDimData[_screen->curDimIndex()].color1 = tc;
-
-	if (!_screen->_curPage)
-		_screen->updateScreen();
-}
-
-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;
-	clearCurDim();
-	return res;
-}
-
-void TextDisplayer_rpg::clearCurDim() {
-	int d = _screen->curDimIndex();
-	const ScreenDim *tmp = _screen->getScreenDim(d);
-	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);
-
-	_lineCount = 0;
-	_textDimData[d].column = _textDimData[d].line = 0;
-}
-
-void TextDisplayer_rpg::textPageBreak() {
-	if (_vm->game() != GI_LOL)
-		SWAP(_vm->_dialogueButtonLabelColor1, _vm->_dialogueButtonLabelColor2);
-
-	int cp = _screen->setCurPage(0);
-	Screen::FontId cf = _screen->setFont((_vm->gameFlags().lang == Common::JA_JPN && _vm->gameFlags().use16ColorMode) ? Screen::FID_SJIS_FNT : ((_vm->game() == GI_EOB2 && _vm->gameFlags().platform == Common::kPlatformFMTowns) ? Screen::FID_8_FNT : Screen::FID_6_FNT));
-
-	if (_vm->game() == GI_LOL)
-		_vm->_timer->pauseSingleTimer(11, true);
-
-	_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;
-	}
-
-	uint32 speechPartTime = 0;
-	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;
-
-	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;
-				y = dim->sy + dim->h - 2;
-			}
-		} else {
-			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];
-	}
-
-	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 {
-		int yOffs = (_vm->game() == GI_EOB2 && _vm->gameFlags().platform == Common::kPlatformFMTowns) ? 1 : 2;
-		_screen->set16bitShadingLevel(4);
-		_vm->gui_drawBox(x, y, w, _vm->guiSettings()->buttons.height, _vm->guiSettings()->colors.frame1, _vm->guiSettings()->colors.frame2, _vm->guiSettings()->colors.fill);
-		_screen->set16bitShadingLevel(0);
-		_screen->printText(_pageBreakString, x + (w >> 1) - (_vm->screen()->getTextWidth(_pageBreakString) >> 1), y + yOffs, _vm->_dialogueButtonLabelColor1, 0);
-	}
-
-	_vm->removeInputTop();
-
-	bool loop = true;
-	bool target = false;
-
-	do {
-		int inputFlag = _vm->checkInput(0, false) & 0xFF;
-		_vm->removeInputTop();
-
-		while (!inputFlag && !_vm->shouldQuit()) {
-			_vm->update();
-
-			if (_vm->speechEnabled()) {
-				if (((_vm->_system->getMillis() > speechPartTime) || (_vm->snd_updateCharacterSpeech() != 2)) && speechPartTime) {
-					loop = false;
-					inputFlag = _vm->_keyMap[Common::KEYCODE_RETURN];
-					break;
-				}
-			}
-
-			inputFlag = _vm->checkInput(0, false) & 0xFF;
-			_vm->removeInputTop();
-		}
-
-		_vm->gui_notifyButtonListChanged();
-
-		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->game() == GI_LOL)
-					target = true;
-				else
-					loop = false;
-			}
-		} else if (inputFlag == 200 || inputFlag == 202) {
-			if (target)
-				loop = false;
-		}
-	} while (loop && !_vm->shouldQuit());
-
-	_screen->set16bitShadingLevel(4);
-	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 + _vm->guiSettings()->buttons.height - 1, _textDimData[_screen->curDimIndex()].color2);
-
-	clearCurDim();
-	_screen->set16bitShadingLevel(0);
-	_screen->updateScreen();
-
-	if (_vm->game() == GI_LOL)
-		_vm->_timer->pauseSingleTimer(11, false);
-
-	if (_vm->_updateCharNum != -1) {
-		_vm->_resetPortraitAfterSpeechAnim = resetPortraitAfterSpeechAnim;
-		if (updatePortraitSpeechAnimDuration > 36)
-			updatePortraitSpeechAnimDuration -= 36;
-		else
-			updatePortraitSpeechAnimDuration >>= 1;
-
-		_vm->_updatePortraitSpeechAnimDuration = updatePortraitSpeechAnimDuration;
-	}
-
-	_screen->setFont(cf);
-	_screen->setCurPage(cp);
-
-	if (_vm->game() != GI_LOL)
-		SWAP(_vm->_dialogueButtonLabelColor1, _vm->_dialogueButtonLabelColor2);
-
-	_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->_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();
-
-	if (!_vm->shouldQuit())
-		_vm->removeInputTop();
-
-	while (!_vm->processDialogue() && !_vm->shouldQuit()) {}
-
-	_screen->set16bitShadingLevel(4);
-	_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);
-	clearCurDim();
-	_screen->set16bitShadingLevel(0);
-	_screen->updateScreen();
-	_vm->_dialogueButtonWidth = 95;
-	SWAP(_vm->_dialogueButtonLabelColor1, _vm->_dialogueButtonLabelColor2);
-}
-
-} // End of namespace Kyra
-
-#endif // (ENABLE_EOB || ENABLE_LOL)