diff options
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/settings.c b/apps/settings.c index 2bae9ae1b1..09c90af066 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -952,7 +952,7 @@ const struct settings_list* find_setting(void* variable, int *id) | |||
952 | void talk_setting(void *global_settings_variable) | 952 | void talk_setting(void *global_settings_variable) |
953 | { | 953 | { |
954 | const struct settings_list *setting; | 954 | const struct settings_list *setting; |
955 | if (global_settings.talk_menu == 0) | 955 | if (!talk_menus_enabled()) |
956 | return; | 956 | return; |
957 | setting = find_setting(global_settings_variable, NULL); | 957 | setting = find_setting(global_settings_variable, NULL); |
958 | if (setting == NULL) | 958 | if (setting == NULL) |
@@ -1043,7 +1043,7 @@ bool set_bool_options(const char* string, bool* variable, | |||
1043 | 1043 | ||
1044 | static void talk_unit(int unit, int value, long (*get_talk_id)(int value)) | 1044 | static void talk_unit(int unit, int value, long (*get_talk_id)(int value)) |
1045 | { | 1045 | { |
1046 | if (global_settings.talk_menu) | 1046 | if (talk_menus_enabled()) |
1047 | { | 1047 | { |
1048 | if (get_talk_id) | 1048 | if (get_talk_id) |
1049 | { | 1049 | { |
@@ -1121,11 +1121,12 @@ static bool do_set_setting(const unsigned char* string, void *variable, | |||
1121 | gui_synclist_limit_scroll(&lists,true); | 1121 | gui_synclist_limit_scroll(&lists,true); |
1122 | gui_synclist_select_item(&lists, selected); | 1122 | gui_synclist_select_item(&lists, selected); |
1123 | 1123 | ||
1124 | if (global_settings.talk_menu) | 1124 | if (talk_menus_enabled()) |
1125 | { | 1125 | { |
1126 | if (cb_data->type == INT && !cb_data->options) | 1126 | if (cb_data->type == INT && !cb_data->options) |
1127 | talk_unit(cb_data->voice_unit, *(int*)variable, cb_data->get_talk_id); | 1127 | talk_unit(cb_data->voice_unit, *(int*)variable, cb_data->get_talk_id); |
1128 | else talk_id(cb_data->options[selected].voice_id, false); | 1128 | else |
1129 | talk_id(cb_data->options[selected].voice_id, false); | ||
1129 | } | 1130 | } |
1130 | 1131 | ||
1131 | gui_synclist_draw(&lists); | 1132 | gui_synclist_draw(&lists); |
@@ -1139,7 +1140,7 @@ static bool do_set_setting(const unsigned char* string, void *variable, | |||
1139 | if (gui_synclist_do_button(&lists,action, | 1140 | if (gui_synclist_do_button(&lists,action, |
1140 | allow_wrap?LIST_WRAP_UNLESS_HELD:LIST_WRAP_OFF)) | 1141 | allow_wrap?LIST_WRAP_UNLESS_HELD:LIST_WRAP_OFF)) |
1141 | { | 1142 | { |
1142 | if (global_settings.talk_menu) | 1143 | if (talk_menus_enabled()) |
1143 | { | 1144 | { |
1144 | int value; | 1145 | int value; |
1145 | if (cb_data->type == INT && !cb_data->options) | 1146 | if (cb_data->type == INT && !cb_data->options) |