diff options
| author | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2022-09-27 17:03:06 +0200 |
|---|---|---|
| committer | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2022-11-01 16:26:16 +0100 |
| commit | 980858186149651df5543b6fc99a4f7db0cdd089 (patch) | |
| tree | d347200b0a562d84df505097651ad0642f207fdd /src/camera | |
| parent | 39f50e601d395bbd2d78d0147ac530b756da2fff (diff) | |
| download | jancity-980858186149651df5543b6fc99a4f7db0cdd089.tar.gz | |
WIP
Diffstat (limited to 'src/camera')
| -rw-r--r-- | src/camera/src/mouse.c | 3 | ||||
| -rw-r--r-- | src/camera/src/pad.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/camera/src/mouse.c b/src/camera/src/mouse.c index 22fc3ba..30fedb9 100644 --- a/src/camera/src/mouse.c +++ b/src/camera/src/mouse.c @@ -13,6 +13,9 @@ static void cursor_update(struct cursor *const c, const struct mouse *const m) c->x = m->x; c->y = m->y; + c->state = mouse_pressed(m, MOUSE_BUTTON_LEFT) || + mouse_pressed(m, MOUSE_BUTTON_RIGHT) ? + CURSOR_STATE_PRESSED: CURSOR_STATE_IDLE; } static void update_speed(struct camera *const cam, const struct mouse *const m) diff --git a/src/camera/src/pad.c b/src/camera/src/pad.c index 13cb43e..f3af527 100644 --- a/src/camera/src/pad.c +++ b/src/camera/src/pad.c @@ -36,8 +36,8 @@ static void cursor_update(struct camera *const cam, && (c->y != c->y_init || cam->y <= -cam->dim.h)) c->y += STEP; - c->state = input_pad_pressed(in, p, PAD_KEY_A) || - input_pad_pressed(in, p, PAD_KEY_B) ? + c->state = pad_pressed(p, PAD_KEY_A) || + pad_pressed(p, PAD_KEY_B) ? CURSOR_STATE_PRESSED: CURSOR_STATE_IDLE; } |