From 67e1d9e1f1ed46524ca938ee55875bca0537b5ee Mon Sep 17 00:00:00 2001 From: Brendan Robert Date: Sat, 11 Apr 2015 22:50:20 -0500 Subject: [PATCH] Using more readable variations of switch read methods (no functional difference, and Airheart isn't crashing so it must be okay still!) --- src/main/java/jace/apple2e/RAM128k.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/jace/apple2e/RAM128k.java b/src/main/java/jace/apple2e/RAM128k.java index 82c70cb..aff0747 100644 --- a/src/main/java/jace/apple2e/RAM128k.java +++ b/src/main/java/jace/apple2e/RAM128k.java @@ -97,29 +97,29 @@ abstract public class RAM128k extends RAM { for (int i = 0x0c0; i < 0x0d0; i++) { activeWrite.set(i, null); } - if (SoftSwitches.LCRAM.getState()) { - if (!SoftSwitches.AUXZP.getState()) { + if (SoftSwitches.LCRAM.isOn()) { + if (SoftSwitches.AUXZP.isOff()) { activeRead.fillBanks(languageCard); - if (!SoftSwitches.LCBANK1.getState()) { + if (SoftSwitches.LCBANK1.isOff()) { activeRead.fillBanks(languageCard2); } } else { activeRead.fillBanks(getAuxLanguageCard()); - if (!SoftSwitches.LCBANK1.getState()) { + if (SoftSwitches.LCBANK1.isOff()) { activeRead.fillBanks(getAuxLanguageCard2()); } } } - if (SoftSwitches.LCWRITE.getState()) { - if (!SoftSwitches.AUXZP.getState()) { + if (SoftSwitches.LCWRITE.isOn()) { + if (SoftSwitches.AUXZP.isOff()) { activeWrite.fillBanks(languageCard); - if (!SoftSwitches.LCBANK1.getState()) { + if (SoftSwitches.LCBANK1.isOff()) { activeWrite.fillBanks(languageCard2); } } else { activeWrite.fillBanks(getAuxLanguageCard()); - if (!SoftSwitches.LCBANK1.getState()) { + if (SoftSwitches.LCBANK1.isOff()) { activeWrite.fillBanks(getAuxLanguageCard2()); } } @@ -181,7 +181,7 @@ abstract public class RAM128k extends RAM { // Enable C3 to point to internal ROM activeRead.setBanks(2, 1, 0x0C3, cPageRom); } - if (SoftSwitches.INTC8ROM.getState()) { + if (SoftSwitches.INTC8ROM.isOn()) { // Enable C8-CF to point to internal ROM activeRead.setBanks(7, 8, 0x0C8, cPageRom); }