From d9061488f4f6f1bdb5bdcb37a68d613662bf737f Mon Sep 17 00:00:00 2001 From: Brendan Robert Date: Mon, 8 Mar 2021 16:32:51 -0600 Subject: [PATCH] Updated to the new video model locations that do not conflict with Apple //gs IO locations from commit 00d0f7391c89c0e2b831ea3ea338ae6f0f38cf07 --- .../src/main/java/jace/lawless/LawlessHacks.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessHacks.java b/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessHacks.java index 75ab1752..2c9a3f26 100644 --- a/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessHacks.java +++ b/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessHacks.java @@ -11,8 +11,8 @@ import jace.lawless.LawlessVideo.RenderEngine; public class LawlessHacks extends Cheats { // Modes specified by the game engine - int MODE_SOFTSWITCH = 0x0C020; - + int MODE_SOFTSWITCH_MIN = 0x0C049; + int MODE_SOFTSWITCH_MAX = 0x0C04F; public LawlessHacks(Computer computer) { super(computer); @@ -27,11 +27,12 @@ public class LawlessHacks extends Cheats { public void registerListeners() { // Observe graphics changes addCheat(RAMEvent.TYPE.ANY, false, (e) -> { - if ((e.getAddress() & 0x0FFF0) == MODE_SOFTSWITCH) { + int addr = e.getAddress() ; + if (addr >= MODE_SOFTSWITCH_MIN && e.getAddress() <= MODE_SOFTSWITCH_MAX) { System.out.println("Trapped " + e.getType().toString() + " to $"+Integer.toHexString(e.getAddress())); - setEngineByOrdinal(e.getAddress() - MODE_SOFTSWITCH); + setEngineByOrdinal(e.getAddress() - MODE_SOFTSWITCH_MIN); } - }, MODE_SOFTSWITCH, MODE_SOFTSWITCH | 0x0f); + }, MODE_SOFTSWITCH_MIN, MODE_SOFTSWITCH_MAX); } @Override @@ -51,4 +52,4 @@ public class LawlessHacks extends Cheats { video.setEngine(RenderEngine.UNKNOWN); } } -} \ No newline at end of file +}