[Scummvm-git-logs] scummvm master -> 581b2c84b83f7ab491f10b122662a1d6de62060f

dreammaster dreammaster at scummvm.org
Wed Mar 29 04:32:22 CEST 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
581b2c84b8 TITANIC: Workaround original bug in CStarView fn18


Commit: 581b2c84b83f7ab491f10b122662a1d6de62060f
    https://github.com/scummvm/scummvm/commit/581b2c84b83f7ab491f10b122662a1d6de62060f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-03-28T22:31:19-04:00

Commit Message:
TITANIC: Workaround original bug in CStarView fn18

The original accessed the raw pixels ptr of a video surface after
it had been unlocked

Changed paths:
    engines/titanic/star_control/star_view.cpp


diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp
index da4ea20..60c02b1 100644
--- a/engines/titanic/star_control/star_view.cpp
+++ b/engines/titanic/star_control/star_view.cpp
@@ -429,11 +429,11 @@ void CStarView::fn18(CStarControlSub12 *sub12) {
 			_videoSurface2->clear();
 			_videoSurface2->lock();
 			_starField->render(_videoSurface2, sub12);
-			_videoSurface2->unlock();
 
 			_starField->set4(old4);
 			_starField->set54(oldVal);
 			_starField->fn6(_videoSurface2, sub12);
+			_videoSurface2->unlock();
 		}
 	}
 }





More information about the Scummvm-git-logs mailing list