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:
191cf959c4 TWINE: removed broken crossfade feature
Commit: 191cf959c45c69a9c5015612cdfe064d031fb12d
https://github.com/scummvm/scummvm/commit/191cf959c45c69a9c5015612cdfe064d031fb12d
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-11-29T17:17:49+01:00
Commit Message:
TWINE: removed broken crossfade feature
Changed paths:
engines/twine/detection.cpp
engines/twine/movies.cpp
engines/twine/renderer/redraw.cpp
engines/twine/renderer/screens.cpp
engines/twine/twine.cpp
engines/twine/twine.h
diff --git a/engines/twine/detection.cpp b/engines/twine/detection.cpp
index f37d99202b..14ba16c0b1 100644
--- a/engines/twine/detection.cpp
+++ b/engines/twine/detection.cpp
@@ -658,13 +658,6 @@ static const ExtraGuiOption OptWallCollision = {
false
};
-static const ExtraGuiOption OptCrossFade = {
- _s("Enable cross fade"),
- _s("Enable cross fading of images and scenes"),
- "crossfade",
- false
-};
-
// this only changes the menu and doesn't change the autosave behaviour - as scummvm is handling this now
static const ExtraGuiOption OptDisableSaveMenu = {
_s("Disable save menu"),
@@ -768,7 +761,6 @@ public:
const ExtraGuiOptions TwinEMetaEngineDetection::getExtraGuiOptions(const Common::String &target) const {
ExtraGuiOptions options;
options.push_back(OptWallCollision);
- options.push_back(OptCrossFade);
options.push_back(OptDisableSaveMenu);
options.push_back(OptMouse);
options.push_back(OptHighRes);
diff --git a/engines/twine/movies.cpp b/engines/twine/movies.cpp
index 73419904c8..3365304147 100644
--- a/engines/twine/movies.cpp
+++ b/engines/twine/movies.cpp
@@ -439,11 +439,7 @@ bool Movies::playFlaMovie(const char *flaName) {
} while (!_engine->_input->toggleAbortAction());
}
- if (_engine->_cfgfile.CrossFade) {
- _engine->crossFade(_engine->_screens->_paletteRGBACustom);
- } else {
- _engine->_screens->fadeToBlack(_engine->_screens->_paletteRGBACustom);
- }
+ _engine->_screens->fadeToBlack(_engine->_screens->_paletteRGBACustom);
_engine->_sound->stopSamples();
return finished;
diff --git a/engines/twine/renderer/redraw.cpp b/engines/twine/renderer/redraw.cpp
index 5bf6c2a066..a11c638af3 100644
--- a/engines/twine/renderer/redraw.cpp
+++ b/engines/twine/renderer/redraw.cpp
@@ -687,10 +687,8 @@ void Redraw::redrawEngineActions(bool bgRedraw) {
_engine->_interface->resetClip();
- // make ceiling grid fade
// need to be here to fade after drawing all actors in scene
if (_engine->_scene->_needChangeScene == SCENE_CEILING_GRID_FADE_2) {
- _engine->crossFade(_engine->_screens->_paletteRGBA);
_engine->_scene->_needChangeScene = SCENE_CEILING_GRID_FADE_1;
}
diff --git a/engines/twine/renderer/screens.cpp b/engines/twine/renderer/screens.cpp
index 80c12ff2bf..e3e96a1201 100644
--- a/engines/twine/renderer/screens.cpp
+++ b/engines/twine/renderer/screens.cpp
@@ -99,27 +99,13 @@ bool Screens::loadImageDelay(TwineImage image, int32 seconds) {
}
void Screens::fadeIn(const uint32 *pal) {
- if (_engine->_cfgfile.CrossFade) {
- _engine->crossFade(pal);
- } else {
- fadeToPal(pal);
- }
+ fadeToPal(pal);
_engine->setPalette(pal);
}
void Screens::fadeOut(const uint32 *pal) {
-#if 0
- if (_engine->_cfgfile.CrossFade) {
- _engine->crossFade(pal);
- } else {
- fadeToBlack(pal);
- }
-#else
- if (!_engine->_cfgfile.CrossFade) {
- fadeToBlack(pal);
- }
-#endif
+ fadeToBlack(pal);
}
int32 Screens::lerp(int32 value, int32 start, int32 end, int32 t) {
diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index cf5d110682..ddb18cee3b 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -450,7 +450,6 @@ void TwinEEngine::initConfigurations() {
_cfgfile.Mouse = ConfGetIntOrDefault("mouse", true);
_cfgfile.UseAutoSaving = ConfGetBoolOrDefault("useautosaving", false);
- _cfgfile.CrossFade = ConfGetBoolOrDefault("crossfade", false);
_cfgfile.WallCollision = ConfGetBoolOrDefault("wallcollision", false);
_actor->_autoAggressive = ConfGetBoolOrDefault("combatauto", true);
@@ -464,7 +463,6 @@ void TwinEEngine::initConfigurations() {
debug(1, "Fps: %i", _cfgfile.Fps);
debug(1, "Debug: %s", (_cfgfile.Debug ? "true" : "false"));
debug(1, "UseAutoSaving: %s", (_cfgfile.UseAutoSaving ? "true" : "false"));
- debug(1, "CrossFade: %s", (_cfgfile.CrossFade ? "true" : "false"));
debug(1, "WallCollision: %s", (_cfgfile.WallCollision ? "true" : "false"));
debug(1, "AutoAggressive: %s", (_actor->_autoAggressive ? "true" : "false"));
debug(1, "ShadowMode: %i", _cfgfile.ShadowMode);
@@ -1109,38 +1107,6 @@ void TwinEEngine::copyBlockPhys(int32 left, int32 top, int32 right, int32 bottom
_frontVideoBuffer.addDirtyRect(Common::Rect(left, top, right, bottom));
}
-void TwinEEngine::crossFade(const uint32 *palette) {
- Graphics::ManagedSurface backupSurface;
- Graphics::ManagedSurface newSurface;
- Graphics::ManagedSurface tempSurface;
- Graphics::ManagedSurface surfaceTable;
-
- Graphics::PixelFormat fmt(4, 8, 8, 8, 8, 24, 16, 8, 0);
- backupSurface.create(_frontVideoBuffer.w, _frontVideoBuffer.h, fmt);
- newSurface.create(_frontVideoBuffer.w, _frontVideoBuffer.h, fmt);
- tempSurface.create(_frontVideoBuffer.w, _frontVideoBuffer.h, Graphics::PixelFormat::createFormatCLUT8());
- tempSurface.setPalette(palette, 0, NUMOFCOLORS);
-
- surfaceTable.create(_frontVideoBuffer.w, _frontVideoBuffer.h, fmt);
-
- backupSurface.transBlitFrom(_frontVideoBuffer);
- newSurface.transBlitFrom(tempSurface);
-
- for (int32 i = 0; i < 8; i++) {
- surfaceTable.blitFrom(backupSurface);
- surfaceTable.transBlitFrom(newSurface, 0, false, 0, i * NUMOFCOLORS / 8);
- _frontVideoBuffer.blitFrom(surfaceTable);
- delaySkip(50);
- }
-
- _frontVideoBuffer.blitFrom(newSurface);
-
- backupSurface.free();
- newSurface.free();
- tempSurface.free();
- surfaceTable.free();
-}
-
void TwinEEngine::readKeys() {
_input->readKeys();
}
diff --git a/engines/twine/twine.h b/engines/twine/twine.h
index 6efe3c949b..6b1d85895d 100644
--- a/engines/twine/twine.h
+++ b/engines/twine/twine.h
@@ -104,8 +104,6 @@ struct ConfigFile {
int32 Fps = 0;
// these settings are not available in the original version
- /** Use cross fade effect while changing images, or be as the original */
- bool CrossFade = false;
/** Flag to toggle Wall Collision */
bool WallCollision = false;
/** Use original autosaving system or save when you want */
@@ -357,11 +355,6 @@ public:
void copyBlockPhys(int32 left, int32 top, int32 right, int32 bottom);
void copyBlockPhys(const Common::Rect &rect);
- /** Cross fade feature
- * @param palette new palette to cross fade
- */
- void crossFade(const uint32 *palette);
-
/** Handle keyboard pressed keys */
void readKeys();