dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/ground_vehicle.cpp
#	src/viewport.cpp
This commit is contained in:
Jonathan G Rennison
2018-10-29 18:33:15 +00:00
parent c00d049057 50efaa2372
commit 3a640af71d
20 changed files with 243 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/table/build_industry.h
View File

@@ -293,6 +293,19 @@ static const IndustryTileTable _tile_table_oil_rig_0[] = {
MK(-2, -4, 255),
MK(-3, -4, 255),
MK(2, 0, 255),
MK(2, -1, 255),
MK(1, -1, 255),
MK(0, -1, 255),
MK(-1, -1, 255),
MK(-1, 0, 255),
MK(-1, 1, 255),
MK(-1, 2, 255),
MK(-1, 3, 255),
MK(0, 3, 255),
MK(1, 3, 255),
MK(2, 3, 255),
MK(2, 2, 255),
MK(2, 1, 255),
MKEND
};