From f73cafd37bbc405e2cd90a7d7d2831ef08b473b3 Mon Sep 17 00:00:00 2001 From: frosch Date: Tue, 31 Mar 2015 18:45:30 +0000 Subject: [PATCH] (svn r27214) [1.5] -Backport from trunk: - Fix: [NewGRF] Add Misc. GRF Feature Flag 6 to enable the second rocky tile set [FS#6260] (r27200) --- src/clear_cmd.cpp | 2 +- src/newgrf.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp index bfa5949bce..2e9589aee2 100644 --- a/src/clear_cmd.cpp +++ b/src/clear_cmd.cpp @@ -112,7 +112,7 @@ static void DrawTile_Clear(TileInfo *ti) break; case CLEAR_ROCKS: - DrawGroundSprite((TileHash(ti->x, ti->y) & 1 ? SPR_FLAT_ROCKY_LAND_2 : SPR_FLAT_ROCKY_LAND_1) + SlopeToSpriteOffset(ti->tileh), PAL_NONE); + DrawGroundSprite((HasGrfMiscBit(GMB_SECOND_ROCKY_TILE_SET) && (TileHash(ti->x, ti->y) & 1) ? SPR_FLAT_ROCKY_LAND_2 : SPR_FLAT_ROCKY_LAND_1) + SlopeToSpriteOffset(ti->tileh), PAL_NONE); break; case CLEAR_FIELDS: diff --git a/src/newgrf.h b/src/newgrf.h index a02b0021ff..752873a60e 100644 --- a/src/newgrf.h +++ b/src/newgrf.h @@ -61,6 +61,7 @@ enum GrfMiscBit { GMB_TRAIN_WIDTH_32_PIXELS = 3, ///< Use 32 pixels per train vehicle in depot gui and vehicle details. Never set in the global variable; @see GRFFile::traininfo_vehicle_width GMB_AMBIENT_SOUND_CALLBACK = 4, GMB_CATENARY_ON_3RD_TRACK = 5, // Unsupported. + GMB_SECOND_ROCKY_TILE_SET = 6, }; enum GrfSpecFeature {