summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2015-03-20 19:27:15 +0000
committerfrosch <frosch@openttd.org>2015-03-20 19:27:15 +0000
commit4d310eafc51738b4fb64942dcfbde1bf1e087989 (patch)
treeb1bbac2ea5fd9da58f3ecee5f164a5224dee3c58 /src
parentedb57ab5df98353e8c6cdc931a2ec65631ba1b2b (diff)
downloadopenttd-4d310eafc51738b4fb64942dcfbde1bf1e087989.tar.xz
(svn r27200) -Feature/Fix [FS#6260]: [NewGRF] Add Misc. GRF Feature Flag 6 to enable the second rocky tile set.
Diffstat (limited to 'src')
-rw-r--r--src/clear_cmd.cpp2
-rw-r--r--src/newgrf.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp
index bfa5949bc..2e9589aee 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 a02b0021f..752873a60 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 {