diff --git a/engines/twine/menu/menuoptions.cpp b/engines/twine/menu/menuoptions.cpp index 2b6a65f9758..f89e868e79d 100644 --- a/engines/twine/menu/menuoptions.cpp +++ b/engines/twine/menu/menuoptions.cpp @@ -61,16 +61,16 @@ void MenuOptions::newGame() { _engine->_text->textClipFull(); _engine->_text->setFontCrossColor(COLOR_WHITE); - bool aborted = _engine->_text->drawTextFullscreen(TextId::kIntroText1); + bool aborted = _engine->_text->drawTextProgressive(TextId::kIntroText1); // intro screen 2 if (!aborted) { _engine->_screens->loadImage(RESSHQR_INTROSCREEN2IMG, RESSHQR_INTROSCREEN2PAL); - aborted |= _engine->_text->drawTextFullscreen(TextId::kIntroText2); + aborted |= _engine->_text->drawTextProgressive(TextId::kIntroText2); if (!aborted) { _engine->_screens->loadImage(RESSHQR_INTROSCREEN3IMG, RESSHQR_INTROSCREEN3PAL); - aborted |= _engine->_text->drawTextFullscreen(TextId::kIntroText3); + aborted |= _engine->_text->drawTextProgressive(TextId::kIntroText3); } } _engine->cfgfile.FlagDisplayText = tmpFlagDisplayText; diff --git a/engines/twine/scene/scene.cpp b/engines/twine/scene/scene.cpp index a1f6fe73fbd..491227444d3 100644 --- a/engines/twine/scene/scene.cpp +++ b/engines/twine/scene/scene.cpp @@ -676,7 +676,7 @@ void Scene::processActorZones(int32 actorIdx) { _engine->freezeTime(); _engine->_text->setFontCrossColor(zone->infoData.DisplayText.textColor); talkingActor = actorIdx; - _engine->_text->drawTextFullscreen(zone->infoData.DisplayText.textIdx); + _engine->_text->drawTextProgressive(zone->infoData.DisplayText.textIdx); _engine->unfreezeTime(); _engine->_redraw->redrawEngineActions(true); } diff --git a/engines/twine/script/script_life_v1.cpp b/engines/twine/script/script_life_v1.cpp index ff6b8ed26b0..43f8cb756b0 100644 --- a/engines/twine/script/script_life_v1.cpp +++ b/engines/twine/script/script_life_v1.cpp @@ -651,7 +651,7 @@ static int32 lMESSAGE(TwinEEngine *engine, LifeScriptContext &ctx) { } engine->_text->setFontCrossColor(ctx.actor->talkColor); engine->_scene->talkingActor = ctx.actorIdx; - engine->_text->drawTextFullscreen(textIdx); + engine->_text->drawTextProgressive(textIdx); engine->unfreezeTime(); engine->_redraw->redrawEngineActions(true); @@ -916,7 +916,7 @@ static int32 lMESSAGE_OBJ(TwinEEngine *engine, LifeScriptContext &ctx) { } engine->_text->setFontCrossColor(engine->_scene->getActor(otherActorIdx)->talkColor); engine->_scene->talkingActor = otherActorIdx; - engine->_text->drawTextFullscreen(textIdx); + engine->_text->drawTextProgressive(textIdx); engine->unfreezeTime(); engine->_redraw->redrawEngineActions(true); @@ -1302,7 +1302,7 @@ static int32 lBIG_MESSAGE(TwinEEngine *engine, LifeScriptContext &ctx) { } engine->_text->setFontCrossColor(ctx.actor->talkColor); engine->_scene->talkingActor = ctx.actorIdx; - engine->_text->drawTextFullscreen(textIdx); + engine->_text->drawTextProgressive(textIdx); engine->_text->textClipSmall(); engine->unfreezeTime(); engine->_redraw->redrawEngineActions(true); @@ -1611,7 +1611,7 @@ static int32 lMESSAGE_SENDELL(TwinEEngine *engine, LifeScriptContext &ctx) { engine->_text->drawTextBoxBackground = false; const bool tmpFlagDisplayText = engine->cfgfile.FlagDisplayText; engine->cfgfile.FlagDisplayText = true; - engine->_text->drawTextFullscreen(TextId::kSendell); + engine->_text->drawTextProgressive(TextId::kSendell); engine->cfgfile.FlagDisplayText = tmpFlagDisplayText; engine->_text->drawTextBoxBackground = true; engine->_text->textClipSmall(); diff --git a/engines/twine/text.cpp b/engines/twine/text.cpp index c1f2a789825..33ff9dac205 100644 --- a/engines/twine/text.cpp +++ b/engines/twine/text.cpp @@ -658,7 +658,7 @@ bool Text::displayText(int32 index, bool showText, bool playVox, bool loop) { return aborted; } -bool Text::drawTextFullscreen(int32 index, bool playVox, bool loop) { +bool Text::drawTextProgressive(int32 index, bool playVox, bool loop) { _engine->_interface->saveClip(); _engine->_interface->resetClip(); _engine->_screens->copyScreen(_engine->frontVideoBuffer, _engine->workVideoBuffer); @@ -786,7 +786,7 @@ void Text::drawHolomapLocation(int32 index) { textClipSmall(); setFontCrossColor(COLOR_WHITE); _engine->_interface->drawSplittedBox(_dialTextBox, COLOR_BLACK); - drawTextFullscreen(index, false, false); + drawTextProgressive(index, false, false); } } // namespace TwinE diff --git a/engines/twine/text.h b/engines/twine/text.h index 54fc2fd32f3..fe3da4072b1 100644 --- a/engines/twine/text.h +++ b/engines/twine/text.h @@ -273,7 +273,7 @@ public: */ void drawText(int32 x, int32 y, const char *dialogue); - bool drawTextFullscreen(int32 index, bool playVox = true, bool loop = true); + bool drawTextProgressive(int32 index, bool playVox = true, bool loop = true); /** * Gets dialogue text width size diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp index 3ea4d94727d..f5b1a1623cc 100644 --- a/engines/twine/twine.cpp +++ b/engines/twine/twine.cpp @@ -561,7 +561,7 @@ void TwinEEngine::processBookOfBu() { _text->setFontCrossColor(COLOR_WHITE); const bool tmpFlagDisplayText = cfgfile.FlagDisplayText; cfgfile.FlagDisplayText = true; - _text->drawTextFullscreen(TextId::kBookOfBu); + _text->drawTextProgressive(TextId::kBookOfBu); cfgfile.FlagDisplayText = tmpFlagDisplayText; _text->textClipSmall(); _text->drawTextBoxBackground = true; @@ -579,7 +579,7 @@ void TwinEEngine::processBonusList() { _text->setFontCrossColor(COLOR_WHITE); const bool tmpFlagDisplayText = cfgfile.FlagDisplayText; cfgfile.FlagDisplayText = true; - _text->drawTextFullscreen(TextId::kBonusList); + _text->drawTextProgressive(TextId::kBonusList); cfgfile.FlagDisplayText = tmpFlagDisplayText; _text->textClipSmall(); _text->initSceneTextBank();