thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bugfix for hangs on scene changes in Discworld 1 after having loaded a savegame from the GMM when the title screens are displayed

Browse source 
svn-id: r42626
This commit is contained in:
Paul Gilbert 2009-07-20 09:19:27 +00:00
parent 0e2f267329
commit b40dc424b3
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/tinsel/saveload.cpp
View file

@ -84,6 +84,8 @@ extern void syncGlobInfo(Common::Serializer &s);
// in POLYGONS.C // in POLYGONS.C
extern void syncPolyInfo(Common::Serializer &s); extern void syncPolyInfo(Common::Serializer &s);
extern int sceneCtr;
//----------------- LOCAL DEFINES -------------------- //----------------- LOCAL DEFINES --------------------
struct SaveGameHeader { struct SaveGameHeader {
@ -510,6 +512,10 @@ save_failure:
void ProcessSRQueue(void) { void ProcessSRQueue(void) {
switch (SRstate) { switch (SRstate) {
case SR_DORESTORE: case SR_DORESTORE:
// If a load has been done directly from title screens, set a larger value for scene ctr so the
// code used to skip the title screens in Discworld 1 gets properly disabled
if (sceneCtr < 10) sceneCtr = 10;
if (DoRestore()) { if (DoRestore()) {
DoRestoreScene(srsd, false); DoRestoreScene(srsd, false);
} }