diff --git a/linux.md b/linux.md index aad1bb32..8f04085a 100644 --- a/linux.md +++ b/linux.md @@ -81,7 +81,7 @@ This is based on Qt, currently tested with 5.10 * full speed when disk spins execute up to 5 ms real wall clock of emulator code (then returns to Qt) * (standard) audio is supported and there are a few configuration options to tune the latency (default very conservative 200ms) * plain mockingboard is supported as well (not speech, which hang the emulator) -* Open Apple and Closed Apple can be emulated using AltGr and Menu (unfortunately, Alt does not work well) +* Open Apple and Solid Apple can be emulated using AltGr and Menu (unfortunately, Alt does not work well) ## Build diff --git a/source/frontends/qapple/video.cpp b/source/frontends/qapple/video.cpp index d41b1c92..762cef96 100644 --- a/source/frontends/qapple/video.cpp +++ b/source/frontends/qapple/video.cpp @@ -108,7 +108,7 @@ void Video::keyReleaseEvent(QKeyEvent *event) Paddle::setButtonReleased(Paddle::ourOpenApple); return; case Qt::Key_Menu: - Paddle::setButtonReleased(Paddle::ourClosedApple); + Paddle::setButtonReleased(Paddle::ourSolidApple); return; } } @@ -128,7 +128,7 @@ void Video::keyPressEvent(QKeyEvent *event) Paddle::setButtonPressed(Paddle::ourOpenApple); return; case Qt::Key_Menu: - Paddle::setButtonPressed(Paddle::ourClosedApple); + Paddle::setButtonPressed(Paddle::ourSolidApple); return; } } diff --git a/source/frontends/sa2/main.cpp b/source/frontends/sa2/main.cpp index f852e8e0..1cac1730 100644 --- a/source/frontends/sa2/main.cpp +++ b/source/frontends/sa2/main.cpp @@ -334,7 +334,7 @@ void run_sdl(int argc, const char * argv []) } case SDL_SCANCODE_RALT: { - Paddle::setButtonPressed(Paddle::ourClosedApple); + Paddle::setButtonPressed(Paddle::ourSolidApple); break; } } @@ -353,7 +353,7 @@ void run_sdl(int argc, const char * argv []) } case SDL_SCANCODE_RALT: { - Paddle::setButtonReleased(Paddle::ourClosedApple); + Paddle::setButtonReleased(Paddle::ourSolidApple); break; } } diff --git a/source/linux/paddle.cpp b/source/linux/paddle.cpp index 252adde2..a9f3cbb4 100644 --- a/source/linux/paddle.cpp +++ b/source/linux/paddle.cpp @@ -74,7 +74,7 @@ BYTE __stdcall JoyReadButton(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG uExe case Paddle::ourOpenApple: pressed = paddle->getButton(0); break; - case Paddle::ourClosedApple: + case Paddle::ourSolidApple: pressed = paddle->getButton(1); break; case Paddle::ourThirdApple: diff --git a/source/linux/paddle.h b/source/linux/paddle.h index 23f589dd..94715adb 100644 --- a/source/linux/paddle.h +++ b/source/linux/paddle.h @@ -14,7 +14,7 @@ public: virtual int getAxis(int i) const; static constexpr int ourOpenApple = 0x61; - static constexpr int ourClosedApple = 0x62; + static constexpr int ourSolidApple = 0x62; static constexpr int ourThirdApple = 0x63; static void setButtonPressed(int i);