From fd1a1ae56f8d25eda26afce549dd2c6c02a65aed Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Thu, 20 May 2010 14:34:36 +0200 Subject: [PATCH] check for kZoneMerge in checkSpecialZoneBox --- engines/parallaction/parallaction.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index d671e31..44851fd 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -654,7 +654,7 @@ bool Parallaction::pickupItem(ZonePtr z) { // FIXME: input coordinates must be offseted to handle scrolling! bool Parallaction::checkSpecialZoneBox(ZonePtr z, uint32 type, uint x, uint y) { // not a special zone - if ((z->getX() != -2) && (z->getX() != -3)) { + if ((z->getX() != -2) && (z->getX() != -3) && ACTIONTYPE(z) != kZoneMerge) { return false; } -- 1.6.3.3