libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 22:58:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TWINE: renamed method

Browse Source
This commit is contained in:
Martin Gerhardy 2021-01-30 14:16:23 +01:00
parent 219daa6146
commit 61ae5fa027
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/twine/menu/menuoptions.cpp
View File

@ -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;

2
engines/twine/scene/scene.cpp
View File

@ -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);
}

8
engines/twine/script/script_life_v1.cpp
View File

@ -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();

4
engines/twine/text.cpp
View File

@ -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

2
engines/twine/text.h
View File

@ -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

4
engines/twine/twine.cpp
View File

@ -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();