[Scummvm-git-logs] scummvm master -> da23eb9b27604ae37cac8f0fd1634988da8dcea4
mgerhardy
martin.gerhardy at gmail.com
Sun Dec 27 13:09:29 UTC 2020
This automated email contains information about 10 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
46e3ebaa85 TWINE: removed parameter to transBlitFrom that was only added by accident
e3bddb328c TWINE: moved comments
e06db142f6 TWINE: removed unused member palCustom
13430c4738 TWINE: converted parameters to lower case
1acc24c9c5 TWINE: renamed method parameters
e8080cf030 TWINE: added version flag support to detection entries
877ccf9676 TWINE: replaced magic number
07cadc8fbb TWINE: reduced code duplication
728b552e69 TWINE: fixed rendering of intro image
da23eb9b27 TWINE: unified variable names
Commit: 46e3ebaa858ee53e84db65c77e87f1d35922db54
https://github.com/scummvm/scummvm/commit/46e3ebaa858ee53e84db65c77e87f1d35922db54
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-12-27T14:02:02+01:00
Commit Message:
TWINE: removed parameter to transBlitFrom that was only added by accident
Changed paths:
engines/twine/scene/grid.cpp
diff --git a/engines/twine/scene/grid.cpp b/engines/twine/scene/grid.cpp
index 468a460da9..9a24176813 100644
--- a/engines/twine/scene/grid.cpp
+++ b/engines/twine/scene/grid.cpp
@@ -492,7 +492,7 @@ void Grid::drawSprite(int32 posX, int32 posY, const SpriteData &ptr) {
return;
}
- _engine->frontVideoBuffer.transBlitFrom(ptr.surface(), Common::Point(left, top), 0);
+ _engine->frontVideoBuffer.transBlitFrom(ptr.surface(), Common::Point(left, top));
}
// WARNING: Rewrite this function to have better performance
Commit: e3bddb328c90d6895c611430777cc7d910715e35
https://github.com/scummvm/scummvm/commit/e3bddb328c90d6895c611430777cc7d910715e35
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-12-27T14:02:02+01:00
Commit Message:
TWINE: moved comments
Changed paths:
engines/twine/renderer/screens.cpp
engines/twine/resources/resources.cpp
engines/twine/resources/resources.h
diff --git a/engines/twine/renderer/screens.cpp b/engines/twine/renderer/screens.cpp
index 30a5faaa87..56e80ea200 100644
--- a/engines/twine/renderer/screens.cpp
+++ b/engines/twine/renderer/screens.cpp
@@ -118,9 +118,9 @@ void Screens::fadeIn(uint32 *pal) {
void Screens::fadeOut(uint32 *pal) {
/*if(cfgfile.CrossFade)
- crossFade(frontVideoBuffer, palette);
+ crossFade(frontVideoBuffer, pal);
else
- fadeToBlack(palette);*/
+ fadeToBlack(pal);*/
if (!_engine->cfgfile.CrossFade) {
fadeToBlack(pal);
}
diff --git a/engines/twine/resources/resources.cpp b/engines/twine/resources/resources.cpp
index 89e7e9307e..d0b985ab52 100644
--- a/engines/twine/resources/resources.cpp
+++ b/engines/twine/resources/resources.cpp
@@ -54,8 +54,8 @@ Resources::~Resources() {
}
void Resources::initPalettes() {
- // Init standard palette
- if (HQR::getAllocEntry(&_engine->_screens->mainPalette, Resources::HQR_RESS_FILE, RESSHQR_MAINPAL) == 0) {
+ const int32 size = HQR::getAllocEntry(&_engine->_screens->mainPalette, Resources::HQR_RESS_FILE, RESSHQR_MAINPAL);
+ if (size == 0) {
error("Failed to load main palette");
}
_engine->_screens->convertPalToRGBA(_engine->_screens->mainPalette, _engine->_screens->mainPaletteRGBA);
@@ -126,7 +126,6 @@ void Resources::preloadInventoryItems() {
}
void Resources::initResources() {
- // Menu and in-game palette
initPalettes();
fontBufSize = HQR::getAllocEntry(&fontPtr, Resources::HQR_RESS_FILE, RESSHQR_LBAFONT);
diff --git a/engines/twine/resources/resources.h b/engines/twine/resources/resources.h
index 3eb1441be1..f0b2fab038 100644
--- a/engines/twine/resources/resources.h
+++ b/engines/twine/resources/resources.h
@@ -134,7 +134,7 @@ private:
TwinEEngine *_engine;
void preloadInventoryItems();
- /** Init palettes */
+ /** Init standard menu and in-game palette */
void initPalettes();
/** Preload all sprites */
void preloadSprites();
Commit: e06db142f6bc17c79ea42b693a83dafbb21ed2a2
https://github.com/scummvm/scummvm/commit/e06db142f6bc17c79ea42b693a83dafbb21ed2a2
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-12-27T14:02:02+01:00
Commit Message:
TWINE: removed unused member palCustom
Changed paths:
engines/twine/renderer/screens.cpp
engines/twine/renderer/screens.h
engines/twine/resources/resources.cpp
diff --git a/engines/twine/renderer/screens.cpp b/engines/twine/renderer/screens.cpp
index 56e80ea200..cf0eca6e96 100644
--- a/engines/twine/renderer/screens.cpp
+++ b/engines/twine/renderer/screens.cpp
@@ -34,11 +34,7 @@ namespace TwinE {
bool Screens::adelineLogo() {
_engine->_music->playMidiMusic(31);
- if (loadImageDelay(RESSHQR_ADELINEIMG, RESSHQR_ADELINEPAL, 7)) {
- return true;
- }
- palCustom = true;
- return false;
+ return loadImageDelay(RESSHQR_ADELINEIMG, RESSHQR_ADELINEPAL, 7);
}
void Screens::loadMenuImage(bool fade_in) {
@@ -54,8 +50,6 @@ void Screens::loadMenuImage(bool fade_in) {
} else {
_engine->setPalette(paletteRGBA);
}
-
- palCustom = false;
}
void Screens::loadCustomPalette(int32 index) {
@@ -92,8 +86,6 @@ void Screens::loadImage(int32 index, int32 paletteIndex, bool fade_in) {
} else {
_engine->setPalette(paletteRGBACustom);
}
-
- palCustom = true;
}
bool Screens::loadImageDelay(int32 index, int32 paletteIndex, int32 seconds) {
diff --git a/engines/twine/renderer/screens.h b/engines/twine/renderer/screens.h
index 5657ac9d24..469e78ab1e 100644
--- a/engines/twine/renderer/screens.h
+++ b/engines/twine/renderer/screens.h
@@ -47,9 +47,6 @@ public:
/** converted custom palette */
uint32 paletteRGBACustom[NUMOFCOLORS]{0};
- /** flag to check if a custom palette is in use */
- bool palCustom = false;
-
/** flag to check in the game palette was changed */
bool palResetted = false;
diff --git a/engines/twine/resources/resources.cpp b/engines/twine/resources/resources.cpp
index d0b985ab52..e24dac791c 100644
--- a/engines/twine/resources/resources.cpp
+++ b/engines/twine/resources/resources.cpp
@@ -64,9 +64,6 @@ void Resources::initPalettes() {
_engine->_screens->convertPalToRGBA(_engine->_screens->palette, _engine->_screens->paletteRGBA);
_engine->setPalette(_engine->_screens->paletteRGBA);
-
- // We use it now
- _engine->_screens->palCustom = false;
}
void Resources::preloadSprites() {
Commit: 13430c47382913e5539959cf4251bed1cef68495
https://github.com/scummvm/scummvm/commit/13430c47382913e5539959cf4251bed1cef68495
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-12-27T14:02:02+01:00
Commit Message:
TWINE: converted parameters to lower case
Changed paths:
engines/twine/renderer/screens.cpp
engines/twine/renderer/screens.h
diff --git a/engines/twine/renderer/screens.cpp b/engines/twine/renderer/screens.cpp
index cf0eca6e96..e592164209 100644
--- a/engines/twine/renderer/screens.cpp
+++ b/engines/twine/renderer/screens.cpp
@@ -125,7 +125,7 @@ int32 Screens::crossDot(int32 modifier, int32 color, int32 param, int32 intensit
return (((color - modifier) * intensity) / param) + modifier;
}
-void Screens::adjustPalette(uint8 R, uint8 G, uint8 B, const uint32 *rgbaPal, int32 intensity) {
+void Screens::adjustPalette(uint8 r, uint8 g, uint8 b, const uint32 *rgbaPal, int32 intensity) {
uint32 pal[NUMOFCOLORS];
int32 counter = 0;
@@ -138,9 +138,9 @@ void Screens::adjustPalette(uint8 R, uint8 G, uint8 B, const uint32 *rgbaPal, in
uint8 *newA = &paletteOut[3];
for (int32 i = 0; i < NUMOFCOLORS; i++) {
- *newR = crossDot(R, paletteIn[counter], 100, intensity);
- *newG = crossDot(G, paletteIn[counter + 1], 100, intensity);
- *newB = crossDot(B, paletteIn[counter + 2], 100, intensity);
+ *newR = crossDot(r, paletteIn[counter], 100, intensity);
+ *newG = crossDot(g, paletteIn[counter + 1], 100, intensity);
+ *newB = crossDot(b, paletteIn[counter + 2], 100, intensity);
*newA = 0;
newR += 4;
diff --git a/engines/twine/renderer/screens.h b/engines/twine/renderer/screens.h
index 469e78ab1e..7dd434cd1b 100644
--- a/engines/twine/renderer/screens.h
+++ b/engines/twine/renderer/screens.h
@@ -116,13 +116,13 @@ public:
/**
* Adjust palette intensity
- * @param R red component of color
- * @param G green component of color
- * @param B blue component of color
+ * @param r red component of color
+ * @param g green component of color
+ * @param b blue component of color
* @param palette palette to adjust
* @param intensity intensity value to adjust
*/
- void adjustPalette(uint8 R, uint8 G, uint8 B, const uint32 *palette, int32 intensity);
+ void adjustPalette(uint8 r, uint8 g, uint8 b, const uint32 *palette, int32 intensity);
/**
* Adjust between two palettes
Commit: 1acc24c9c524344a6f86b68825aede0e0b9f4446
https://github.com/scummvm/scummvm/commit/1acc24c9c524344a6f86b68825aede0e0b9f4446
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-12-27T14:02:02+01:00
Commit Message:
TWINE: renamed method parameters
Changed paths:
engines/twine/renderer/screens.cpp
engines/twine/renderer/screens.h
diff --git a/engines/twine/renderer/screens.cpp b/engines/twine/renderer/screens.cpp
index e592164209..0f7a42bcff 100644
--- a/engines/twine/renderer/screens.cpp
+++ b/engines/twine/renderer/screens.cpp
@@ -37,7 +37,7 @@ bool Screens::adelineLogo() {
return loadImageDelay(RESSHQR_ADELINEIMG, RESSHQR_ADELINEPAL, 7);
}
-void Screens::loadMenuImage(bool fade_in) {
+void Screens::loadMenuImage(bool fadeIn) {
Graphics::ManagedSurface& src = _engine->imageBuffer;
if (HQR::getEntry((uint8 *)src.getPixels(), Resources::HQR_RESS_FILE, RESSHQR_MENUIMG) == 0) {
warning("Failed to load menu image");
@@ -45,7 +45,7 @@ void Screens::loadMenuImage(bool fade_in) {
}
Graphics::ManagedSurface& target = _engine->frontVideoBuffer;
target.transBlitFrom(src, src.getBounds(), target.getBounds());
- if (fade_in) {
+ if (fadeIn) {
fadeToPal(paletteRGBA);
} else {
_engine->setPalette(paletteRGBA);
@@ -71,7 +71,7 @@ void Screens::convertPalToRGBA(const uint8 *in, uint32 *out) {
}
}
-void Screens::loadImage(int32 index, int32 paletteIndex, bool fade_in) {
+void Screens::loadImage(int32 index, int32 paletteIndex, bool fadeIn) {
Graphics::ManagedSurface& src = _engine->imageBuffer;
if (HQR::getEntry((uint8 *)src.getPixels(), Resources::HQR_RESS_FILE, index) == 0) {
warning("Failed to load image with index %i", index);
@@ -81,7 +81,7 @@ void Screens::loadImage(int32 index, int32 paletteIndex, bool fade_in) {
Graphics::ManagedSurface& target = _engine->frontVideoBuffer;
target.transBlitFrom(src, src.getBounds(), target.getBounds());
loadCustomPalette(paletteIndex);
- if (fade_in) {
+ if (fadeIn) {
fadeToPal(paletteRGBACustom);
} else {
_engine->setPalette(paletteRGBACustom);
diff --git a/engines/twine/renderer/screens.h b/engines/twine/renderer/screens.h
index 7dd434cd1b..fbfffb0b73 100644
--- a/engines/twine/renderer/screens.h
+++ b/engines/twine/renderer/screens.h
@@ -74,15 +74,15 @@ public:
void loadCustomPalette(int32 index);
/** Load and display Main Menu image */
- void loadMenuImage(bool fade_in = true);
+ void loadMenuImage(bool fadeIn = true);
/**
* Load and display a particulary image on \a RESS.HQR file with cross fade effect
* @param index \a RESS.HQR entry index (starting from 0)
* @param paletteIndex \a RESS.HQR entry index of the palette for the given image. This is often the @c index + 1
- * @param fade_in if we fade in before using the palette
+ * @param fadeIn if we fade in before using the palette
*/
- void loadImage(int32 index, int32 paletteIndex, bool fade_in = true);
+ void loadImage(int32 index, int32 paletteIndex, bool fadeIn = true);
/**
* Load and display a particulary image on \a RESS.HQR file with cross fade effect and delay
Commit: e8080cf030a16f9ed9cccfc1294a5106d4e96de4
https://github.com/scummvm/scummvm/commit/e8080cf030a16f9ed9cccfc1294a5106d4e96de4
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-12-27T14:02:02+01:00
Commit Message:
TWINE: added version flag support to detection entries
Changed paths:
engines/twine/detection.h
engines/twine/twine.cpp
diff --git a/engines/twine/detection.h b/engines/twine/detection.h
index abeb637e9f..8c8a1dbb5f 100644
--- a/engines/twine/detection.h
+++ b/engines/twine/detection.h
@@ -30,6 +30,12 @@ enum TwineGameType {
GType_LBA2 = 2
};
+enum TwineFeatureFlags {
+ TF_VERSION_EUROPE = (1 << 0),
+ TF_VERSION_USA = (1 << 1),
+ TF_VERSION_CUSTOM = (1 << 2)
+};
+
} // End of namespace TwinE
#endif // TWINE_DETECTION_H
diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index 07894ed18e..da1cb742eb 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -49,6 +49,7 @@
#include "twine/debugger/debug.h"
#include "twine/debugger/debug_grid.h"
#include "twine/debugger/debug_scene.h"
+#include "twine/detection.h"
#include "twine/flamovies.h"
#include "twine/holomap.h"
#include "twine/input.h"
@@ -139,6 +140,14 @@ TwinEEngine::TwinEEngine(OSystem *system, Common::Language language, uint32 flag
_input = new Input(this);
_debug = new Debug(this);
_debugScene = new DebugScene(this);
+
+ if (_gameFlags & TwineFeatureFlags::TF_VERSION_EUROPE) {
+ cfgfile.Version = EUROPE_VERSION;
+ } else if (_gameFlags & TwineFeatureFlags::TF_VERSION_USA) {
+ cfgfile.Version = USA_VERSION;
+ } else if (_gameFlags & TwineFeatureFlags::TF_VERSION_CUSTOM) {
+ cfgfile.Version = MODIFICATION_VERSION;
+ }
}
TwinEEngine::~TwinEEngine() {
Commit: 877ccf9676e5a19408dedd657a4d500740828e2f
https://github.com/scummvm/scummvm/commit/877ccf9676e5a19408dedd657a4d500740828e2f
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-12-27T14:02:02+01:00
Commit Message:
TWINE: replaced magic number
Changed paths:
engines/twine/twine.h
diff --git a/engines/twine/twine.h b/engines/twine/twine.h
index a58816dba5..52c8ee4b16 100644
--- a/engines/twine/twine.h
+++ b/engines/twine/twine.h
@@ -93,7 +93,7 @@ struct ConfigFile {
/** Type of music file to be used */
MidiFileType MidiType = MIDIFILE_NONE;
/** *Game version */
- int32 Version = 0;
+ int32 Version = EUROPE_VERSION;
/** If you want to use the LBA CD or not */
int32 UseCD = 0;
/** Allow various sound types */
Commit: 07cadc8fbb019f0d04c0f09ffc64349759f11171
https://github.com/scummvm/scummvm/commit/07cadc8fbb019f0d04c0f09ffc64349759f11171
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-12-27T14:02:02+01:00
Commit Message:
TWINE: reduced code duplication
Changed paths:
engines/twine/renderer/screens.cpp
diff --git a/engines/twine/renderer/screens.cpp b/engines/twine/renderer/screens.cpp
index 0f7a42bcff..bd88972eae 100644
--- a/engines/twine/renderer/screens.cpp
+++ b/engines/twine/renderer/screens.cpp
@@ -38,18 +38,7 @@ bool Screens::adelineLogo() {
}
void Screens::loadMenuImage(bool fadeIn) {
- Graphics::ManagedSurface& src = _engine->imageBuffer;
- if (HQR::getEntry((uint8 *)src.getPixels(), Resources::HQR_RESS_FILE, RESSHQR_MENUIMG) == 0) {
- warning("Failed to load menu image");
- return;
- }
- Graphics::ManagedSurface& target = _engine->frontVideoBuffer;
- target.transBlitFrom(src, src.getBounds(), target.getBounds());
- if (fadeIn) {
- fadeToPal(paletteRGBA);
- } else {
- _engine->setPalette(paletteRGBA);
- }
+ loadImage(RESSHQR_MENUIMG, -1, fadeIn);
}
void Screens::loadCustomPalette(int32 index) {
@@ -80,11 +69,15 @@ void Screens::loadImage(int32 index, int32 paletteIndex, bool fadeIn) {
debug(0, "Load image: %i", index);
Graphics::ManagedSurface& target = _engine->frontVideoBuffer;
target.transBlitFrom(src, src.getBounds(), target.getBounds());
- loadCustomPalette(paletteIndex);
+ const uint32 *pal = paletteRGBA;
+ if (paletteIndex != -1) {
+ loadCustomPalette(paletteIndex);
+ pal = paletteRGBACustom;
+ }
if (fadeIn) {
- fadeToPal(paletteRGBACustom);
+ fadeToPal(pal);
} else {
- _engine->setPalette(paletteRGBACustom);
+ _engine->setPalette(pal);
}
}
Commit: 728b552e6971e2b3c43090cc5f1a3850feccddb5
https://github.com/scummvm/scummvm/commit/728b552e6971e2b3c43090cc5f1a3850feccddb5
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-12-27T14:02:02+01:00
Commit Message:
TWINE: fixed rendering of intro image
https://bugs.scummvm.org/ticket/12025
Changed paths:
engines/twine/renderer/screens.cpp
diff --git a/engines/twine/renderer/screens.cpp b/engines/twine/renderer/screens.cpp
index bd88972eae..6f3ed9a4f9 100644
--- a/engines/twine/renderer/screens.cpp
+++ b/engines/twine/renderer/screens.cpp
@@ -55,6 +55,7 @@ void Screens::convertPalToRGBA(const uint8 *in, uint32 *out) {
paletteOut[0] = in[0];
paletteOut[1] = in[1];
paletteOut[2] = in[2];
+ paletteOut[3] = 0xFF;
paletteOut += 4;
in += 3;
}
@@ -68,7 +69,7 @@ void Screens::loadImage(int32 index, int32 paletteIndex, bool fadeIn) {
}
debug(0, "Load image: %i", index);
Graphics::ManagedSurface& target = _engine->frontVideoBuffer;
- target.transBlitFrom(src, src.getBounds(), target.getBounds());
+ target.transBlitFrom(src, src.getBounds(), target.getBounds(), 0, false, 0, 0xff, nullptr, true);
const uint32 *pal = paletteRGBA;
if (paletteIndex != -1) {
loadCustomPalette(paletteIndex);
@@ -134,7 +135,7 @@ void Screens::adjustPalette(uint8 r, uint8 g, uint8 b, const uint32 *rgbaPal, in
*newR = crossDot(r, paletteIn[counter], 100, intensity);
*newG = crossDot(g, paletteIn[counter + 1], 100, intensity);
*newB = crossDot(b, paletteIn[counter + 2], 100, intensity);
- *newA = 0;
+ *newA = 0xFF;
newR += 4;
newG += 4;
@@ -169,7 +170,7 @@ void Screens::adjustCrossPalette(const uint32 *pal1, const uint32 *pal2) {
*newR = crossDot(pal1p[counter + 0], pal2p[counter + 0], 100, intensity);
*newG = crossDot(pal1p[counter + 1], pal2p[counter + 1], 100, intensity);
*newB = crossDot(pal1p[counter + 2], pal2p[counter + 2], 100, intensity);
- *newA = 0;
+ *newA = 0xFF;
newR += 4;
newG += 4;
Commit: da23eb9b27604ae37cac8f0fd1634988da8dcea4
https://github.com/scummvm/scummvm/commit/da23eb9b27604ae37cac8f0fd1634988da8dcea4
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-12-27T14:06:42+01:00
Commit Message:
TWINE: unified variable names
Changed paths:
engines/twine/menu/menu.cpp
engines/twine/text.cpp
diff --git a/engines/twine/menu/menu.cpp b/engines/twine/menu/menu.cpp
index 376d3efba1..d6ac1fc982 100644
--- a/engines/twine/menu/menu.cpp
+++ b/engines/twine/menu/menu.cpp
@@ -1110,7 +1110,7 @@ void Menu::processInventoryMenu() {
_engine->_text->setFontCrossColor(4);
_engine->_text->initDialogueBox();
- ProgressiveTextState textStatus = ProgressiveTextState::End;
+ ProgressiveTextState textState = ProgressiveTextState::End;
#if 0
ScopedCursor scopedCursor(_engine);
@@ -1169,15 +1169,15 @@ void Menu::processInventoryMenu() {
}
}
- if (updateItemText || textStatus != ProgressiveTextState::NextPage) {
- textStatus = _engine->_text->updateProgressiveText();
+ if (updateItemText || textState != ProgressiveTextState::NextPage) {
+ textState = _engine->_text->updateProgressiveText();
updateItemText = false;
}
if (_engine->_input->toggleActionIfActive(TwinEActionType::UINextPage)) {
- if (textStatus == ProgressiveTextState::NextPage) {
+ if (textState == ProgressiveTextState::NextPage) {
_engine->_text->initInventoryDialogueBox();
- textStatus = ProgressiveTextState::End;
+ textState = ProgressiveTextState::End;
} else {
if (inventorySelectedItem < NUM_INVENTORY_ITEMS && _engine->_gameState->hasItem((InventoryItems)inventorySelectedItem) && !_engine->_gameState->inventoryDisabled()) {
_engine->_text->initInventoryDialogueBox();
diff --git a/engines/twine/text.cpp b/engines/twine/text.cpp
index 5ee4de4c75..63acbb9ff2 100644
--- a/engines/twine/text.cpp
+++ b/engines/twine/text.cpp
@@ -614,14 +614,14 @@ bool Text::drawTextFullscreen(int32 index) {
initText(index);
initDialogueBox();
- ProgressiveTextState printedText;
+ ProgressiveTextState textState;
for (;;) {
ScopedFPS scopedFps(66);
_engine->readKeys();
- printedText = updateProgressiveText();
+ textState = updateProgressiveText();
playVox(currDialTextEntry);
- if (printedText == ProgressiveTextState::End && !_engine->_sound->isSamplePlaying(currDialTextEntry)) {
+ if (textState == ProgressiveTextState::End && !_engine->_sound->isSamplePlaying(currDialTextEntry)) {
break;
}
@@ -634,7 +634,7 @@ bool Text::drawTextFullscreen(int32 index) {
_hasValidTextHandle = false;
- if (printedText == ProgressiveTextState::End) {
+ if (textState == ProgressiveTextState::End) {
stopVox(currDialTextEntry);
// wait displaying text
for (;;) {
@@ -781,13 +781,13 @@ void Text::drawAskQuestion(int32 index) {
initText(index);
initDialogueBox();
- ProgressiveTextState textStatus = ProgressiveTextState::UNK1;
+ ProgressiveTextState textState = ProgressiveTextState::UNK1;
do {
ScopedFPS scopedFps(66);
_engine->readKeys();
- textStatus = updateProgressiveText();
+ textState = updateProgressiveText();
- if (textStatus == ProgressiveTextState::NextPage) {
+ if (textState == ProgressiveTextState::NextPage) {
do {
ScopedFPS scopedFpsNextPage;
_engine->readKeys();
@@ -799,7 +799,7 @@ void Text::drawAskQuestion(int32 index) {
}
} while (!_engine->_input->toggleAbortAction());
}
- } while (textStatus != ProgressiveTextState::End);
+ } while (textState != ProgressiveTextState::End);
while (playVoxSimple(currDialTextEntry)) {
ScopedFPS scopedFps;
More information about the Scummvm-git-logs
mailing list