Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-05 21:54:11 +01:00
110 changed files with 3527 additions and 336 deletions

View File

@@ -414,7 +414,7 @@ static void AnimateTile_Town(TileIndex tile)
DeleteAnimatedTile(tile);
}
MarkTileDirtyByTile(tile);
MarkTileDirtyByTile(tile, ZOOM_LVL_DRAW_MAP);
}
/**
@@ -525,7 +525,7 @@ static void MakeSingleHouseBigger(TileIndex tile)
ChangePopulation(Town::GetByTile(tile), HouseSpec::Get(GetHouseType(tile))->population);
ResetHouseAge(tile);
}
MarkTileDirtyByTile(tile);
MarkTileDirtyByTile(tile, ZOOM_LVL_DRAW_MAP);
}
/**