Move collision settings back to compatibility panel

Author: dirkwhoffmann

GUI/Defaults.swift

@@ -1038,9 +1038,6 @@ extension Configuration {
         speedBoost = defaults.get(.AMIGA_SPEED_BOOST)
         vsync = defaults.get(.AMIGA_VSYNC) != 0
         runAhead = defaults.get(.AMIGA_RUN_AHEAD)
-        clxSprSpr = defaults.get(.DENISE_CLX_SPR_SPR) != 0
-        clxSprPlf = defaults.get(.DENISE_CLX_SPR_PLF) != 0
-        clxPlfPlf = defaults.get(.DENISE_CLX_PLF_PLF) != 0
         frameSkipping = defaults.get(.DENISE_FRAME_SKIPPING)
         ciaIdleSleep = defaults.get(.CIA_IDLE_SLEEP) != 0
         audioFastPath = defaults.get(.AUD_FASTPATH) != 0
@@ -1060,9 +1057,6 @@ extension Configuration {
         defaults.set(.AMIGA_VSYNC, vsync)
         defaults.set(.AMIGA_SPEED_BOOST, speedBoost)
         defaults.set(.AMIGA_RUN_AHEAD, runAhead)
-        defaults.set(.DENISE_CLX_SPR_SPR, clxSprSpr)
-        defaults.set(.DENISE_CLX_SPR_PLF, clxSprPlf)
-        defaults.set(.DENISE_CLX_PLF_PLF, clxPlfPlf)
         defaults.set(.DENISE_FRAME_SKIPPING, frameSkipping)
         defaults.set(.CIA_IDLE_SLEEP, [0,1], ciaIdleSleep)
         defaults.set(.AUD_FASTPATH, audioFastPath)
@@ -1096,6 +1090,9 @@ extension DefaultsProxy {
         remove(.DC_AUTO_DSKSYNC)
         remove(.DRIVE_MECHANICS, [ 0, 1, 2, 3])
         remove(.KBD_ACCURACY)
+        remove(.DENISE_CLX_PLF_PLF)
+        remove(.DENISE_CLX_SPR_PLF)
+        remove(.DENISE_CLX_SPR_SPR)
     }
 }
 
@@ -1116,6 +1113,9 @@ extension Configuration {
         defaults.set(.DC_AUTO_DSKSYNC, autoDskSync)
         defaults.set(.DRIVE_MECHANICS, [0, 1, 2, 3], driveMechanics)
         defaults.set(.KBD_ACCURACY, accurateKeyboard)
+        defaults.set(.DENISE_CLX_SPR_SPR, clxSprSpr)
+        defaults.set(.DENISE_CLX_SPR_PLF, clxSprPlf)
+        defaults.set(.DENISE_CLX_PLF_PLF, clxPlfPlf)
         defaults.save()
 
         amiga.resume()
@@ -1136,6 +1136,9 @@ extension Configuration {
         autoDskSync = defaults.get(.DC_AUTO_DSKSYNC) != 0
         driveMechanics = defaults.get(.DRIVE_MECHANICS, 0)
         accurateKeyboard = defaults.get(.KBD_ACCURACY) != 0
+        clxSprSpr = defaults.get(.DENISE_CLX_SPR_SPR) != 0
+        clxSprPlf = defaults.get(.DENISE_CLX_SPR_PLF) != 0
+        clxPlfPlf = defaults.get(.DENISE_CLX_PLF_PLF) != 0
 
         amiga.resume()
     }

GUI/Dialogs/Configuration/CompatibilityConf.swift

@@ -34,6 +34,11 @@ extension ConfigurationController {
         // Keyboard
         compAccurateKeyboard.state = config.accurateKeyboard ? .on : .off
 
+        // Collision detection
+        compClxSprSpr.state = config.clxSprSpr ? .on : .off
+        compClxSprPlf.state = config.clxSprPlf ? .on : .off
+        compClxPlfPlf.state = config.clxPlfPlf ? .on : .off
+
         // Buttons
         compPowerButton.isHidden = !bootable
     }
@@ -93,6 +98,25 @@ extension ConfigurationController {
         config.accurateKeyboard = sender.state == .on
     }
 
+    //
+    // Action methods (collision detection)
+    //
+
+    @IBAction func compClxSprSprAction(_ sender: NSButton!) {
+
+        config.clxSprSpr = sender.state == .on
+    }
+
+    @IBAction func compClxSprPlfAction(_ sender: NSButton!) {
+
+        config.clxSprPlf = sender.state == .on
+    }
+
+    @IBAction func compClxPlfPlfAction(_ sender: NSButton!) {
+
+        config.clxPlfPlf = sender.state == .on
+    }
+    
     @IBAction func compPresetAction(_ sender: NSPopUpButton!) {
 
         let defaults = EmulatorProxy.defaults!
@@ -111,7 +135,9 @@ extension ConfigurationController {
         case 1:
 
             // Accurate
-            break
+            defaults.set(.DENISE_CLX_SPR_PLF, true)
+            defaults.set(.DENISE_CLX_SPR_SPR, true)
+            defaults.set(.DENISE_CLX_PLF_PLF, true)
 
         case 2:
 

GUI/Dialogs/Configuration/ConfigurationController.swift

@@ -182,11 +182,6 @@ class ConfigurationController: DialogController {
     @IBOutlet weak var prfRunAhead: NSSlider!
     @IBOutlet weak var prfRunAheadInfo: NSTextField!
 
-    // Collision detection
-    @IBOutlet weak var prfClxSprSpr: NSButton!
-    @IBOutlet weak var prfClxSprPlf: NSButton!
-    @IBOutlet weak var prfClxPlfPlf: NSButton!
-
     // Boosters
     @IBOutlet weak var prfCiaIdleSleep: NSButton!
     @IBOutlet weak var prfFrameSkipping: NSButton!
@@ -229,6 +224,11 @@ class ConfigurationController: DialogController {
     // Keyboard
     @IBOutlet weak var compAccurateKeyboard: NSButton!
 
+    // Collision detection
+    @IBOutlet weak var compClxSprSpr: NSButton!
+    @IBOutlet weak var compClxSprPlf: NSButton!
+    @IBOutlet weak var compClxPlfPlf: NSButton!
+
     // Buttons
     @IBOutlet weak var compOKButton: NSButton!
     @IBOutlet weak var compPowerButton: NSButton!

GUI/Dialogs/Configuration/PerformanceConf.swift

@@ -28,11 +28,6 @@ extension ConfigurationController {
         prfRunAhead.integerValue = runAhead
         prfRunAheadInfo.stringValue = "\(runAhead) frame" + (runAhead == 1 ? "" : "s")
 
-        // Collision detection
-        prfClxSprSpr.state = config.clxSprSpr ? .on : .off
-        prfClxSprPlf.state = config.clxSprPlf ? .on : .off
-        prfClxPlfPlf.state = config.clxPlfPlf ? .on : .off
-
         // Boosters
         prfCiaIdleSleep.state = config.ciaIdleSleep ? .on : .off
         prfFrameSkipping.state = config.frameSkipping > 0 ? .on : .off
@@ -80,24 +75,6 @@ extension ConfigurationController {
         config.runAhead = sender.integerValue
     }
 
-    //
-    // Action methods (collision detection)
-    //
-
-    @IBAction func prfClxSprSprAction(_ sender: NSButton!) {
-
-        config.clxSprSpr = sender.state == .on
-    }
-
-    @IBAction func prfClxSprPlfAction(_ sender: NSButton!) {
-
-        config.clxSprPlf = sender.state == .on
-    }
-
-    @IBAction func prfClxPlfPlfAction(_ sender: NSButton!) {
-
-        config.clxPlfPlf = sender.state == .on
-    }
 
     //
     // Action methods (performance boosters)