diff options
Diffstat (limited to 'callbacks.c')
| -rw-r--r-- | callbacks.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/callbacks.c b/callbacks.c index 4523a68..6b62ea6 100644 --- a/callbacks.c +++ b/callbacks.c @@ -53,25 +53,25 @@ static void key_callback(GLFWwindow *window, int key, int scancode, int action, if(action == GLFW_PRESS) { switch(key) { - case GLFW_KEY_X: nes_state->input[0] |= (1 << 0); break; // A - case GLFW_KEY_Z: nes_state->input[0] |= (1 << 1); break; // B - case GLFW_KEY_SPACE: nes_state->input[0] |= (1 << 2); break; // Select - case GLFW_KEY_ENTER: nes_state->input[0] |= (1 << 3); break; // Start - case GLFW_KEY_UP: nes_state->input[0] |= (1 << 4); break; - case GLFW_KEY_DOWN: nes_state->input[0] |= (1 << 5); break; - case GLFW_KEY_LEFT: nes_state->input[0] |= (1 << 6); break; - case GLFW_KEY_RIGHT: nes_state->input[0] |= (1 << 7); break; + case GLFW_KEY_X: nes_state->ppu.input[0] |= (1 << 0); break; // A + case GLFW_KEY_Z: nes_state->ppu.input[0] |= (1 << 1); break; // B + case GLFW_KEY_SPACE: nes_state->ppu.input[0] |= (1 << 2); break; // Select + case GLFW_KEY_ENTER: nes_state->ppu.input[0] |= (1 << 3); break; // Start + case GLFW_KEY_UP: nes_state->ppu.input[0] |= (1 << 4); break; + case GLFW_KEY_DOWN: nes_state->ppu.input[0] |= (1 << 5); break; + case GLFW_KEY_LEFT: nes_state->ppu.input[0] |= (1 << 6); break; + case GLFW_KEY_RIGHT: nes_state->ppu.input[0] |= (1 << 7); break; } } else if(action == GLFW_RELEASE) { switch(key) { - case GLFW_KEY_X: nes_state->input[0] &= ~(1 << 0); break; - case GLFW_KEY_Z: nes_state->input[0] &= ~(1 << 1); break; - case GLFW_KEY_SPACE: nes_state->input[0] &= ~(1 << 2); break; - case GLFW_KEY_ENTER: nes_state->input[0] &= ~(1 << 3); break; - case GLFW_KEY_UP: nes_state->input[0] &= ~(1 << 4); break; - case GLFW_KEY_DOWN: nes_state->input[0] &= ~(1 << 5); break; - case GLFW_KEY_LEFT: nes_state->input[0] &= ~(1 << 6); break; - case GLFW_KEY_RIGHT: nes_state->input[0] &= ~(1 << 7); break; + case GLFW_KEY_X: nes_state->ppu.input[0] &= ~(1 << 0); break; + case GLFW_KEY_Z: nes_state->ppu.input[0] &= ~(1 << 1); break; + case GLFW_KEY_SPACE: nes_state->ppu.input[0] &= ~(1 << 2); break; + case GLFW_KEY_ENTER: nes_state->ppu.input[0] &= ~(1 << 3); break; + case GLFW_KEY_UP: nes_state->ppu.input[0] &= ~(1 << 4); break; + case GLFW_KEY_DOWN: nes_state->ppu.input[0] &= ~(1 << 5); break; + case GLFW_KEY_LEFT: nes_state->ppu.input[0] &= ~(1 << 6); break; + case GLFW_KEY_RIGHT: nes_state->ppu.input[0] &= ~(1 << 7); break; } } |