libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-01 07:46:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BURIED: Check _currentScene before its use

Browse Source 
This fixes CID , ,
This commit is contained in:
Le Philousophe 2023-05-11 17:41:13 +02:00
parent 78880f5bc5
commit f32492c26e
1 changed files with 12 additions and 3 deletions

15
engines/buried/scene_view.cpp

@ -1450,6 +1450,9 @@ bool SceneViewWindow::getCurrentSceneLocation(Location &location) {
} }
bool SceneViewWindow::playSynchronousAnimation(int animationID) { bool SceneViewWindow::playSynchronousAnimation(int animationID) {
if (!_currentScene)
return false;
TempCursorChange cursorChange(kCursorWait); TempCursorChange cursorChange(kCursorWait);
Common::Array<AnimEvent> animDatabase = getAnimationDatabase(_currentScene->_staticData.location.timeZone, _currentScene->_staticData.location.environment); Common::Array<AnimEvent> animDatabase = getAnimationDatabase(_currentScene->_staticData.location.timeZone, _currentScene->_staticData.location.environment);
@ -1475,7 +1478,7 @@ bool SceneViewWindow::playSynchronousAnimation(int animationID) {
if (_globalFlags.bcTranslateEnabled == 1 && animDatabase[i].audioStreamCount > 1) if (_globalFlags.bcTranslateEnabled == 1 && animDatabase[i].audioStreamCount > 1)
animationMovie->setAudioTrack(2); animationMovie->setAudioTrack(2);
if (_currentScene && _currentScene->movieCallback(this, animationMovie.get(), animationID, MOVIE_START) == SC_FALSE) if (_currentScene->movieCallback(this, animationMovie.get(), animationID, MOVIE_START) == SC_FALSE)
return false; return false;
animationMovie->seekToFrame(animDatabase[i].startFrame); animationMovie->seekToFrame(animDatabase[i].startFrame);
@ -1555,6 +1558,9 @@ bool SceneViewWindow::playSynchronousAnimationExtern(int animationID) {
} }
bool SceneViewWindow::playPlacedSynchronousAnimation(int animationID, int left, int top) { bool SceneViewWindow::playPlacedSynchronousAnimation(int animationID, int left, int top) {
if (!_currentScene)
return false;
TempCursorChange cursorChange(kCursorWait); TempCursorChange cursorChange(kCursorWait);
Common::Array<AnimEvent> animDatabase = getAnimationDatabase(_currentScene->_staticData.location.timeZone, _currentScene->_staticData.location.environment); Common::Array<AnimEvent> animDatabase = getAnimationDatabase(_currentScene->_staticData.location.timeZone, _currentScene->_staticData.location.environment);
@ -1582,7 +1588,7 @@ bool SceneViewWindow::playPlacedSynchronousAnimation(int animationID, int left,
if (_globalFlags.bcTranslateEnabled == 1 && animDatabase[i].audioStreamCount > 1) if (_globalFlags.bcTranslateEnabled == 1 && animDatabase[i].audioStreamCount > 1)
animationMovie->setAudioTrack(2); animationMovie->setAudioTrack(2);
if (_currentScene && _currentScene->movieCallback(this, animationMovie.get(), animationID, MOVIE_START) == SC_FALSE) if (_currentScene->movieCallback(this, animationMovie.get(), animationID, MOVIE_START) == SC_FALSE)
return false; return false;
animationMovie->seekToFrame(animDatabase[i].startFrame); animationMovie->seekToFrame(animDatabase[i].startFrame);
@ -1622,6 +1628,9 @@ bool SceneViewWindow::playPlacedSynchronousAnimation(int animationID, int left,
} }
bool SceneViewWindow::playClippedSynchronousAnimation(int animationID, int left, int top, int right, int bottom) { bool SceneViewWindow::playClippedSynchronousAnimation(int animationID, int left, int top, int right, int bottom) {
if (!_currentScene)
return false;
TempCursorChange cursorChange(kCursorWait); TempCursorChange cursorChange(kCursorWait);
Common::Array<AnimEvent> animDatabase = getAnimationDatabase(_currentScene->_staticData.location.timeZone, _currentScene->_staticData.location.environment); Common::Array<AnimEvent> animDatabase = getAnimationDatabase(_currentScene->_staticData.location.timeZone, _currentScene->_staticData.location.environment);
@ -1652,7 +1661,7 @@ bool SceneViewWindow::playClippedSynchronousAnimation(int animationID, int left,
if (_globalFlags.bcTranslateEnabled == 1 && animDatabase[i].audioStreamCount > 1) if (_globalFlags.bcTranslateEnabled == 1 && animDatabase[i].audioStreamCount > 1)
animationMovie->setAudioTrack(2); animationMovie->setAudioTrack(2);
if (_currentScene && _currentScene->movieCallback(this, animationMovie.get(), animationID, MOVIE_START) == SC_FALSE) if (_currentScene->movieCallback(this, animationMovie.get(), animationID, MOVIE_START) == SC_FALSE)
return false; return false;
animationMovie->seekToFrame(animDatabase[i].startFrame); animationMovie->seekToFrame(animDatabase[i].startFrame);