[Scummvm-git-logs] scummvm master -> b2cddceae69c677fcaaa3f1e447ff2bb05fd477a

[dreammaster]

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:
b2cddceae6 TITANIC: Add missing state reset in CStarView fn18


Commit: b2cddceae69c677fcaaa3f1e447ff2bb05fd477a
    https://github.com/scummvm/scummvm/commit/b2cddceae69c677fcaaa3f1e447ff2bb05fd477a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-03-28T22:02:54-04:00

Commit Message:
TITANIC: Add missing state reset in CStarView fn18

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 92a722d..da4ea20 100644
--- a/engines/titanic/star_control/star_view.cpp
+++ b/engines/titanic/star_control/star_view.cpp
@@ -424,13 +424,14 @@ void CStarView::fn18(CStarControlSub12 *sub12) {
 
 		if (_videoSurface2) {
 			int oldVal = _starField->get54();
-			_starField->set4(false);
+			bool old4 = _starField->set4(false);
 
 			_videoSurface2->clear();
 			_videoSurface2->lock();
 			_starField->render(_videoSurface2, sub12);
 			_videoSurface2->unlock();
 
+			_starField->set4(old4);
 			_starField->set54(oldVal);
 			_starField->fn6(_videoSurface2, sub12);
 		}