diff options
| author | Vladimir Menshakov | 2010-02-07 17:47:34 +0000 |
|---|---|---|
| committer | Vladimir Menshakov | 2010-02-07 17:47:34 +0000 |
| commit | ad8ebf0130e115af443481fbbccfc70f20f84ade (patch) | |
| tree | 5f5509ffd5e0e1151ac8b6f75bb6c67868631cf3 /engines | |
| parent | ef8d857bafeaf35ed69aedbff586e119e3acc8f0 (diff) | |
| download | scummvm-rg350-ad8ebf0130e115af443481fbbccfc70f20f84ade.tar.gz scummvm-rg350-ad8ebf0130e115af443481fbbccfc70f20f84ade.tar.bz2 scummvm-rg350-ad8ebf0130e115af443481fbbccfc70f20f84ade.zip | |
do not trigger combine for the one object
svn-id: r47975
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/teenagent/inventory.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/teenagent/inventory.cpp b/engines/teenagent/inventory.cpp index b7bfc579e8..97a0c3c6fd 100644 --- a/engines/teenagent/inventory.cpp +++ b/engines/teenagent/inventory.cpp @@ -186,6 +186,8 @@ bool Inventory::processEvent(const Common::Event &event) { int id1 = selected_obj->id; int id2 = hovered_obj->id; + if (id1 == id2) + return true; debug(0, "combine(%u, %u)!", id1, id2); byte *table = res->dseg.ptr(0xC335); |