Merge branch 'infrastructure_sharing-sx' into jgrpp

# Conflicts: # src/settings_type.h # src/table/settings.ini
2016-02-25 22:31:36 +00:00
parent 4722c81e88 1818a83e63
commit 7bc407e2f8
6 changed files with 20 additions and 0 deletions
--- a/src/settings_type.h
+++ b/src/settings_type.h
@@ -514,6 +514,7 @@ struct VehicleSettings {
 	bool   pay_for_repair;                   ///< pay for repairing vehicle
 	uint8  repair_cost;                      ///< cost of repairing vehicle
 	bool   ship_collision_avoidance;         ///< ships try to avoid colliding with each other
+	bool   no_train_crash_other_company;     ///< trains cannot crash with trains from other companies
 };

 /** Settings related to the economy. */