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