From cd78b97bceaf6ecbbab6f89631c15ed712878d4d Mon Sep 17 00:00:00 2001 From: XaviDCR92 Date: Mon, 9 Jul 2018 22:22:26 +0200 Subject: Calls to HumanPlayer and Camera button pressed event handlers are now automatically handled by two const arrays of member functions pointers. --- Exe/POCKET.ELF | Bin 28084 -> 28184 bytes Exe/POCKET.MAP | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'Exe') diff --git a/Exe/POCKET.ELF b/Exe/POCKET.ELF index 2366d55..85108c7 100755 Binary files a/Exe/POCKET.ELF and b/Exe/POCKET.ELF differ diff --git a/Exe/POCKET.MAP b/Exe/POCKET.MAP index 7054ed5..79825c3 100644 --- a/Exe/POCKET.MAP +++ b/Exe/POCKET.MAP @@ -1,7 +1,7 @@ Archive member included to satisfy reference by file (symbol) ../lib/libgamebuino.a(Buttons.o) - Obj/Game.o (_ZN7Buttons8releasedEh) + Obj/HumanPlayer.o (_ZN7Buttons7pressedEh) ../lib/libgamebuino.a(Display.o) Obj/System.o (_ZTV7Display) ../lib/libgamebuino.a(font3x5.o) @@ -181,6 +181,8 @@ Discarded input sections .text 0x0000000000000000 0x0 Obj/HumanPlayer.o .data 0x0000000000000000 0x0 Obj/HumanPlayer.o .bss 0x0000000000000000 0x0 Obj/HumanPlayer.o + .text._ZN11HumanPlayer13buttonHandlerEv + 0x0000000000000000 0x152 Obj/HumanPlayer.o .text._ZN11HumanPlayer16onLeftBtnPressedEv 0x0000000000000000 0x6 Obj/HumanPlayer.o .text 0x0000000000000000 0x0 Obj/Sprite.o @@ -200,6 +202,8 @@ Discarded input sections 0x0000000000000000 0x2c Obj/Camera.o .text._ZN6Camera16onLeftBtnPressedEv 0x0000000000000000 0x2 Obj/Camera.o + .text._ZN6Camera17onRightBtnPressedEv + 0x0000000000000000 0x2 Obj/Camera.o .text 0x0000000000000000 0x0 Obj/Unit.o .data 0x0000000000000000 0x0 Obj/Unit.o .bss 0x0000000000000000 0x0 Obj/Unit.o @@ -1323,6 +1327,7 @@ END GROUP 0x000000000000048e 0x16 Obj/System.o .text._ZN11HumanPlayer11drawHandlerEv 0x00000000000004a4 0x2 Obj/HumanPlayer.o + 0x00000000000004a4 _ZN11HumanPlayer13onABtnPressedEv 0x00000000000004a4 _ZN11HumanPlayer11drawHandlerEv .text._ZN11HumanPlayerC2EPKc 0x00000000000004a6 0x1e Obj/HumanPlayer.o -- cgit v1.2.3