Merge branch 'master' into jgrpp

# Conflicts: # src/vehicle_cmd.cpp
2019-01-31 02:04:02 +00:00
parent 98aa58a6b4 ba38a7ca65
commit 255b6adfc9
23 changed files with 256 additions and 160 deletions
--- a/src/tbtr_template_vehicle_func.cpp
+++ b/src/tbtr_template_vehicle_func.cpp
@@ -366,7 +366,7 @@ void CmdRefitTrainFromTemplate(Train *t, TemplateVehicle *tv, DoCommandFlag flag
 		// refit t as tv
 		uint32 cb = GetCmdRefitVeh(t);

-		DoCommand(t->tile, t->index, tv->cargo_type | tv->cargo_subtype << 8 | 1 << 16 | (1 << 5), flags, cb);
+		DoCommand(t->tile, t->index, tv->cargo_type | tv->cargo_subtype << 8 | (1 << 16) | (1 << 31), flags, cb);

 		// next
 		t = t->GetNextUnit();