| ... | ... |
@@ -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 |
reqdraw = 1; |
| ... | ... |
@@ -599,12 +600,12 @@ main(int argc, char **argv) |
| 599 | 600 |
|
| 600 | 601 |
/* set default zoom */ |
| 601 | 602 |
SDL_GetCurrentDisplayMode(0, &DM); |
| 602 |
- set_zoom(clamp(DM.w / 1280, 1, 3)); |
|
| 603 |
+ set_zoom(DM.w / 1280); |
|
| 603 | 604 |
/* get default zoom from flags */ |
| 604 | 605 |
for(i = 1; i < argc - 1; i++) {
|
| 605 | 606 |
if(strcmp(argv[i], "-s") == 0) {
|
| 606 | 607 |
if((i + 1) < argc - 1) |
| 607 |
- set_zoom(clamp(atoi(argv[++i]), 1, 3)); |
|
| 608 |
+ set_zoom(atoi(argv[++i])); |
|
| 608 | 609 |
else |
| 609 | 610 |
return error("Opt", "-s No scale provided.");
|
| 610 | 611 |
} |