Merge branch 'ship_collision_avoidance-sx' into jgrpp

Conflicts: src/settings_type.h src/table/settings.ini
2016-01-19 22:38:32 +00:00
parent cbf1ece361 b00b1125be
commit 27bdf2a8b6
5 changed files with 50 additions and 0 deletions
--- a/src/settings_type.h
+++ b/src/settings_type.h
@@ -512,6 +512,7 @@ struct VehicleSettings {
 	bool   improved_breakdowns;              ///< different types, chances and severities of breakdowns
 	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
 };

 /** Settings related to the economy. */