mirror of
https://github.com/FunkyFr3sh/cnc-ddraw.git
synced 2025-03-15 06:04:49 +01:00
Merge branch 'master' of https://github.com/FunkyFr3sh/cnc-ddraw
This commit is contained in:
commit
f3cafda373
4
src/dd.c
4
src/dd.c
@ -802,12 +802,12 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
|
||||
{
|
||||
g_ddraw->render.viewport.width = g_ddraw->render.width;
|
||||
g_ddraw->render.viewport.height =
|
||||
(int)(((float)g_ddraw->height / g_ddraw->width) * g_ddraw->render.viewport.width);
|
||||
(int)(((double)g_ddraw->height / g_ddraw->width) * g_ddraw->render.viewport.width);
|
||||
|
||||
if (g_ddraw->render.viewport.height > g_ddraw->render.height)
|
||||
{
|
||||
g_ddraw->render.viewport.width =
|
||||
(int)(((float)g_ddraw->render.viewport.width / g_ddraw->render.viewport.height) * g_ddraw->render.height);
|
||||
(int)(((double)g_ddraw->render.viewport.width / g_ddraw->render.viewport.height) * g_ddraw->render.height);
|
||||
|
||||
g_ddraw->render.viewport.height = g_ddraw->render.height;
|
||||
}
|
||||
|
@ -381,11 +381,11 @@ void util_toggle_maximize()
|
||||
dst_rc.top = 0;
|
||||
dst_rc.left = 0;
|
||||
dst_rc.right = w;
|
||||
dst_rc.bottom = (LONG)(((float)g_ddraw->height / g_ddraw->width) * w);
|
||||
dst_rc.bottom = (LONG)(((double)g_ddraw->height / g_ddraw->width) * w);
|
||||
|
||||
if (dst_rc.bottom > h)
|
||||
{
|
||||
dst_rc.right = (LONG)(((float)dst_rc.right / dst_rc.bottom) * h);
|
||||
dst_rc.right = (LONG)(((double)dst_rc.right / dst_rc.bottom) * h);
|
||||
dst_rc.bottom = h;
|
||||
}
|
||||
|
||||
|
@ -314,8 +314,8 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
|
||||
real_GetWindowLongA(hWnd, GWL_EXSTYLE)) &&
|
||||
SetRect(&clientrc, 0, 0, clientrc.right - clientrc.left, clientrc.bottom - clientrc.top))
|
||||
{
|
||||
float scaleH = (float)g_ddraw->height / g_ddraw->width;
|
||||
float scaleW = (float)g_ddraw->width / g_ddraw->height;
|
||||
double scaleH = (double)g_ddraw->height / g_ddraw->width;
|
||||
double scaleW = (double)g_ddraw->width / g_ddraw->height;
|
||||
|
||||
switch (wParam)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user