Merge pull request #2241 from wookieejedi/fix-default_disabled_control-setting

z64555 · web-flow · commit b56c0d8bff76 · 2020-01-17T21:19:08.000-06:00
Fix overriding the default values in control table for `disabled`
diff --git a/code/controlconfig/controlsconfigcommon.cpp b/code/controlconfig/controlsconfigcommon.cpp
@@ -591,7 +591,6 @@ void control_config_common_load_overrides();
 void control_config_common_init()
 {
 	for (int i=0; i<CCFG_MAX; i++) {
-		Control_config[i].disabled = false;
 		Control_config[i].continuous_ongoing = false;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -591,7 +591,6 @@ void control_config_common_load_overrides();`
`591`	`591`	`void control_config_common_init()`
`592`	`592`	`{`
`593`	`593`	`for (int i=0; i<CCFG_MAX; i++) {`
`594`		`- Control_config[i].disabled = false;`
`595`	`594`	`Control_config[i].continuous_ongoing = false;`
`596`	`595`	`}`
`597`	`596`