mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(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)
release/1.5
frosch 2015-03-31 18:45:30 +00:00
parent f28a9dc34e
commit f73cafd37b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clear_cmd.cpp
View File

@ -112,7 +112,7 @@ static void DrawTile_Clear(TileInfo *ti)
break; break;
case CLEAR_ROCKS: 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; break;
case CLEAR_FIELDS: case CLEAR_FIELDS:

1
src/newgrf.h
View File

@ -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_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_AMBIENT_SOUND_CALLBACK = 4,
GMB_CATENARY_ON_3RD_TRACK = 5, // Unsupported. GMB_CATENARY_ON_3RD_TRACK = 5, // Unsupported.
GMB_SECOND_ROCKY_TILE_SET = 6,
}; };
enum GrfSpecFeature { enum GrfSpecFeature {