libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TSAGE: Fixed bug with scene mode being used incorrectly as the scene load flag

Browse Source
This commit is contained in:
Paul Gilbert 2011-02-27 16:28:37 +11:00
parent 0cd4b885c8
commit ee87c69a34
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/tsage/core.cpp
View File

@ -2282,7 +2282,7 @@ redraw:
// Update the palette
_globals->_sceneManager.fadeInIfNecessary();
_globals->_sceneManager._scene->_sceneMode = 0;
_globals->_sceneManager._loadMode = 0;
_globals->_paneRefreshFlag[paneNum] = 0;
// Loop through the object list, removing any objects and refreshing the screen as necessary

7
engines/tsage/scenes.cpp
View File

@ -210,6 +210,7 @@ void SceneManager::listenerSynchronise(Serialiser &s) {
s.syncAsUint16LE(_globals->_sceneManager._scene->_activeScreenNumber);
_globals->_sceneManager._scrollerRect.synchronise(s);
SYNC_POINTER(_globals->_scrollFollower);
s.syncAsSint16LE(_loadMode);
}
/*--------------------------------------------------------------------------*/
@ -291,7 +292,7 @@ void Scene::loadSceneData(int sceneNum) {
_globals->_sceneOffset.y = (_sceneBounds.top / 100) * 100;
_globals->_paneRefreshFlag[0] = 1;
_globals->_paneRefreshFlag[1] = 1;
_sceneMode = 1;
_globals->_sceneManager._loadMode = 1;
_globals->_sceneManager._sceneLoadCount = 0;
_globals->_sceneManager._sceneBgOffset = Common::Point(0, 0);
@ -310,10 +311,10 @@ void Scene::loadBackground(int xAmount, int yAmount) {
_globals->_sceneOffset.x &= ~3;
if ((_sceneBounds.top != _oldSceneBounds.top) || (_sceneBounds.left != _oldSceneBounds.left)) {
if (_sceneMode == 0) {
if (_globals->_sceneManager._loadMode == 0) {
_globals->_paneRefreshFlag[0] = 2;
_globals->_paneRefreshFlag[1] = 2;
_sceneMode = 2;
_globals->_sceneManager._loadMode = 2;
}
_oldSceneBounds = _sceneBounds;
}

1
engines/tsage/scenes.h
View File

@ -77,6 +77,7 @@ private:
public:
Scene *_scene;
bool _hasPalette;
int _loadMode;
int _sceneNumber;
int _previousScene;
int _nextSceneNumber;