Merge branch 'master' into jgrpp

# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse2.cpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/ground_vehicle.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/town_cmd.cpp
#	src/vehicle_base.h
#	src/viewport_gui.cppp

src/saveload/company_sl.cpp

@@ -261,7 +261,7 @@ static const SaveLoad _company_desc[] = {
 
 	    SLE_VAR(CompanyProperties, colour,                SLE_UINT8),
 	    SLE_VAR(CompanyProperties, money_fraction,        SLE_UINT8),
-	SLE_CONDVAR(CompanyProperties, avail_railtypes,       SLE_VAR_I32 | SLE_FILE_I8,   0, 57),
+	SLE_CONDNULL(1,  0,  57), ///< avail_railtypes
 	    SLE_VAR(CompanyProperties, block_preview,         SLE_UINT8),
 
 	SLE_CONDNULL(2,  0,  93), ///< cargo_types

src/saveload/oldloader_sl.cpp

@@ -944,7 +944,7 @@ static const OldChunks _company_chunk[] = {
 
 	OCL_SVAR(  OC_UINT8, Company, block_preview ),
 	OCL_CNULL( OC_TTD, 1 ),           // Old AI
-	OCL_SVAR( OC_TTD | OC_UINT8, Company, avail_railtypes ),
+	OCL_CNULL( OC_TTD, 1 ), // avail_railtypes
 	OCL_SVAR(   OC_TILE, Company, location_of_HQ ),
 	OCL_SVAR( OC_TTD | OC_UINT8, Company, share_owners[0] ),
 	OCL_SVAR( OC_TTD | OC_UINT8, Company, share_owners[1] ),

src/saveload/town_sl.cpp

@@ -315,7 +315,7 @@ static void Load_TOWN()
 		SlObject(&t->cargo_accepted, GetTileMatrixDesc());
 		if (t->cargo_accepted.area.w != 0) {
 			uint arr_len = t->cargo_accepted.area.w / AcceptanceMatrix::GRID * t->cargo_accepted.area.h / AcceptanceMatrix::GRID;
-			t->cargo_accepted.data = MallocT<uint32>(arr_len);
+			t->cargo_accepted.data = MallocT<CargoTypes>(arr_len);
 			SlArray(t->cargo_accepted.data, arr_len, SLE_UINT32);
 
 			/* Rebuild total cargo acceptance. */

src/saveload/vehicle_sl.cpp

@@ -469,7 +469,7 @@ void AfterLoadVehicles(bool part_of_load)
 			default: break;
 		}
 
-		v->UpdateDeltaXY(v->direction);
+		v->UpdateDeltaXY();
 		v->coord.left = INVALID_COORD;
 		v->UpdatePosition();
 		v->UpdateViewport(false);