6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-29 12:50:28 +00:00
Code Issues Projects Releases Wiki Activity

Switches the joysticks around.

Browse Source 
Thereby finally allowing me to control mode games.
This commit is contained in:
Thomas Harte 2019-11-18 20:02:27 -05:00
parent 1202b0a65f
commit 82c984afa4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Machines/Atari/ST/IntelligentKeyboard.cpp
View File

@ -72,9 +72,12 @@ void IntelligentKeyboard::run_for(HalfCycles duration) {
key_queue_.clear(); key_queue_.clear();
} }
// Check for joystick changes. // Check for joystick changes; slight complexity here: the joystick that the emulated
// machine advertises as joystick 1 is mapped to the Atari ST's joystick 2, so as to
// maintain both the normal emulation expections that the first joystick is the primary
// one and the Atari ST's convention that the main joystick is in port 2.
for(size_t c = 0; c < 2; ++c) { for(size_t c = 0; c < 2; ++c) {
const auto joystick = static_cast<Joystick *>(joysticks_[c].get()); const auto joystick = static_cast<Joystick *>(joysticks_[c ^ 1].get());
if(joystick->has_event()) { if(joystick->has_event()) {
output_bytes({ output_bytes({
uint8_t(0xfe | c), uint8_t(0xfe | c),
@ -386,8 +389,8 @@ void IntelligentKeyboard::interrogate_joysticks() {
output_bytes({ output_bytes({
0xfd, 0xfd,
joystick1->get_state(), joystick2->get_state(),
joystick2->get_state() joystick1->get_state()
}); });
} }