Merge branch 'master' into jgrpp

This commit is contained in:
Jonathan G Rennison
2020-02-21 21:18:01 +00:00
26 changed files with 368 additions and 57 deletions

View File

@@ -716,7 +716,7 @@ static const OldChunks station_chunk[] = {
OCL_NULL( 4 ), ///< bus/lorry tile
OCL_SVAR( OC_TILE, Station, train_station.tile ),
OCL_SVAR( OC_TILE, Station, airport.tile ),
OCL_NULL( 4 ), ///< dock tile
OCL_NULL( 2 ), ///< dock tile
OCL_SVAR( OC_FILE_U8 | OC_VAR_U16, Station, train_station.w ),
OCL_NULL( 1 ), ///< sort-index, no longer in use