Ticket #8062: layering.diff

File layering.diff, 1.4 KB (added by eriktorbjorn, 22 years ago)

Patch against a September 23 CVS snapshot

  • scummvm/scumm/actor.cpp 

    diff -ur ScummVM-cvs20020923/scummvm/scumm/actor.cpp ScummVM-cvs20020923+hack/scummvm/scumm/actor.cpp
    old new  
    859859        if (!needRedraw)
    860860                return;
    861861
    862         // FIXME: ugly fix for samnmax inventory (otherwise actors get drawn over the
    863         // inventory). We make an exception for room 66 (the Car Bomb game), for otherwise
    864         // that will be drawn incorrectly. Oh well....
    865         if (_vm->_gameId == GID_SAMNMAX && _vm->getState(995) && _vm->_currentRoom != 66)
    866                 return;
    867 
    868862        needRedraw = false;
    869863
    870864        setupActorScale();

  • scummvm/scumm/object.cpp 

    diff -ur ScummVM-cvs20020923/scummvm/scumm/object.cpp ScummVM-cvs20020923+hack/scummvm/scumm/object.cpp
    old new  
    375375
    376376        if (numstrip != 0) {
    377377                byte flags = Gdi::dbAllowMaskOr;
    378                 if (_features & GF_AFTER_V7 && getClass(od->obj_nr, 22))
     378                // Sam & Max needs this to fix object-layering problems with
     379                // the inventory and conversation icons.
     380                if ((_features & GF_AFTER_V7 || _gameId == GID_SAMNMAX) && getClass(od->obj_nr, 22))
    379381                        flags |= Gdi::dbDrawMaskOnBoth;
    380382                gdi.drawBitmap(ptr, _curVirtScreen, x, ypos, height, x - xpos, numstrip, flags);
    381383        }