[Scummvm-cvs-logs] scummvm master -> d048776ef3658a726e1a06666453b30f27188730

dreammaster dreammaster at scummvm.org
Mon Mar 9 01:45:29 CET 2015


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:
d048776ef3 MADS: Fix walking behind counter in software store


Commit: d048776ef3658a726e1a06666453b30f27188730
    https://github.com/scummvm/scummvm/commit/d048776ef3658a726e1a06666453b30f27188730
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-08T20:44:19-04:00

Commit Message:
MADS: Fix walking behind counter in software store

Changed paths:
    engines/mads/nebular/nebular_scenes5.cpp



diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index f520fd5..8be5269 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -1547,7 +1547,9 @@ void Scene507::actions() {
 		_vm->_dialogs->show(50724);
 	else if (_action.isAction(VERB_LOOK, NOUN_WINDOW))
 		_vm->_dialogs->show(50725);
-	else if (_action.isAction(VERB_LOOK, NOUN_COUNTER)) {
+	else if (_action.isAction(NOUN_WALK_BEHIND, NOUN_COUNTER)) {
+		// WORkAROUND: Empty handling to prevent default "can't do that" dialogs showing
+	} else if (_action.isAction(VERB_LOOK, NOUN_COUNTER)) {
 		if (_game._objects.isInRoom(OBJ_PENLIGHT))
 			_vm->_dialogs->show(50728);
 		else






More information about the Scummvm-git-logs mailing list