diff options
| author | rubidium <rubidium@openttd.org> | 2008-08-31 23:12:57 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-08-31 23:12:57 +0000 |
| commit | 242cbd00748513fcf36882c0d16518324b7c736a (patch) | |
| tree | 368e8af33deba6cae5d7bf03f7097a609b7adac5 | |
| parent | 084e5984d9019513c53df9760d2a507e125ff220 (diff) | |
| download | openttd-242cbd00748513fcf36882c0d16518324b7c736a.tar.xz | |
(svn r14214) -Codechange: move another TTD graphics bug into the GRF; height problem of sprite #142.
| -rw-r--r-- | bin/data/openttdd.grf | bin | 460763 -> 460819 bytes | |||
| -rw-r--r-- | bin/data/openttdw.grf | bin | 460946 -> 461009 bytes | |||
| -rw-r--r-- | bin/data/orig_dos.obg | 2 | ||||
| -rw-r--r-- | bin/data/orig_dos_de.obg | 2 | ||||
| -rw-r--r-- | bin/data/orig_win.obg | 2 | ||||
| -rw-r--r-- | src/spritecache.cpp | 1 |
6 files changed, 3 insertions, 4 deletions
diff --git a/bin/data/openttdd.grf b/bin/data/openttdd.grf Binary files differindex ea713dc00..247ba2051 100644 --- a/bin/data/openttdd.grf +++ b/bin/data/openttdd.grf diff --git a/bin/data/openttdw.grf b/bin/data/openttdw.grf Binary files differindex ed5db8034..79aa2914a 100644 --- a/bin/data/openttdw.grf +++ b/bin/data/openttdw.grf diff --git a/bin/data/orig_dos.obg b/bin/data/orig_dos.obg index 9dcbba1d7..f140b2535 100644 --- a/bin/data/orig_dos.obg +++ b/bin/data/orig_dos.obg @@ -24,7 +24,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8 TRGC.GRF = ed446637e034104c5559b32c18afe78d TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9 TRGT.GRF = e30e8a398ae86c03dc534a8ac7dfb3b6 -OPENTTDD.GRF = 54198e7a56fba23bad45a1c278df7679 +OPENTTDD.GRF = 4d568fe52884fb104ad51ba8d0427473 [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/bin/data/orig_dos_de.obg b/bin/data/orig_dos_de.obg index 8477dc99e..18f679b58 100644 --- a/bin/data/orig_dos_de.obg +++ b/bin/data/orig_dos_de.obg @@ -24,7 +24,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8 TRGC.GRF = ed446637e034104c5559b32c18afe78d TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9 TRGT.GRF = fcde1d7e8a74197d72a62695884b909e -OPENTTDD.GRF = 54198e7a56fba23bad45a1c278df7679 +OPENTTDD.GRF = 4d568fe52884fb104ad51ba8d0427473 [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/bin/data/orig_win.obg b/bin/data/orig_win.obg index 6e99d8129..93b6ce98f 100644 --- a/bin/data/orig_win.obg +++ b/bin/data/orig_win.obg @@ -24,7 +24,7 @@ TRGIR.GRF = 0c2484ff6be49fc63a83be6ab5c38f32 TRGCR.GRF = 3668f410c761a050b5e7095a2b14879b TRGHR.GRF = 06bf2b7a31766f048baac2ebe43457b1 TRGTR.GRF = de53650517fe661ceaa3138c6edb0eb8 -OPENTTDW.GRF = e746c0c5649e98cfda21b577add7e6e1 +OPENTTDW.GRF = 19f5ffa1ae99be3565890360d4ba7398 [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/src/spritecache.cpp b/src/spritecache.cpp index 616eb59b1..629e519f0 100644 --- a/src/spritecache.cpp +++ b/src/spritecache.cpp @@ -252,7 +252,6 @@ static void* ReadSprite(SpriteCache *sc, SpriteID id, bool real_sprite) sc->real_sprite = real_sprite; if (!sprite_loader.LoadSprite(&sprite, file_slot, file_pos)) return NULL; - if (id == 142) sprite.height = 10; // Compensate for a TTD bug sc->ptr = BlitterFactoryBase::GetCurrentBlitter()->Encode(&sprite, &AllocSprite); free(sprite.data); |