Merge branch 'sf/issue#83'

stardot · May 18, 2019 · 42f6597 · 42f6597
2 parents 55cf904 + b9482c4
commit 42f6597
Show file tree

Hide file tree

Showing 7 changed files with 1,327 additions and 892 deletions.
diff --git a/roms/general/vdfs.rom b/roms/general/vdfs.rom
diff --git a/src/config.c b/src/config.c
@@ -120,7 +120,7 @@ void config_load(void)
         al_remove_config_key(bem_cfg, "", "tube6502speed");
     }
 
-    defaultwriteprot = get_config_int("disc", "defaultwriteprotect", 1);
+    defaultwriteprot = get_config_bool("disc", "defaultwriteprotect", 1);
 
     curmodel         = get_config_int(NULL, "model",         3);
     selecttube       = get_config_int(NULL, "tube",         -1);

diff --git a/src/disc.c b/src/disc.c
@@ -14,7 +14,7 @@ DRIVE drives[2];
 int curdrive = 0;
 
 ALLEGRO_PATH *discfns[2] = { NULL, NULL };
-int defaultwriteprot = 0;
+bool defaultwriteprot = false;
 int writeprot[NUM_DRIVES], fwriteprot[NUM_DRIVES];
 
 int fdc_time;

diff --git a/src/disc.h b/src/disc.h
@@ -48,7 +48,7 @@ extern int fdc_time;
 extern int motorspin;
 extern int motoron;
 
-extern int defaultwriteprot;
+extern bool defaultwriteprot;
 extern ALLEGRO_PATH *discfns[NUM_DRIVES];
 
 extern int writeprot[NUM_DRIVES], fwriteprot[NUM_DRIVES];