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

dreammaster dreammaster at scummvm.org
Thu Aug 17 04:21:51 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:
f1e42b6af0 TITANIC: Fix hose pickup cursor when loading savegame with cover open


Commit: f1e42b6af01039a18a2bf557313c95b4154251a8
    https://github.com/scummvm/scummvm/commit/f1e42b6af01039a18a2bf557313c95b4154251a8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-16T22:21:44-04:00

Commit Message:
TITANIC: Fix hose pickup cursor when loading savegame with cover open

Changed paths:
    engines/titanic/game/pickup/pick_up_hose.cpp


diff --git a/engines/titanic/game/pickup/pick_up_hose.cpp b/engines/titanic/game/pickup/pick_up_hose.cpp
index 442c43f..548caaf 100644
--- a/engines/titanic/game/pickup/pick_up_hose.cpp
+++ b/engines/titanic/game/pickup/pick_up_hose.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/game/pickup/pick_up_hose.h"
+#include "titanic/game/broken_pell_base.h"
 #include "titanic/core/project_item.h"
 #include "titanic/core/room_item.h"
 #include "titanic/core/view_item.h"
@@ -95,7 +96,8 @@ bool CPickUpHose::StatusChangeMsg(CStatusChangeMsg *msg) {
 }
 
 bool CPickUpHose::EnterViewMsg(CEnterViewMsg *msg) {
-	_cursorId = CURSOR_IGNORE;
+	if (msg->_oldView)
+		_cursorId = CURSOR_IGNORE;
 	return true;
 }
 





More information about the Scummvm-git-logs mailing list