Commit Graph

10 Commits

Author SHA1 Message Date
Jonathan G Rennison
78838ee2a2 Add freight train load/unload mode: through load 2018-03-26 20:12:50 +01:00
Jonathan G Rennison
4b392b66db Fix DeleteVisibleTrain being called on virtual trains
Add assertion to check for this case
2017-12-31 14:29:15 +00:00
Jonathan G Rennison
df3c10c523 Merge branch 'infrastructure_sharing' into jgrpp
# Conflicts:
#	src/infrastructure.cpp
#	src/order_cmd.cpp
2017-02-22 20:58:39 +00:00
Jonathan G Rennison
f3b1059930 Fix order removal due to shared-infra company deletion.
Order totals were not updated correctly, implicit orders not handled
properly, etc.
Create generic function for vehicle order filtering.
Use for station deletion and infra sharing company deletion.
2017-02-22 20:58:24 +00:00
Jonathan G Rennison
de26cf78e5 Merge branch 'infrastructure_sharing' into jgrpp 2016-10-24 18:29:09 +01:00
Jonathan G Rennison
15dc498c79 Fix wrong calculation of infra sharing track deletion train repayment.
Head pointer was being used for vehicle value on iteration of
train vehicles.
2016-10-24 18:29:02 +01:00
Jonathan G Rennison
320233fc9b Fix VehiclePositionIsAllowed triggering assertions on virtual trains.
This fixes the bug where a bankruptcy/company reset when another
company owned a virtual train caused an assertion failure.
2016-03-10 00:15:52 +00:00
Jonathan G Rennison
910edffee0 Add scope info logging for HandleSharingCompanyDeletion. 2016-03-10 00:15:52 +00:00
Jonathan G Rennison
a4ad4130a6 Merge branch 'master' into infrastructure_sharing
Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp
2015-08-06 22:55:09 +01:00
patch-import
ee791055f9 Import infrastructure sharing patch
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
2015-08-06 22:24:28 +01:00