uxn

commit 92e44e43147e693b2737f030df5503c56a09665d
parent ecc1d7c416dc21429b8b261fc70d9afad329e661
Author: neauoire <aliceffekt@gmail.com>
Date:   Wed, 29 Sep 2021 18:05:08 -0700

Merge branch 'main' of git.sr.ht:~rabbits/uxn into ppu-slow

Diffstat:
M
src/uxnemu.c
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/uxnemu.c b/src/uxnemu.c
@@ -141,7 +141,8 @@ set_window_size(SDL_Window *window, int w, int h)
 static void
 set_zoom(Uint8 scale)
 {
-	if(scale == zoom || !gWindow)
+	zoom = clamp(scale, 1, 3);
+	if(!gWindow)
 		return;
 	set_window_size(gWindow, (ppu.width + PAD * 2) * zoom, (ppu.height + PAD * 2) * zoom);
 	ppu.reqdraw = 1;
@@ -595,12 +596,12 @@ main(int argc, char **argv)
 
 	/* set default zoom */
 	SDL_GetCurrentDisplayMode(0, &DM);
-	set_zoom(clamp(DM.w / 1280, 1, 3));
+	set_zoom(DM.w / 1280);
 	/* get default zoom from flags */
 	for(i = 1; i < argc - 1; i++) {
 		if(strcmp(argv[i], "-s") == 0) {
 			if((i + 1) < argc - 1)
-				set_zoom(clamp(atoi(argv[++i]), 1, 3));
+				set_zoom(atoi(argv[++i]));
 			else
 				return error("Opt", "-s No scale provided.");
 		}