diff options
| author | gameblabla | 2020-10-16 03:17:52 +0000 |
|---|---|---|
| committer | GitHub | 2020-10-16 03:17:52 +0000 |
| commit | 9ea18f315c385ec85cb28d44659b45589cfc9ac0 (patch) | |
| tree | 3661b6ec35f5900070acebc38fd975fb5f9cf84b /shell/input/sdl | |
| parent | 1a51fa791356b52a88e8ae0e6941034b23cd354f (diff) | |
| parent | 94b1765da3dd2b5121650e99e194020fb3c5b4b6 (diff) | |
| download | snesemu-9ea18f315c385ec85cb28d44659b45589cfc9ac0.tar.gz snesemu-9ea18f315c385ec85cb28d44659b45589cfc9ac0.tar.bz2 snesemu-9ea18f315c385ec85cb28d44659b45589cfc9ac0.zip | |
Merge pull request #1 from m45t3r/master
I am merging this because it has the new color opts
Diffstat (limited to 'shell/input/sdl')
| -rw-r--r-- | shell/input/sdl/input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shell/input/sdl/input.c b/shell/input/sdl/input.c index d47b889..b26af1f 100644 --- a/shell/input/sdl/input.c +++ b/shell/input/sdl/input.c @@ -50,9 +50,9 @@ uint32_t S9xReadJoypad(int32_t port) int32_t i; uint32_t joypad = 0; - + keystate = SDL_GetKeyState(NULL); - + SDL_PollEvent(&event); CASE(option.config_buttons[0][10], SNES_START_MASK); @@ -67,8 +67,8 @@ uint32_t S9xReadJoypad(int32_t port) CASE(option.config_buttons[0][1], SNES_RIGHT_MASK); CASE(option.config_buttons[0][2], SNES_DOWN_MASK); CASE(option.config_buttons[0][3], SNES_LEFT_MASK); - - if (keystate[SDLK_END]) emulator_state = 1; + + if (keystate[option.config_buttons[0][12]]) emulator_state = 1; return joypad; } |