]> Shamusworld >> Repos - apple2/blobdiff - src/settings.cpp
Added support for the Apple High Speed SCSI card.
[apple2] / src / settings.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 37f8767..81b4d1d
@@ -7,7 +7,7 @@
 // JLH = James Hammons <jlhamm@acm.org>
 //
 // WHO  WHEN        WHAT
-// ---  ----------  ------------------------------------------------------------
+// ---  ----------  -----------------------------------------------------------
 // JLH  01/04/2006  Added changelog ;-)
 //
 
@@ -18,6 +18,7 @@
 #include <SDL2/SDL.h>
 #include "sdlemu_config.h"
 #include "log.h"
+#include "video.h"
 
 using namespace std;
 
@@ -53,6 +54,9 @@ void LoadSettings(void)
        settings.renderType = sdlemu_getval_int("renderType", 0);
        settings.autoStateSaving = sdlemu_getval_bool("autoSaveState", true);
 
+       settings.winX = sdlemu_getval_int("windowX", 250);
+       settings.winY = sdlemu_getval_int("windowY", 100);
+
        // Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, *
        settings.p1KeyBindings[0] = sdlemu_getval_int("p1k_up", SDL_SCANCODE_UP);
        settings.p1KeyBindings[1] = sdlemu_getval_int("p1k_down", SDL_SCANCODE_DOWN);
@@ -98,10 +102,9 @@ void LoadSettings(void)
        settings.p2KeyBindings[19] = sdlemu_getval_int("p2k_pound", SDL_SCANCODE_KP_DIVIDE);
        settings.p2KeyBindings[20] = sdlemu_getval_int("p2k_star", SDL_SCANCODE_KP_MULTIPLY);
 
-       strcpy(settings.BIOSPath, sdlemu_getval_string("BIOSROM", "./ROMs/apple2.rom"));
+       strcpy(settings.BIOSPath, sdlemu_getval_string("BIOSROM", "./ROMs/apple2e-enhanced.rom"));
        strcpy(settings.disksPath, sdlemu_getval_string("disks", "./disks"));
-       strcpy(settings.diskImagePath1, sdlemu_getval_string("floppyImage1", "./disks/bt1_boot.dsk"));
-       strcpy(settings.diskImagePath2, sdlemu_getval_string("floppyImage2", "./disks/bt1_char.dsk"));
+       strcpy(settings.hdPath, sdlemu_getval_string("harddrive", "./disks/Pitch-Dark-20180731.2mg"));
        strcpy(settings.autoStatePath, sdlemu_getval_string("autoStateFilename", "./apple2auto.state"));
        CheckForTrailingSlash(settings.disksPath);
 }
@@ -112,6 +115,7 @@ void LoadSettings(void)
 //
 void SaveSettings(void)
 {
+       SDL_GetWindowPosition(sdlWindow, &settings.winX, &settings.winY);
 }