# HG changeset patch # User Michael Pavone # Date 1460526631 25200 # Node ID cbc5b39e5518b52caba9d05c55d8d6a9f71eef80 # Parent 08346262990b2b6c1282129a20287f431a3d9801 Implement "Resume" button in pause menu diff -r 08346262990b -r cbc5b39e5518 menu.c --- a/menu.c Tue Apr 12 21:38:24 2016 -0700 +++ b/menu.c Tue Apr 12 22:50:31 2016 -0700 @@ -191,8 +191,17 @@ m68k->should_return = 1; break; case 3: { - m68k->should_return = 1; - gen->should_exit = 1; + switch (dst) + { + case 1: + m68k->should_return = 1; + gen->should_exit = 1; + break; + case 2: + m68k->should_return = 1; + break; + } + break; } } @@ -204,6 +213,9 @@ menu->latch = value; menu->state = 1; } + if (m68k->should_return) { + m68k->target_cycle = m68k->current_cycle; + } return context; } diff -r 08346262990b -r cbc5b39e5518 menu.s68 --- a/menu.s68 Tue Apr 12 21:38:24 2016 -0700 +++ b/menu.s68 Tue Apr 12 22:50:31 2016 -0700 @@ -926,12 +926,12 @@ bra .wait exit: - move.w #1, menu_port+12 + move.l #1, menu_port+12 bra exit resume: - ;TODO: Implement me - bra resume + move.l #2, menu_port+12 + bra show_pause_menu save_state: ;TODO: Implement me