diff --git a/src/render.c b/src/render.c index ffa7244..7a55c8f 100644 --- a/src/render.c +++ b/src/render.c @@ -123,21 +123,7 @@ DWORD WINAPI render_main(void) DWORD dst_width = ddraw->render.width; DWORD dst_height = ddraw->render.height; - if (ddraw->maintas) - { - dst_width = ddraw->render.width; - dst_height = ((float)ddraw->height / ddraw->width) * dst_width; - - if (dst_height > ddraw->render.height) - { - dst_width = ((float)dst_width / dst_height) * ddraw->render.height; - dst_height = ddraw->render.height; - } - - dst_top = ddraw->render.height / 2 - dst_height / 2; - dst_left = ddraw->render.width / 2 - dst_width / 2; - } - else if (ddraw->boxing) + if (ddraw->boxing) { dst_width = ddraw->width; dst_height = ddraw->height; @@ -156,6 +142,20 @@ DWORD WINAPI render_main(void) dst_top = ddraw->render.height / 2 - dst_height / 2; dst_left = ddraw->render.width / 2 - dst_width / 2; } + else if (ddraw->maintas) + { + dst_width = ddraw->render.width; + dst_height = ((float)ddraw->height / ddraw->width) * dst_width; + + if (dst_height > ddraw->render.height) + { + dst_width = ((float)dst_width / dst_height) * ddraw->render.height; + dst_height = ddraw->render.height; + } + + dst_top = ddraw->render.height / 2 - dst_height / 2; + dst_left = ddraw->render.width / 2 - dst_width / 2; + } glViewport(dst_left, dst_top, dst_width, dst_height); diff --git a/src/render_soft.c b/src/render_soft.c index 7d7665e..6e4c014 100644 --- a/src/render_soft.c +++ b/src/render_soft.c @@ -69,21 +69,7 @@ DWORD WINAPI render_soft_main(void) DWORD tick_end = 0; DWORD frame_len = 0; - if (ddraw->maintas) - { - dst_width = ddraw->render.width; - dst_height = ((float)ddraw->height / ddraw->width) * dst_width; - - if (dst_height > ddraw->render.height) - { - dst_width = ((float)dst_width / dst_height) * ddraw->render.height; - dst_height = ddraw->render.height; - } - - dst_top = ddraw->render.height / 2 - dst_height / 2; - dst_left = ddraw->render.width / 2 - dst_width / 2; - } - else if (ddraw->boxing) + if (ddraw->boxing) { dst_width = ddraw->width; dst_height = ddraw->height; @@ -102,6 +88,20 @@ DWORD WINAPI render_soft_main(void) dst_top = ddraw->render.height / 2 - dst_height / 2; dst_left = ddraw->render.width / 2 - dst_width / 2; } + else if (ddraw->maintas) + { + dst_width = ddraw->render.width; + dst_height = ((float)ddraw->height / ddraw->width) * dst_width; + + if (dst_height > ddraw->render.height) + { + dst_width = ((float)dst_width / dst_height) * ddraw->render.height; + dst_height = ddraw->render.height; + } + + dst_top = ddraw->render.height / 2 - dst_height / 2; + dst_left = ddraw->render.width / 2 - dst_width / 2; + } if(ddraw->render.maxfps < 0) {