[Scummvm-git-logs] scummvm master -> 1ad4925c4e9fac2063a88a0c76daa9f0373258f2

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1ad4925c4e KYRA: (EOB/SegaCD) - hopefully fix Woverloaded-virtual warning


Commit: 1ad4925c4e9fac2063a88a0c76daa9f0373258f2
    https://github.com/scummvm/scummvm/commit/1ad4925c4e9fac2063a88a0c76daa9f0373258f2
Author: athrxx (athrxx at scummvm.org)
Date: 2020-07-30T23:11:29+02:00

Commit Message:
KYRA: (EOB/SegaCD) - hopefully fix Woverloaded-virtual warning

Changed paths:
    engines/kyra/engine/lol.cpp
    engines/kyra/script/script_lol.cpp
    engines/kyra/text/text_lol.cpp
    engines/kyra/text/text_lol.h


diff --git a/engines/kyra/engine/lol.cpp b/engines/kyra/engine/lol.cpp
index 2db62f61f3..099f527787 100644
--- a/engines/kyra/engine/lol.cpp
+++ b/engines/kyra/engine/lol.cpp
@@ -1864,18 +1864,18 @@ int LoLEngine::playCharacterScriptChat(int charId, int mode, int restorePortrait
 
 	if (textEnabled()) {
 		if (mode == 0) {
-			_txt->printDialogueText(3, str, script, paramList, paramIndex);
+			_txt->printDialogueText2(3, str, script, paramList, paramIndex);
 
 		} else if (mode == 1) {
 			_txt->clearDim(4);
 			_screen->modifyScreenDim(4, 16, 123, 23, 47);
-			_txt->printDialogueText(4, str, script, paramList, paramIndex);
+			_txt->printDialogueText2(4, str, script, paramList, paramIndex);
 			_screen->modifyScreenDim(4, 11, 123, 28, 47);
 
 		} else if (mode == 2) {
 			_txt->clearDim(4);
 			_screen->modifyScreenDim(4, 9, 133, 30, 60);
-			_txt->printDialogueText(4, str, script, paramList, 3);
+			_txt->printDialogueText2(4, str, script, paramList, 3);
 			_screen->modifyScreenDim(4, 1, 133, 37, 60);
 		}
 	}
diff --git a/engines/kyra/script/script_lol.cpp b/engines/kyra/script/script_lol.cpp
index e4806ab86f..976346c0a8 100644
--- a/engines/kyra/script/script_lol.cpp
+++ b/engines/kyra/script/script_lol.cpp
@@ -1579,7 +1579,7 @@ int LoLEngine::olol_addSpellToScroll(EMCState *script) {
 
 int LoLEngine::olol_playDialogueText(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_playDialogueText(%p) (%d)", (const void *)script, stackPos(0));
-	_txt->printDialogueText(3, getLangString(stackPos(0)), script, 0, 1);
+	_txt->printDialogueText2(3, getLangString(stackPos(0)), script, 0, 1);
 	return 1;
 }
 
@@ -1589,7 +1589,7 @@ int LoLEngine::olol_playDialogueTalkText(EMCState *script) {
 
 	if (!snd_playCharacterSpeech(track, 0, 0) || textEnabled()) {
 		char *s = getLangString(track);
-		_txt->printDialogueText(4, s, script, 0, 1);
+		_txt->printDialogueText2(4, s, script, 0, 1);
 	}
 
 	return 1;
@@ -1660,7 +1660,7 @@ int LoLEngine::olol_printWindowText(EMCState *script) {
 		_txt->clearCurDim();
 	if (flg & 3)
 		_txt->resetDimTextPositions(dim);
-	_txt->printDialogueText(dim, getLangString(stackPos(2)), script, 0, 3);
+	_txt->printDialogueText2(dim, getLangString(stackPos(2)), script, 0, 3);
 	return 1;
 }
 
@@ -2545,7 +2545,7 @@ int LoLEngine::tlol_playMusicTrack(const TIM *tim, const uint16 *param) {
 int LoLEngine::tlol_playDialogueTalkText(const TIM *tim, const uint16 *param) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::tlol_playDialogueTalkText(%p, %p) (%d)", (const void *)tim, (const void *)param, param[0]);
 	if (!snd_playCharacterSpeech(param[0], 0, 0) || textEnabled())
-		_txt->printDialogueText(4, getLangString(param[0]), 0, param, 1);
+		_txt->printDialogueText2(4, getLangString(param[0]), 0, param, 1);
 	return 1;
 }
 
diff --git a/engines/kyra/text/text_lol.cpp b/engines/kyra/text/text_lol.cpp
index 67d59e788f..91500ce78b 100644
--- a/engines/kyra/text/text_lol.cpp
+++ b/engines/kyra/text/text_lol.cpp
@@ -133,7 +133,7 @@ void TextDisplayer_LoL::expandField() {
 	}
 }
 
-void TextDisplayer_LoL::printDialogueText(int dim, char *str, EMCState *script, const uint16 *paramList, int16 paramIndex) {
+void TextDisplayer_LoL::printDialogueText2(int dim, char *str, EMCState *script, const uint16 *paramList, int16 paramIndex) {
 	int oldDim = 0;
 
 	if (dim == 3) {
diff --git a/engines/kyra/text/text_lol.h b/engines/kyra/text/text_lol.h
index 1790fa1802..dc1f316c8f 100644
--- a/engines/kyra/text/text_lol.h
+++ b/engines/kyra/text/text_lol.h
@@ -44,7 +44,7 @@ public:
 	void setupField(bool mode);
 	void expandField();
 
-	void printDialogueText(int dim, char *str, EMCState *script, const uint16 *paramList, int16 paramIndex);
+	void printDialogueText2(int dim, char *str, EMCState *script, const uint16 *paramList, int16 paramIndex);
 	void printMessage(uint16 type, const char *str, ...) GCC_PRINTF(3, 4);
 
 	int16 _scriptTextParameter;