commit c59cb0f

Cleanup

 1@@ -408,13 +408,13 @@ console_close(void)
 2 #define MAR2(x) (x + 0x10)
 3 
 4 static Uint8 *screen_layers;
 5-static int screen_width, screen_height, screen_zoom;
 6+static int screen_zoom = 1;
 7+static int screen_width, screen_height;
 8 static int screen_x1, screen_y1, screen_x2, screen_y2, screen_reqsize, screen_reqdraw;
 9 static unsigned int screen_vector, *screen_pixels, screen_palette[16];
10 static int rX, rY, rA, rMX, rMY, rMA, rML, rDX, rDY;
11 
12-void emu_redraw(void);
13-void emu_resize(void);
14+void emu_redraw(void), emu_resize(void);
15 
16 static const Uint8 blending[16][2][4] = {
17 	{{0, 0, 1, 2}, {0, 0, 4, 8}},
18@@ -1072,10 +1072,7 @@ emu_redraw(void)
19 static void
20 emu_restart(unsigned int soft)
21 {
22-	console_close();
23-	screen_resize(WIDTH, HEIGHT);
24-	system_reboot(soft);
25-	uxn_eval(0x100);
26+	screen_resize(WIDTH, HEIGHT), system_reboot(soft), uxn_eval(0x100);
27 }
28 
29 static Uint8
30@@ -1150,8 +1147,8 @@ emu_event(void)
31 		switch(sym) {
32 		case XK_F1: screen_zoom = (screen_zoom % 3) + 1, screen_reqsize = screen_reqdraw = 1; break;
33 		case XK_F2: emu_deo(0xe, 0x1); break;
34-		case XK_F4: emu_restart(0); break;
35-		case XK_F5: emu_restart(1); break;
36+		case XK_F4: console_close(), emu_restart(0); break;
37+		case XK_F5: console_close(), emu_restart(1); break;
38 		}
39 		controller_down(get_button(sym));
40 		if(XLookupKeysym((XKeyPressedEvent *)&ev, 0) == XK_Tab)
41@@ -1246,7 +1243,6 @@ main(int argc, char **argv)
42 		return !fprintf(stdout, "usage: %s [-v] file.rom [args..]\n", argv[0]);
43 	else if(!system_boot(argv[i++], argc > 2))
44 		return !fprintf(stdout, "Could not load %s.\n", argv[i - 1]);
45-	screen_zoom = 1;
46 	screen_resize(WIDTH, HEIGHT);
47 	if(uxn_eval(0x100) && console_vector) {
48 		for(; i < argc; i++) {