Ticket #8094: verb-shadow.diff

File verb-shadow.diff, 978 bytes (added by eriktorbjorn, 17 years ago)

Patch against an October 14 CVS snapshot

  • scummvm/scumm/resource.cpp

    diff -ur ScummVM-cvs20021014/scummvm/scumm/resource.cpp ScummVM-cvs20021014+hack/scummvm/scumm/resource.cpp
    old new  
    450450        if (_gameId == GID_INDY4 && no == 0)
    451451                no = 1;
    452452
    453         memset(_charsetData, 0, sizeof(_charsetData));
    454 
    455453        assert(no < (int)sizeof(_charsetData) / 16);
    456454        checkRange(_maxCharsets - 1, 1, no, "Loading illegal charset %d");
    457455
  • scummvm/scumm/scummvm.cpp

    diff -ur ScummVM-cvs20021014/scummvm/scumm/scummvm.cpp ScummVM-cvs20021014+hack/scummvm/scumm/scummvm.cpp
    old new  
    206206        else
    207207                _resourceHeaderSize = 8;
    208208
     209        memset(_charsetData, 0, sizeof(_charsetData));
     210       
    209211        if (!(_features & GF_SMALL_NAMES))
    210212                loadCharset(1);
    211213