Browse code

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

neauoire authored on 30/09/2021 01:05:08
Showing 1 changed files
... ...
@@ -141,7 +141,8 @@ set_window_size(SDL_Window *window, int w, int h)
141 141
 static void
142 142
 set_zoom(Uint8 scale)
143 143
 {
144
-	if(scale == zoom || !gWindow)
144
+	zoom = clamp(scale, 1, 3);
145
+	if(!gWindow)
145 146
 		return;
146 147
 	set_window_size(gWindow, (ppu.width + PAD * 2) * zoom, (ppu.height + PAD * 2) * zoom);
147 148
 	ppu.reqdraw = 1;
... ...
@@ -595,12 +596,12 @@ main(int argc, char **argv)
595 596
 
596 597
 	/* set default zoom */
597 598
 	SDL_GetCurrentDisplayMode(0, &DM);
598
-	set_zoom(clamp(DM.w / 1280, 1, 3));
599
+	set_zoom(DM.w / 1280);
599 600
 	/* get default zoom from flags */
600 601
 	for(i = 1; i < argc - 1; i++) {
601 602
 		if(strcmp(argv[i], "-s") == 0) {
602 603
 			if((i + 1) < argc - 1)
603
-				set_zoom(clamp(atoi(argv[++i]), 1, 3));
604
+				set_zoom(atoi(argv[++i]));
604 605
 			else
605 606
 				return error("Opt", "-s No scale provided.");
606 607
 		}