ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

TSAGE: Bugfixes to savegames when the scene is showing an alternate screen

Browse Source
This commit is contained in:
Paul Gilbert
2011-05-03 20:14:20 +10:00
parent b737dcbad5
commit 4f70162d94
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/tsage/converse.cpp
+2
View File
@@ -53,6 +53,8 @@ void SequenceManager::setup() {
}
void SequenceManager::synchronise(Serialiser &s) {
Action::synchronise(s);
s.syncAsSint32LE(_resNum);
s.syncAsSint32LE(_sequenceOffset);
s.syncAsByte(_keepActive);
engines/tsage/core.cpp
-2
View File
@@ -110,8 +110,6 @@ Action::Action() {
void Action::synchronise(Serialiser &s) {
EventHandler::synchronise(s);
if (s.isLoading())
remove();
SYNC_POINTER(_owner);
s.syncAsSint32LE(_actionIndex);
engines/tsage/scenes.cpp
+11 -4
View File
@@ -62,9 +62,13 @@ void SceneManager::checkScene() {
}
void SceneManager::sceneChange() {
int activeScreenNumber = 0;
// Handle removing the scene
if (_scene)
if (_scene) {
activeScreenNumber = _scene->_activeScreenNumber;
_scene->remove();
}
// Clear the scene objects
SynchronisedList<SceneObject *>::iterator io = _globals->_sceneObjects->begin();
@@ -122,7 +126,7 @@ void SceneManager::sceneChange() {
if (!_saver->getMacroRestoreFlag())
_scene->postInit();
else
_scene->loadScene(_sceneNumber);
_scene->loadScene(activeScreenNumber);
}
Scene *SceneManager::getNewScene() {
@@ -225,15 +229,16 @@ void SceneManager::setBgOffset(const Common::Point &pt, int loadCount) {
void SceneManager::listenerSynchronise(Serialiser &s) {
s.validate("SceneManager");
_altSceneObjects.synchronise(s);
_altSceneObjects.synchronise(s);
s.syncAsSint32LE(_sceneNumber);
s.syncAsUint16LE(_globals->_sceneManager._scene->_activeScreenNumber);
if (s.isLoading()) {
changeScene(_sceneNumber);
checkScene();
}
s.syncAsUint16LE(_globals->_sceneManager._scene->_activeScreenNumber);
_globals->_sceneManager._scrollerRect.synchronise(s);
SYNC_POINTER(_globals->_scrollFollower);
s.syncAsSint16LE(_loadMode);
@@ -252,6 +257,8 @@ Scene::~Scene() {
}
void Scene::synchronise(Serialiser &s) {
StripCallback::synchronise(s);
s.syncAsSint32LE(_field12);
s.syncAsSint32LE(_screenNumber);
s.syncAsSint32LE(_activeScreenNumber);