Use requested_video_fn in evolver_menu_switch

LegalizeAdulthood · Oct 7, 2024 · 2607f84 · 2607f84
1 parent 2a4e106
commit 2607f84
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/libid/evolver_menu_switch.cpp b/libid/evolver_menu_switch.cpp
@@ -511,16 +511,8 @@ main_state evolver_menu_switch(int *kbdchar, bool *frommandel, bool *kbdmore, bo
         // fall through
 
     default:             // other (maybe valid Fn key
-        k = check_vidmode_key(0, *kbdchar);
-        if (k >= 0)
+        if (requested_video_fn(*kbdmore, *kbdchar))
         {
-            g_adapter = k;
-            if (g_video_table[g_adapter].colors != g_colors)
-            {
-                g_save_dac = 0;
-            }
-            g_calc_status = calc_status_value::PARAMS_CHANGED;
-            *kbdmore = false;
             return main_state::CONTINUE;
         }
         break;

diff --git a/libid/include/main_menu_switch.h b/libid/include/main_menu_switch.h
@@ -11,3 +11,4 @@ main_state get_history(int kbd_char);
 void color_cycle(int kbd_char);
 bool color_editing(bool &kbd_more);
 void restore_from_image(bool &from_mandel, int kbd_char, bool &stacked);
+bool requested_video_fn(bool &kbd_more, int kbd_char);
diff --git a/libid/main_menu_switch.cpp b/libid/main_menu_switch.cpp
@@ -646,7 +646,7 @@ static void start_evolution(bool &kbd_more, int kbd_char)
     g_calc_status = calc_status_value::PARAMS_CHANGED;
 }
 
-static bool requested_video_fn(bool &kbd_more, int kbd_char)
+bool requested_video_fn(bool &kbd_more, int kbd_char)
 {
     const int k = check_vidmode_key(0, kbd_char);
     if (k >= 0)