diff -ur ScummVM-cvs20041108/scumm/charset.cpp ScummVM-cvs20041108+hack/scumm/charset.cpp
old
|
new
|
|
1211 | 1211 | _hasMask = true; |
1212 | 1212 | _textScreenID = vs->number; |
1213 | 1213 | } |
1214 | | if (_ignoreCharsetMask || !vs->hasTwoBuffers) { |
| 1214 | if (_ignoreCharsetMask || !vs->hasTwoBuffers || _vm->_currentRoom == 0) { |
1215 | 1215 | dst = vs->getPixels(_left, drawTop); |
1216 | 1216 | drawBits1(*vs, dst, charPtr, drawTop, origWidth, origHeight); |
1217 | 1217 | } else { |
… |
… |
|
1351 | 1351 | |
1352 | 1352 | Graphics::Surface dstSurface; |
1353 | 1353 | Graphics::Surface backSurface; |
1354 | | if (_ignoreCharsetMask || !vs->hasTwoBuffers) { |
| 1354 | if (_ignoreCharsetMask || !vs->hasTwoBuffers || _vm->_currentRoom == 0) { |
1355 | 1355 | dstSurface = *vs; |
1356 | 1356 | dstPtr = vs->getPixels(_left, drawTop); |
1357 | 1357 | } else { |
… |
… |
|
1625 | 1625 | } |
1626 | 1626 | |
1627 | 1627 | int drawTop = _top; |
1628 | | if (_ignoreCharsetMask) { |
| 1628 | if (_ignoreCharsetMask || _vm->_currentRoom == 0) { |
1629 | 1629 | VirtScreen *vs = &_vm->virtscr[kMainVirtScreen]; |
1630 | 1630 | s = *vs; |
1631 | 1631 | s.pixels = vs->getPixels(0, 0); |