[Scummvm-git-logs] scummvm master -> 6ea218c2bcc105062ab6d65df3485df67c4c0424
athrxx
noreply at scummvm.org
Sun Jun 7 12:24:23 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
b81bf949c8 SCUMM: (EGA dithering mode) - fix screen shaking
6ea218c2bc SCUMM: (EGA dithering mode) - fix bug in setCurrentPalette
Commit: b81bf949c8a1353fdba14b17dd48b1979f4f86ab
https://github.com/scummvm/scummvm/commit/b81bf949c8a1353fdba14b17dd48b1979f4f86ab
Author: athrxx (athrxx at scummvm.org)
Date: 2026-06-07T14:23:40+02:00
Commit Message:
SCUMM: (EGA dithering mode) - fix screen shaking
Changed paths:
engines/scumm/gfx.cpp
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index b51caa6f975..aa4eace00cc 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -5004,9 +5004,11 @@ void ScummEngine::updateScreenShakeEffect() {
if (!_shakeNextTick)
_shakeNextTick = now;
+ int multiplier = (_enableEGADithering ? 2 : 1) * _textSurfaceMultiplier;
+
while (now >= _shakeNextTick) {
_shakeFrame = (_shakeFrame + 1) % NUM_SHAKE_POSITIONS;
- _system->setShakePos(0, -shake_positions[_shakeFrame] * _textSurfaceMultiplier);
+ _system->setShakePos(0, -shake_positions[_shakeFrame] * multiplier);
// In DOTT (and probably all other imuse games) this runs on the imuse timer which is a PIT 0 Timer at 291.304 Hz.
// Apparently it is the same timer setting for all sound drivers although it is set up not in the main executable
// but inside each respective ims driver during the driver load/init process. The screen shakes update every 8 ticks.
Commit: 6ea218c2bcc105062ab6d65df3485df67c4c0424
https://github.com/scummvm/scummvm/commit/6ea218c2bcc105062ab6d65df3485df67c4c0424
Author: athrxx (athrxx at scummvm.org)
Date: 2026-06-07T14:23:45+02:00
Commit Message:
SCUMM: (EGA dithering mode) - fix bug in setCurrentPalette
(needs to trigger a full screen update in EGA mode)
Changed paths:
engines/scumm/palette.cpp
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index 50ca8fdb0c5..4c5da8ce304 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -1501,6 +1501,8 @@ void ScummEngine::setCurrentPalette(int palindex) {
_egaColorMap[1][i] = *pals++ >> 4;
}
}
+ _virtscr[kMainVirtScreen].setDirtyRange(0, _virtscr[kMainVirtScreen].h);
+ _virtscr[kVerbVirtScreen].setDirtyRange(0, _virtscr[kVerbVirtScreen].h);
} else {
setPaletteFromPtr(pals);
}
More information about the Scummvm-git-logs
mailing list