Clean up remaining f_setup.interpreter_number mess from dumb and curses.

diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c
index 81eb470097d84ea5e0f8ee30fd2358a05835d57d..d1acaf18768c9e3b74ab604988f511b425ea853e 100644 (file)
--- a/src/curses/ux_init.c
+++ b/src/curses/ux_init.c
@@ -72,8 +72,6 @@ Error checking: 0 none, 1 first only (default), 2 all, 3 exit after any error.\n
 For more options and explanations, please read the manual page.\n"
 
 
-static bool interpreter_number_override = FALSE;
-
 /*
 char stripped_story_name[FILENAME_MAX+1];
 char semi_stripped_story_name[FILENAME_MAX+1];
@@ -275,9 +273,7 @@ void os_process_arguments (int argc, char *argv[])
                    break;
           case 'h': u_setup.screen_height = atoi(zoptarg); break;
          case 'i': f_setup.ignore_errors = 1; break;
-         case 'I': f_setup.interpreter_number = atoi(zoptarg);
-                   interpreter_number_override = TRUE;
-                   break;
+         case 'I': f_setup.interpreter_number = atoi(zoptarg); break;
          case 'l': f_setup.left_margin = atoi(zoptarg); break;
          case 'L': f_setup.restore_mode = 1;
                    f_setup.tmp_save_name = malloc(FILENAME_MAX * sizeof(char) + 1);
@@ -483,7 +479,7 @@ void os_init_screen (void)
 
     /* Use the ms-dos interpreter number for v6, because that's the
      * kind of graphics files we understand.  Otherwise, use DEC.  */
-    if (!interpreter_number_override || (f_setup.interpreter_number == 0))
+    if (f_setup.interpreter_number == INTERP_DEFAULT)
        h_interpreter_number = h_version == 6 ? INTERP_MSDOS : INTERP_DEC_20;
     else
        h_interpreter_number = f_setup.interpreter_number;

diff --git a/src/dumb/dumb_init.c b/src/dumb/dumb_init.c
index 1b98c56e2f324f0bfd639c808ca5e4546cf57b6d..fa99a757db45fdfc9e8195a6362ac45986f3bad9 100644 (file)
--- a/src/dumb/dumb_init.c
+++ b/src/dumb/dumb_init.c
@@ -187,14 +187,13 @@ void os_init_screen(void)
     h_screen_rows = user_screen_height;
     h_screen_cols = user_screen_width;
 
-    if (f_setup.interpreter_number > 0)
-       h_interpreter_number = f_setup.interpreter_number;
-    else {
-       /* Use ms-dos for v6 (because that's what most people have the
-       * graphics files for), but don't use it for v5 (or Beyond Zork
-       * will try to use funky characters).  */
+    /* Use the ms-dos interpreter number for v6, because that's the
+     * kind of graphics files we understand.  Otherwise, use DEC.  */
+    if (f_setup.interpreter_number == INTERP_DEFAULT)
        h_interpreter_number = h_version == 6 ? INTERP_MSDOS : INTERP_DEC_20;
-    }
+    else
+       h_interpreter_number = f_setup.interpreter_number;
+
     h_interpreter_version = 'F';
 
     dumb_init_input();