diff options
Diffstat (limited to 'engines/scumm/he/sprite_he.cpp')
| -rw-r--r-- | engines/scumm/he/sprite_he.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp index ec69ae11b4..245a986531 100644 --- a/engines/scumm/he/sprite_he.cpp +++ b/engines/scumm/he/sprite_he.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -264,6 +264,13 @@ int Sprite::getSpriteFlagRemapPalette(int spriteId) { int Sprite::getSpriteFlagAutoAnim(int spriteId) { assertRange(1, spriteId, _varNumSprites, "sprite"); + // WORKAROUND: Two scripts (room 2 script 2070/2071) compare against + // a return value of one, but the original game returned the flag value + // (0x200000) for true. These scripts bugs caused problems (infinite loop + // and beans not appearing) in the Jumping Beans mini games under ScummVM. + if (_vm->_game.id == GID_PJGAMES) + return 0; + return ((_spriteTable[spriteId].flags & kSFAutoAnim) != 0) ? 1 : 0; } @@ -793,6 +800,11 @@ void Sprite::resetSprite(int spriteId) { _spriteTable[spriteId].field_84 = 0; _spriteTable[spriteId].imgFlags = 0; _spriteTable[spriteId].field_90 = 0; + + if (_vm->_game.heversion >= 100) { + _spriteTable[spriteId].flags &= ~kSFMarkDirty; + _spriteTable[spriteId].flags |= kSFAutoAnim | kSFBlitDirectly; + } } void Sprite::setSpriteImage(int spriteId, int imageNum) { @@ -820,6 +832,8 @@ void Sprite::setSpriteImage(int spriteId, int imageNum) { } else { if (_vm->VAR(139)) _spriteTable[spriteId].flags &= ~kSFActive; + else if (_vm->_game.heversion >= 100 && origResId == 0) + _spriteTable[spriteId].flags = 0; else if (_spriteTable[spriteId].flags & kSFImageless) _spriteTable[spriteId].flags = 0; else |