Skip to content

Commit

Permalink
SCI32: Fix broken palette when loading a game in Shivers from the GMM
Browse files Browse the repository at this point in the history
  • Loading branch information
bluegr committed Aug 26, 2018
1 parent 3376597 commit c978139
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions engines/sci/engine/savegame.cpp
Expand Up @@ -1250,8 +1250,8 @@ void gamestate_afterRestoreFixUp(EngineState *s, int savegameId) {
} }
break; break;
case GID_PQ2: case GID_PQ2:
// HACK: Same as above - enable the save game menu option when loading in PQ2 (bug #6875). // HACK: Same as in Jones - enable the save game menu option when loading in
// It gets disabled in the game's death screen. // PQ2 (bug #6875). It gets disabled in the game's death screen.
g_sci->_gfxMenu->kernelSetAttribute(2, 1, SCI_MENU_ATTRIBUTE_ENABLED, TRUE_REG); // Game -> Save Game g_sci->_gfxMenu->kernelSetAttribute(2, 1, SCI_MENU_ATTRIBUTE_ENABLED, TRUE_REG); // Game -> Save Game
break; break;
#ifdef ENABLE_SCI32 #ifdef ENABLE_SCI32
Expand All @@ -1260,6 +1260,16 @@ void gamestate_afterRestoreFixUp(EngineState *s, int savegameId) {
s->variables[VAR_GLOBAL][kGlobalVarPhant2CensorshipFlag] = make_reg(0, ConfMan.getBool("enable_censoring")); s->variables[VAR_GLOBAL][kGlobalVarPhant2CensorshipFlag] = make_reg(0, ConfMan.getBool("enable_censoring"));
} }
break; break;
case GID_SHIVERS:
// WORKAROUND: When loading a saved game from the GMM in the same scene in
// Shivers, we end up with the same draw list, but the scene palette is not
// set properly. Normally, Shivers does a room change when showing the saved
// game list, which does not occur when loading directly from the GMM. When
// loading from the GMM, at this point all of the visible planes and items
// are deleted, so calling frameOut here helps reset the game palette
// properly, like when changing a room.
g_sci->_gfxFrameout->frameOut(true);
break;
#endif #endif
default: default:
break; break;
Expand Down

0 comments on commit c978139

Please sign in to comment.