dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cargo_type_order' into jgrpp

Browse Source 
# Conflicts:
#	src/order_base.h
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/vehicle_base.h
This commit is contained in:
Jonathan G Rennison
2016-09-08 00:12:48 +01:00
parent 153a0536df bc04b07f2b
commit 9ea018abc5
19 changed files with 1079 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/train_cmd.cpp
View File

@@ -1409,6 +1409,15 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
CheckCargoCapacity(dst_head);
}
if (src_head != NULL) {
src_head->last_loading_station = INVALID_STATION;
ClrBit(src_head->vehicle_flags, VF_LAST_LOAD_ST_SEP);
}
if (dst_head != NULL) {
dst_head->last_loading_station = INVALID_STATION;
ClrBit(dst_head->vehicle_flags, VF_LAST_LOAD_ST_SEP);
}
if (src_head != NULL) src_head->First()->MarkDirty();
if (dst_head != NULL) dst_head->First()->MarkDirty();