diff options
| -rw-r--r-- | scumm/charset.cpp | 6 | ||||
| -rw-r--r-- | scumm/resource_v3.cpp | 21 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 2 |
3 files changed, 19 insertions, 10 deletions
diff --git a/scumm/charset.cpp b/scumm/charset.cpp index 6ebd76560e..9072b40e01 100644 --- a/scumm/charset.cpp +++ b/scumm/charset.cpp @@ -61,9 +61,9 @@ int CharsetRendererOld256::getCharWidth(byte chr) { // FIXME - this fixes the inventory icons in Zak256/Indy3 // see bug #613109. // chars 1,2: up arrow chars 3,4: down arrow - if ((_vm->_gameId == GID_ZAK256 || _vm->_gameId == GID_INDY3_256) - && (chr >= 1 && chr <= 4)) - spacing = 6; +// if ((_vm->_gameId == GID_ZAK256 || _vm->_gameId == GID_INDY3_256) +// && (chr >= 1 && chr <= 4)) +// spacing = 6; return spacing; } diff --git a/scumm/resource_v3.cpp b/scumm/resource_v3.cpp index 158ce4c4e3..92f718b8c4 100644 --- a/scumm/resource_v3.cpp +++ b/scumm/resource_v3.cpp @@ -181,12 +181,21 @@ void Scumm_v3::loadCharset(int no) { checkRange(4, 0, no, "Loading illegal charset %d"); closeRoom(); - openRoom(98 + no); - - size = _fileHandle.readUint16LE(); - - _fileHandle.read(createResource(6, no, size), size); - closeRoom(); + File file; + char buf[20]; + + sprintf(buf, "%02d.LFL", 99 - no); +// sprintf(buf, "%02d.LFL", 98 + no); + file.open(buf, _gameDataPath); + + if (file.isOpen() == false) { + error("loadCharset(%d): Missing file charset: %s", no, buf); + } + + size = file.readUint16LE(); + file.read(createResource(rtCharset, no, size), size); + + file.close(); } void Scumm_v3::readMAXS() { diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 8047439072..1c2ff6cfbd 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -314,7 +314,7 @@ void Scumm::scummInit() { initScreens(0, 16, _realWidth, 144); } - if (_features & GF_OLD256) + if (_features & GF_AFTER_V3) _charset = new CharsetRendererOld256(this); else if (_features & GF_AFTER_V8) _charset = new CharsetRendererNut(this); |