libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PRIVATE: allow to properly save during pause

Browse Source
This commit is contained in:
neuromancer 2021-03-13 17:27:41 -03:00
parent 02c75be38b
commit 8e35962584
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engines/private/private.cpp
View File

@ -70,6 +70,7 @@ PrivateEngine::PrivateEngine(OSystem *syst, const ADGameDescription *gd)
// Movies
_nextMovie = "";
_currentMovie = "";
_nextVS = "";
_repeatedMovieExit = "";
@ -250,6 +251,7 @@ Common::Error PrivateEngine::run() {
removeTimer();
_videoDecoder = new Video::SmackerDecoder();
playVideo(_nextMovie);
_currentMovie = _nextMovie;
_nextMovie = "";
continue;
}
@ -266,6 +268,7 @@ Common::Error PrivateEngine::run() {
_videoDecoder->close();
delete _videoDecoder;
_videoDecoder = nullptr;
_currentMovie = "";
} else if (_videoDecoder->needsUpdate()) {
drawScreen();
}
@ -775,6 +778,17 @@ Common::Error PrivateEngine::loadGameStream(Common::SeekableReadStream *stream)
// Paused setting
_pausedSetting = stream->readString();
// Restore a movie that was playing
_currentMovie = stream->readString();
int currentTime = stream->readUint32LE();
if (!_currentMovie.empty()) {
_videoDecoder = new Video::SmackerDecoder();
playVideo(_currentMovie);
_videoDecoder->pauseVideo(true);
// TODO: implement seek
}
if (_pausedSetting.empty())
_nextSetting = "kStartGame";
else
@ -862,6 +876,14 @@ Common::Error PrivateEngine::saveGameStream(Common::WriteStream *stream, bool is
stream->writeString(_pausedSetting);
stream->writeByte(0);
// If we were playing a movie
stream->writeString(_currentMovie);
stream->writeByte(0);
if (_videoDecoder)
stream->writeUint32LE(_videoDecoder->getCurFrame());
else
stream->writeUint32LE(0);
return Common::kNoError;
}
@ -928,6 +950,7 @@ void PrivateEngine::skipVideo() {
_videoDecoder->close();
delete _videoDecoder;
_videoDecoder = nullptr;
_currentMovie = "";
}
void PrivateEngine::stopSound(bool all) {

6
engines/private/private.h
View File

@ -210,6 +210,7 @@ public:
Common::String _framePath;
Graphics::Surface *_frame;
Common::String _nextVS;
Common::Point _origin;
void drawScreen();
// settings
@ -217,9 +218,9 @@ public:
Common::String _pausedSetting;
Common::String _currentSetting;
// movies
Common::String _nextMovie;
Common::Point _origin;
bool _toTake;
Common::String _currentMovie;
// Dossiers
DossierArray _dossiers;
@ -246,6 +247,7 @@ public:
Common::String _diaryLocPrefix;
void loadLocations(const Common::Rect &);
void loadInventory(uint32, const Common::Rect &, const Common::Rect &);
bool _toTake;
// Save/Load games
MaskInfo _saveGameMask;