aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMartin Kiewitz2010-01-22 18:20:57 +0000
committerMartin Kiewitz2010-01-22 18:20:57 +0000
commit8f41cc0631914a6a743a1efa5275d8fa399b4f12 (patch)
tree1a36e5e7d862b571a69a02b8b6b1248a60a0101f /engines
parent61acb22fc56c59331fa539fbd9d7920e97409ad9 (diff)
downloadscummvm-rg350-8f41cc0631914a6a743a1efa5275d8fa399b4f12.tar.gz
scummvm-rg350-8f41cc0631914a6a743a1efa5275d8fa399b4f12.tar.bz2
scummvm-rg350-8f41cc0631914a6a743a1efa5275d8fa399b4f12.zip
SCI: removed error inside Menu::mouseFindMenuItemSelection, instead returning 0
svn-id: r47442
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/graphics/menu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/graphics/menu.cpp b/engines/sci/graphics/menu.cpp
index 6a3313f503..fd92e0cd6d 100644
--- a/engines/sci/graphics/menu.cpp
+++ b/engines/sci/graphics/menu.cpp
@@ -618,7 +618,7 @@ uint16 Menu::mouseFindMenuItemSelection(Common::Point mousePosition, uint16 menu
uint16 itemId = 0;
if (!menuId)
- error("No menu active, but mouseFindMenuItemSelection() called");
+ return 0;
if ((mousePosition.x < _menuRect.left) || (mousePosition.x >= _menuRect.right))
return 0;