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/table/settings.ini
+++ b/src/table/settings.ini
@@ -1269,6 +1269,15 @@ def      = false
 str      = STR_CONFIG_SETTING_IMPROVED_BREAKDOWNS
 patxname = ""improved_breakdowns.vehicle.improved_breakdowns""

+[SDT_BOOL]
+base     = GameSettings
+var      = vehicle.ship_collision_avoidance
+def      = true
+str      = STR_CONFIG_SETTING_SHIP_COLLISION_AVOIDANCE
+strhelp  = STR_CONFIG_SETTING_SHIP_COLLISION_AVOIDANCE_HELPTEXT
+patxname = ""ship_collision_avoidance.vehicle.ship_collision_avoidance""
+cat      = SC_BASIC
+
 ; station.join_stations
 [SDT_NULL]
 length   = 1