mirror of
https://github.com/libretro/scummvm.git
synced 2025-04-02 14:51:40 +00:00
CGE: Better fix for restoring savegames when a cut-scene is active
This commit is contained in:
parent
7d9caea68a
commit
37756c9ffe
@ -208,8 +208,7 @@ bool CGEEngine::hasFeature(EngineFeature f) const {
|
||||
}
|
||||
|
||||
bool CGEEngine::canLoadGameStateCurrently() {
|
||||
return (_startupMode == 0) && _mouse->_active &&
|
||||
_commandHandler->idle() && !_hero->_flags._hide;
|
||||
return (_startupMode == 0) && _mouse->_active;
|
||||
}
|
||||
|
||||
bool CGEEngine::canSaveGameStateCurrently() {
|
||||
|
@ -292,6 +292,7 @@ Common::Error CGEEngine::loadGameState(int slot) {
|
||||
|
||||
void CGEEngine::resetGame() {
|
||||
_vga->_spareQ->clear();
|
||||
_commandHandler->reset();
|
||||
}
|
||||
|
||||
Common::Error CGEEngine::saveGameState(int slot, const Common::String &desc) {
|
||||
|
@ -375,6 +375,10 @@ bool CommandHandler::idle() {
|
||||
return (_head == _tail);
|
||||
}
|
||||
|
||||
void CommandHandler::reset() {
|
||||
_tail = _head;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles mini-Games logic
|
||||
* @param com Command
|
||||
|
@ -70,6 +70,7 @@ public:
|
||||
void addCallback(CommandType com, int ref, int val, CallbackType cbType);
|
||||
void insertCommand(CommandType com, int ref, int val, void *ptr);
|
||||
bool idle();
|
||||
void reset();
|
||||
private:
|
||||
CGEEngine *_vm;
|
||||
bool _turbo;
|
||||
|
Loading…
x
Reference in New Issue
Block a user