ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCUMM (v3/CGA) - improved rendermode post-load fix

Browse Source 
Fix actor palettes for savegames saved with a different rendering mode. This works for Loom and Indy3...
This commit is contained in:
athrxx
2022-07-16 23:13:45 +02:00
parent e93cad7ce6
commit bf45eb3daa
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/scumm/actor.cpp
+17 -6
View File
@@ -3827,12 +3827,6 @@ void Actor::saveLoadWithSerializer(Common::Serializer &s) {
_cost.frame[i] = (_cost.frame[i] << 2) | newDirToOldDir(_facing);
}
}
// Post-load fix for games that were saved with a different video mode and which do not receive the normal
// post-load treatment in ScummEngine_v3::scummLoop_handleSaveLoad() where the script will take care of the
// actor palette. This fix is only for Bobbin in his normal costume.
if (_vm->_game.id == GID_LOOM && s.isLoading() && _vm->_renderMode == Common::kRenderCGA && _number == 1 && _palette[8] == 8)
_palette[8] = 0;
}
void Actor_v3::saveLoadWithSerializer(Common::Serializer &s) {
@@ -3867,6 +3861,23 @@ void Actor_v3::saveLoadWithSerializer(Common::Serializer &s) {
s.syncAsUint16LE(_stepX, VER(rev));
s.syncAsUint16LE(_stepThreshold, VER(rev));
}
// Post-load actor palette fixes for games that were saved with a different video mode.
if (s.isLoading() && _vm->_game.version == 3 && _vm->_game.platform == Common::kPlatformDOS) {
// Loom is not really much of a problem here, since it has extensive scripted post-load
// treatment in ScummEngine_v3::scummLoop_handleSaveLoad(). But there are situations
// where it won't be triggered (basically savegames from places where the original does
// not allow saving). Indy3 is more dependant on this than Loom, since it does have much
// less scripted post-load magic of its own.
bool cga = (_vm->_renderMode == Common::kRenderCGA);
if ((cga && _palette[6] == 6 && _palette[7] == 7) || (!cga && _palette[6] == 5 && _palette[7] == 15)) {
_palette[6] ^= 3;
_palette[7] ^= 8;
}
// Extra fix for Bobbin in his normal costume.
if (_vm->_game.id == GID_LOOM && _number == 1 && ((cga && _palette[8] == 8) || (!cga && _palette[8] == 0)))
_palette[8] ^= 8;
}
}
} // End of namespace Scumm