aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2004-04-05 18:45:40 +0000
committerPaweł Kołodziejski2004-04-05 18:45:40 +0000
commit74d902c62bc609d6d89f9e1ff0a4c32505fcf0d9 (patch)
tree3a8a607b255f7c76c05586c3afb13b86aeffbe68
parentf141ad488b1fd4d96214cb35e0ab4034173efb81 (diff)
downloadscummvm-rg350-74d902c62bc609d6d89f9e1ff0a4c32505fcf0d9.tar.gz
scummvm-rg350-74d902c62bc609d6d89f9e1ff0a4c32505fcf0d9.tar.bz2
scummvm-rg350-74d902c62bc609d6d89f9e1ff0a4c32505fcf0d9.zip
removed exception for no used nut font
svn-id: r13469
-rw-r--r--scumm/nut_renderer.cpp19
1 files changed, 2 insertions, 17 deletions
diff --git a/scumm/nut_renderer.cpp b/scumm/nut_renderer.cpp
index 12b9549ad6..2bf61d05a9 100644
--- a/scumm/nut_renderer.cpp
+++ b/scumm/nut_renderer.cpp
@@ -149,23 +149,8 @@ bool NutRenderer::loadFont(const char *filename, const char *directory) {
for (int l = 0; l < _nbChars; l++) {
offset += READ_BE_UINT32(dataSrc + offset + 4) + 8;
-
- // TODO/FIXME: The code checks for a "shift" in the FRME headers. Well, neither
- // in my german nor in my english NUT fonts does that occur, but it's very typical
- // for IFF style formats (like this here) to "pad" odd sized blocks. Hence, it might
- // be a cleaner solution to insert this adjustment here:
- // if (offset & 1)
- // offset++;
- // And then get rid of the hack for the shifted FRME. I'd do that right now, but since
- // I have no way to test this (read: no data files where this issue occurs), I am
- // deferring this job for now :-)
-
- if ((READ_BE_UINT32(dataSrc + offset) == 'FRME') || (READ_BE_UINT32(dataSrc + offset + 1) == 'FRME')) {
- if (READ_BE_UINT32(dataSrc + offset) == 'FRME') {
- offset += 8;
- } else { // hack for proper offset
- offset += 9;
- }
+ if (READ_BE_UINT32(dataSrc + offset) == 'FRME') {
+ offset += 8;
if (READ_BE_UINT32(dataSrc + offset) == 'FOBJ') {
int codec = READ_LE_UINT16(dataSrc + offset + 8);