From b6889d77f838daf035e0618b30318113bbd859ea Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 17 Jul 2015 18:22:01 -0700 Subject: [PATCH] GBA Input: Allow axes and buttons to be mapped to the same key --- CHANGES | 1 + src/gba/input.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index af39fd1f2..5e75a27a6 100644 --- a/CHANGES +++ b/CHANGES @@ -103,6 +103,7 @@ Misc: - GBA Video: Slightly optimize mode 0 mosaic rendering - VFS: Add sync method to force syncing with backing - GBA: Savedata is now synced shortly after data finishes being written + - GBA Input: Allow axes and buttons to be mapped to the same key 0.2.1: (2015-05-13) Bugfixes: diff --git a/src/gba/input.c b/src/gba/input.c index 734d7f4e4..1d9ccba74 100644 --- a/src/gba/input.c +++ b/src/gba/input.c @@ -421,8 +421,6 @@ int GBAInputClearAxis(const struct GBAInputMap* map, uint32_t type, int axis, in void GBAInputBindAxis(struct GBAInputMap* map, uint32_t type, int axis, const struct GBAAxis* description) { struct GBAInputMapImpl* impl = _guaranteeMap(map, type); struct GBAAxis* dup = malloc(sizeof(struct GBAAxis)); - GBAInputUnbindKey(map, type, description->lowDirection); - GBAInputUnbindKey(map, type, description->highDirection); *dup = *description; TableInsert(&impl->axes, axis, dup); }