[Scummvm-git-logs] scummvm master -> 274eb7f4921df139284d58fa160c628f7013a35d

dreammaster dreammaster at scummvm.org
Tue Jul 18 02:16:28 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:
274eb7f492 TITANIC: Don't prod Maitre D's butt just by moving mouse on him


Commit: 274eb7f4921df139284d58fa160c628f7013a35d
    https://github.com/scummvm/scummvm/commit/274eb7f4921df139284d58fa160c628f7013a35d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-17T20:16:20-04:00

Commit Message:
TITANIC: Don't prod Maitre D's butt just by moving mouse on him

Changed paths:
    engines/titanic/game/maitred/maitred_prod_receptor.cpp


diff --git a/engines/titanic/game/maitred/maitred_prod_receptor.cpp b/engines/titanic/game/maitred/maitred_prod_receptor.cpp
index 6f64a76..c727366 100644
--- a/engines/titanic/game/maitred/maitred_prod_receptor.cpp
+++ b/engines/titanic/game/maitred/maitred_prod_receptor.cpp
@@ -61,6 +61,8 @@ bool CMaitreDProdReceptor::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 }
 
 bool CMaitreDProdReceptor::MouseMoveMsg(CMouseMoveMsg *msg) {
+	if (!getDraggingObject())
+		return true;
 	if (_fieldBC == 2 && static_cast<CGameObject *>(getParent())->hasActiveMovie())
 		return false;
 	else if (++_counter < 20)





More information about the Scummvm-git-logs mailing list