diff --git a/README.md b/README.md index 354bf1b..43498ab 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,6 @@ This is an implementation of Bejeweled written for the Apple //. It is my HackF ![A2Bejwld Screenshot](/a2bejwld.png "A2Bejwld Screenshot") -[Download a disk image](https://github.com/jeremysrand/a2bejwld/releases/download/2.2/a2bejwld.dsk) +[Download a disk image](https://github.com/jeremysrand/a2bejwld/releases/download/2.3/a2bejwld.dsk) [Watch the YouTube video](https://youtu.be/yseAGBzREik) diff --git a/a2bejwld.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate b/a2bejwld.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate index ef4164f..1e69ad3 100644 Binary files a/a2bejwld.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate and b/a2bejwld.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/a2bejwld/mouseWrapper.c b/a2bejwld/mouseWrapper.c index b5d4558..b25ca30 100644 --- a/a2bejwld/mouseWrapper.c +++ b/a2bejwld/mouseWrapper.c @@ -32,19 +32,13 @@ bool initMouse(tMouseCallbacks *callbacks) if (!gMouseInstalled) { memcpy(&gMouseDrvCallbacks, &mouse_def_callbacks, sizeof(gMouseDrvCallbacks)); // This callback is here for the //c VBL which is only detectable - // through the mouse interrupt. By registering this as our "show" + // through the mouse interrupt. By registering this as our "draw" // function, we can ensure that we get called on our VBL interrupt // and can unblock our VBL wait function. - gMouseDrvCallbacks.show = vblIRQCallback; + gMouseDrvCallbacks.draw = vblIRQCallback; if (mouse_install(&gMouseDrvCallbacks, &a2_mouse_drv) == 0) { gMouseInstalled = true; - - // This is required to ensure that the show callback is called - // by the interrupt handler. This whole thing is a bit of a - // hack to get the default mouse interrupt handler to do what - // we want on the //c to detect the VBL but it works for now. - mouse_show(); } } diff --git a/a2bejwld/ui.c b/a2bejwld/ui.c index 3adfacd..1734a5e 100644 --- a/a2bejwld/ui.c +++ b/a2bejwld/ui.c @@ -26,7 +26,7 @@ // Defines #define SAVE_OPTIONS_FILE "A2BEJWLD.OPTS" -#define BASE_VERSION "v2.2" +#define BASE_VERSION "v2.3" #ifdef TOTAL_REPLAY_BUILD #define VERSION BASE_VERSION ".tr"