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/effectvehicle.cpp

@@ -625,7 +625,7 @@ EffectVehicle *CreateEffectVehicle(int x, int y, int z, EffectVehicleType type)
 	v->y_pos = y;
 	v->z_pos = z;
 	v->tile = 0;
-	v->UpdateDeltaXY(INVALID_DIR);
+	v->UpdateDeltaXY();
 	v->vehstatus = VS_UNCLICKABLE;
 
 	_effect_init_procs[type](v);
@@ -669,7 +669,7 @@ bool EffectVehicle::Tick()
 	return _effect_tick_procs[this->subtype](this);
 }
 
-void EffectVehicle::UpdateDeltaXY(Direction direction)
+void EffectVehicle::UpdateDeltaXY()
 {
 	this->x_offs        = 0;
 	this->y_offs        = 0;