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/clear_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2016-10-12 22:26:23 +01:00
parent 6bac8bbd48 8c1bf8f16d
commit 13694c30cf
3 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/clear_cmd.cpp
View File

@@ -67,7 +67,7 @@ SpriteID GetSpriteIDForHillyLand(const Slope slope, const uint rough_index)
void DrawHillyLandTile(const TileInfo *ti)
{
DrawGroundSprite(GetSpriteIDForHillyLand(ti->tileh, GB(ti->x ^ ti->y, 4, 3)), PAL_NONE);
DrawGroundSprite(GetSpriteIDForHillyLand(ti->tileh, GB(TileHash(ti->x, ti->y), 4, 3)), PAL_NONE);
}
SpriteID GetSpriteIDForRocks(const Slope slope, const uint tile_hash)