input: fix a couple bugs with halt-until-next-input

Bill Lord · Bill Lord · commit c6168861176a · 2018-01-20T23:23:07.000-06:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -46,19 +46,22 @@ int main(int argc, char* argv[]) {
                     for (int i = 0; i < NUMBER_OF_KEYS; i++) {
                         if (event.key.code == KEYMAP[i]) {
                             cpu.keyInput(i);
+                            break;
                         }
                     }
                 }
             }
         }
 
-        if (cpu.state.running) {
-            if (delayTimer.getElapsedTime().asSeconds() > TIMER_FREQUENCY) {
+        if (delayTimer.getElapsedTime().asSeconds() > TIMER_FREQUENCY) {
+            if (cpu.state.running) {
                 cpu.tickTimers();
-                display.draw(cpu.state.vram);
-                delayTimer.restart();
             }
+            display.draw(cpu.state.vram);
+            delayTimer.restart();
+        }
 
+        if (cpu.state.running) {
             if (cpuTimer.getElapsedTime().asSeconds() > CPU_FREQUENCY) {
                 try {
                     for (int i = 0; i < NUMBER_OF_KEYS; i++) {

Original file line number	Diff line number	Diff line change
`@@ -46,19 +46,22 @@ int main(int argc, char* argv[]) {`
`46`	`46`	`for (int i = 0; i < NUMBER_OF_KEYS; i++) {`
`47`	`47`	`if (event.key.code == KEYMAP[i]) {`
`48`	`48`	`cpu.keyInput(i);`
	`49`	`+ break;`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`	`}`
`52`	`53`	`}`
`53`	`54`	`}`
`54`	`55`
`55`		`- if (cpu.state.running) {`
`56`		`- if (delayTimer.getElapsedTime().asSeconds() > TIMER_FREQUENCY) {`
	`56`	`+ if (delayTimer.getElapsedTime().asSeconds() > TIMER_FREQUENCY) {`
	`57`	`+ if (cpu.state.running) {`
`57`	`58`	`cpu.tickTimers();`
`58`		`- display.draw(cpu.state.vram);`
`59`		`- delayTimer.restart();`
`60`	`59`	`}`
	`60`	`+ display.draw(cpu.state.vram);`
	`61`	`+ delayTimer.restart();`
	`62`	`+ }`
`61`	`63`
	`64`	`+ if (cpu.state.running) {`
`62`	`65`	`if (cpuTimer.getElapsedTime().asSeconds() > CPU_FREQUENCY) {`
`63`	`66`	`try {`
`64`	`67`	`for (int i = 0; i < NUMBER_OF_KEYS; i++) {`