From 886c8ec79fa534ff9f660c96a02f606dd55eb035 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 31 Aug 2008 23:12:57 +0000 Subject: [PATCH] (svn r14214) -Codechange: move another TTD graphics bug into the GRF; height problem of sprite #142. --- bin/data/openttdd.grf | Bin 460763 -> 460819 bytes bin/data/openttdw.grf | Bin 460946 -> 461009 bytes bin/data/orig_dos.obg | 2 +- bin/data/orig_dos_de.obg | 2 +- bin/data/orig_win.obg | 2 +- src/spritecache.cpp | 1 - 6 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/data/openttdd.grf b/bin/data/openttdd.grf index ea713dc00ecb97e35c95058f7b74092c107ab223..247ba205140676302e8f0a9cd93444f58467ae29 100644 GIT binary patch delta 11437 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 H@b!NHN>1q5 delta 11238 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%0DZf?O%q>NnUc%%rLgBTTgGKDGJxB*WAeR`KZ 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 delta 14133 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 QiW-R+OgJK#L4}|H4Iy#e&Hw-a diff --git a/bin/data/orig_dos.obg b/bin/data/orig_dos.obg index 9dcbba1d7a..f140b25352 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 8477dc99e5..18f679b58a 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 6e99d81297..93b6ce98fa 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 616eb59b14..629e519f04 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);