mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-24 05:01:43 +00:00
6c23cbfe5d
This commit implements proper loading of savestates saved from the original menu in v0-3 games and loaded either from launcher or GMM. Why is all of this necessary? It is because these saves are built under the assumption that they will be reloaded from the main menu room, and that therefore there will be a graceful termination of the global script handling the main menu. Terminating said script gracefully implies cleaning up variables, stopping menu related scripts, and reboot other scripts which had previously been stopped. This certainly doesn't happen when reloading said savestates from the GMM/launcher, and what instead happens is, in order: - The game loads from the menu room; - The menu scripts continues from an inconsistent location, effectively re-saving the game; - This invalidates the thumbnail of the savestate, which will now show a picture of the menu; - Closing the menu gets the user back to the saved state, with probably an inconsistent state of some variables and scripts. This fixes all of this, by detecting if we are loading a savestate saved from the original menu, and by manually running the correct script operations for each game in order to correctly close the menu and resume the game. Please note that this commit works under different assumptions from the ones pertaining the already available post-load fixes (which assume that you are saving the game from GMM).
74 lines
2.0 KiB
C++
74 lines
2.0 KiB
C++
/* ScummVM - Graphic Adventure Engine
|
|
*
|
|
* ScummVM is the legal property of its developers, whose names
|
|
* are too numerous to list here. Please refer to the COPYRIGHT
|
|
* file distributed with this source distribution.
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#ifndef SCUMM_SCRIPT_V3_H
|
|
#define SCUMM_SCRIPT_V3_H
|
|
|
|
#include "scumm/scumm_v4.h"
|
|
|
|
namespace Scumm {
|
|
|
|
/**
|
|
* Engine for version 3 SCUMM games; GF_SMALL_NAMES is always set for these.
|
|
*/
|
|
class ScummEngine_v3 : public ScummEngine_v4 {
|
|
public:
|
|
ScummEngine_v3(OSystem *syst, const DetectorResult &dr);
|
|
|
|
void resetScumm() override;
|
|
|
|
protected:
|
|
void setupOpcodes() override;
|
|
|
|
void scummLoop_handleSaveLoad() override;
|
|
void terminateSaveMenuScript() override;
|
|
|
|
void readRoomsOffsets() override;
|
|
void loadCharset(int no) override;
|
|
|
|
void processKeyboard(Common::KeyState lastKeyHit) override;
|
|
|
|
/* Version 3 script opcodes */
|
|
void o3_setBoxFlags();
|
|
void o3_waitForActor();
|
|
void o3_waitForSentence();
|
|
};
|
|
|
|
/**
|
|
* Engine for old format version 3 SCUMM games; GF_OLD_BUNDLE is always set for these.
|
|
*/
|
|
class ScummEngine_v3old : public ScummEngine_v3 {
|
|
public:
|
|
ScummEngine_v3old(OSystem *syst, const DetectorResult &dr);
|
|
|
|
protected:
|
|
int readResTypeList(ResType type) override;
|
|
void readIndexFile() override;
|
|
void setupRoomSubBlocks() override;
|
|
void resetRoomSubBlocks() override;
|
|
void resetRoomObjects() override;
|
|
};
|
|
|
|
|
|
} // End of namespace Scumm
|
|
|
|
#endif
|