From fd89332101d6dea6b270088f17f0d200cd3ca442 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 13 Dec 2009 00:13:06 +0000 Subject: [PATCH] (svn r18476) [0.7] -Backport from trunk: - Fix: (Invalid) GRFs could trigger invalid reads (r18391) - Fix: One could not share orders between buses carrying different cargos (r18380) - Fix: Off-by-one in the preconfigured music lists [FS#3339] (r18369) - Change [FS#3349]: Recolour the bubble generator just like any other industry (r18409) - Add: Some missing latin-ish characters from the OpenGFX set (r18431) --- bin/data/openttdd.grf | Bin 460778 -> 476159 bytes bin/data/openttdw.grf | Bin 460970 -> 476356 bytes bin/data/orig_dos.obg | 2 +- bin/data/orig_dos_de.obg | 2 +- bin/data/orig_win.obg | 2 +- src/gfx.cpp | 2 +- src/music_gui.cpp | 6 +++--- src/order_cmd.cpp | 5 ++--- src/saveload/misc_sl.cpp | 2 +- src/spriteloader/grf.cpp | 12 ++++++++++-- src/table/industry_land.h | 18 +++++++++--------- 11 files changed, 29 insertions(+), 22 deletions(-) diff --git a/bin/data/openttdd.grf b/bin/data/openttdd.grf index c60a0790086b3b6c319ec6f9f71882f938275a0d..3eba7ae5dc7aadfbeb8978a07f699718414c67eb 100644 GIT binary patch delta 25881 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 delta 10145 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 Vv^X-3;O6(Z0-hZDi2l*c{{td;T1x-` delta 10028 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 ht0A$H94c%N*qjBj`auWsJqNN4S*Qayo+0 _cursor_backup; */ static Rect _invalid_rect; static const byte *_colour_remap_ptr; -static byte _string_colourremap[3]; +static byte _string_colourremap[3]; ///< Recoloursprite for stringdrawing. The grf loader ensures, that ST_FONT sprites only use colours 0 to 2. enum { DIRTY_BLOCK_HEIGHT = 8, diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 44dde7e0b3..3e32019c86 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -29,15 +29,15 @@ static byte _playlist_all[] = { }; static byte _playlist_old_style[] = { - 1, 8, 2, 9, 14, 15, 19, 13, 0 + 2, 9, 3, 10, 15, 16, 20, 14, 0 }; static byte _playlist_new_style[] = { - 6, 11, 10, 17, 21, 18, 5, 0 + 7, 12, 11, 18, 22, 19, 6, 0 }; static byte _playlist_ezy_street[] = { - 12, 7, 16, 3, 20, 4, 0 + 13, 8, 17, 4, 21, 5, 0 }; static byte * const _playlists[] = { diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 81874af7d5..3b7f5c2773 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -1094,9 +1094,8 @@ CommandCost CmdCloneOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 return CMD_ERROR; /* Trucks can't share orders with busses (and visa versa) */ - if (src->type == VEH_ROAD) { - if (src->cargo_type != dst->cargo_type && (IsCargoInClass(src->cargo_type, CC_PASSENGERS) || IsCargoInClass(dst->cargo_type, CC_PASSENGERS))) - return CMD_ERROR; + if (src->type == VEH_ROAD && IsCargoInClass(src->cargo_type, CC_PASSENGERS) != IsCargoInClass(dst->cargo_type, CC_PASSENGERS)) { + return CMD_ERROR; } /* Is the vehicle already in the shared list? */ diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp index 1fc641d381..3bdc6f706d 100644 --- a/src/saveload/misc_sl.cpp +++ b/src/saveload/misc_sl.cpp @@ -46,7 +46,7 @@ void ResetViewportAfterLoadGame() w->viewport->dest_scrollpos_y = _saved_scrollpos_y; ViewPort *vp = w->viewport; - vp->zoom = min(_saved_scrollpos_zoom, ZOOM_LVL_MAX); + vp->zoom = (ZoomLevel)min(_saved_scrollpos_zoom, ZOOM_LVL_MAX); vp->virtual_width = ScaleByZoom(vp->width, vp->zoom); vp->virtual_height = ScaleByZoom(vp->height, vp->zoom); diff --git a/src/spriteloader/grf.cpp b/src/spriteloader/grf.cpp index cd034ee735..0ddc1b5853 100644 --- a/src/spriteloader/grf.cpp +++ b/src/spriteloader/grf.cpp @@ -121,7 +121,11 @@ bool SpriteLoaderGrf::LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, } for (int x = 0; x < length; x++) { - data->m = ((sprite_type == ST_NORMAL && _palette_remap_grf[file_slot]) ? _palette_remap[*dest] : *dest); + switch (sprite_type) { + case ST_NORMAL: data->m = _palette_remap_grf[file_slot] ? _palette_remap[*dest] : *dest; break; + case ST_FONT: data->m = min(*dest, 2u); break; + default: data->m = *dest; break; + } dest++; data++; } @@ -142,7 +146,11 @@ bool SpriteLoaderGrf::LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, dest = dest_orig; for (int i = 0; i < sprite->width * sprite->height; i++) { - sprite->data[i].m = ((sprite_type == ST_NORMAL && _palette_remap_grf[file_slot]) ? _palette_remap[dest[i]] : dest[i]); + switch (sprite_type) { + case ST_NORMAL: sprite->data[i].m = _palette_remap_grf[file_slot] ? _palette_remap[dest[i]] : dest[i]; break; + case ST_FONT: sprite->data[i].m = min(dest[i], 2u); break; + default: sprite->data[i].m = dest[i]; break; + } } } diff --git a/src/table/industry_land.h b/src/table/industry_land.h index 3dea6dbff1..5df8f257f4 100644 --- a/src/table/industry_land.h +++ b/src/table/industry_land.h @@ -684,17 +684,17 @@ static const DrawBuildingsTileStruct _industry_draw_tile_data[NEW_INDUSTRYTILEOF M( 0x1244, PAL_NONE, 0x1282 | (1 << PALETTE_MODIFIER_COLOUR), PAL_NONE, 0, 0, 16, 16, 50, 0), M( 0x1244, PAL_NONE, 0x1285 | (1 << PALETTE_MODIFIER_COLOUR), PAL_NONE, 0, 0, 16, 16, 50, 0), M( 0x1243, PAL_NONE, 0x0, PAL_NONE, 0, 0, 16, 16, 50, 0), - M( 0x1243, PAL_NONE, 0x1287, PALETTE_TO_RED, 0, 0, 16, 16, 50, 0), - M( 0x1243, PAL_NONE, 0x1287, PALETTE_TO_RED, 0, 0, 16, 16, 50, 0), - M( 0x1243, PAL_NONE, 0x1287, PALETTE_TO_RED, 0, 0, 16, 16, 50, 0), + M( 0x1243, PAL_NONE, 0x1287 | (1 << PALETTE_MODIFIER_COLOUR), PAL_NONE, 0, 0, 16, 16, 50, 0), + M( 0x1243, PAL_NONE, 0x1287 | (1 << PALETTE_MODIFIER_COLOUR), PAL_NONE, 0, 0, 16, 16, 50, 0), + M( 0x1243, PAL_NONE, 0x1287 | (1 << PALETTE_MODIFIER_COLOUR), PAL_NONE, 0, 0, 16, 16, 50, 0), M( 0x1244, PAL_NONE, 0x0, PAL_NONE, 0, 0, 16, 16, 50, 0), - M( 0x1244, PAL_NONE, 0x1288, PALETTE_TO_RED, 0, 0, 16, 16, 50, 0), - M( 0x1244, PAL_NONE, 0x1288, PALETTE_TO_RED, 0, 0, 16, 16, 50, 0), - M( 0x1244, PAL_NONE, 0x1288, PALETTE_TO_RED, 0, 0, 16, 16, 50, 0), + M( 0x1244, PAL_NONE, 0x1288 | (1 << PALETTE_MODIFIER_COLOUR), PAL_NONE, 0, 0, 16, 16, 50, 0), + M( 0x1244, PAL_NONE, 0x1288 | (1 << PALETTE_MODIFIER_COLOUR), PAL_NONE, 0, 0, 16, 16, 50, 0), + M( 0x1244, PAL_NONE, 0x1288 | (1 << PALETTE_MODIFIER_COLOUR), PAL_NONE, 0, 0, 16, 16, 50, 0), M( 0x1243, PAL_NONE, 0x0, PAL_NONE, 0, 0, 16, 16, 50, 0), - M( 0x1243, PAL_NONE, 0x1289, PALETTE_TO_RED, 0, 0, 16, 16, 50, 3), - M( 0x1243, PAL_NONE, 0x1289, PALETTE_TO_RED, 0, 0, 16, 16, 50, 3), - M( 0x1243, PAL_NONE, 0x1289, PALETTE_TO_RED, 0, 0, 16, 16, 50, 3), + M( 0x1243, PAL_NONE, 0x1289 | (1 << PALETTE_MODIFIER_COLOUR), PAL_NONE, 0, 0, 16, 16, 50, 3), + M( 0x1243, PAL_NONE, 0x1289 | (1 << PALETTE_MODIFIER_COLOUR), PAL_NONE, 0, 0, 16, 16, 50, 3), + M( 0x1243, PAL_NONE, 0x1289 | (1 << PALETTE_MODIFIER_COLOUR), PAL_NONE, 0, 0, 16, 16, 50, 3), M( 0x1244, PAL_NONE, 0x0, PAL_NONE, 0, 0, 16, 16, 50, 0), M( 0x1244, PAL_NONE, 0x0, PAL_NONE, 0, 0, 16, 16, 50, 0), M( 0x1244, PAL_NONE, 0x0, PAL_NONE, 0, 0, 16, 16, 50, 0),