Mercurial > repos > blastem

changeset 954:cbc5b39e5518

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement "Resume" button in pause menu
author Michael Pavone <pavone@retrodev.com>
date Tue, 12 Apr 2016 22:50:31 -0700
parents 08346262990b
children 229c23b3ab73
files menu.c menu.s68
diffstat 2 files changed, 17 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }
--- 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