lucent/cocco-ddraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

always run bnet in windowed mode

Browse source
This commit is contained in:
FunkyFr3sh 2019-08-19 17:02:36 +02:00
parent 45b71311b8
commit 1198cb0e93
3 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main.c
View file

@ -700,6 +700,8 @@ HRESULT __stdcall ddraw_SetDisplayMode(IDirectDrawImpl *This, DWORD width, DWORD
ddraw->cursor.x = width / 2;
ddraw->cursor.y = height / 2;
BOOL border = This->border;
if(This->fullscreen)
{
This->render.width = This->mode.dmPelsWidth;
@ -707,7 +709,7 @@ HRESULT __stdcall ddraw_SetDisplayMode(IDirectDrawImpl *This, DWORD width, DWORD
if (This->windowed) //windowed-fullscreen aka borderless
{
This->border = FALSE;
border = FALSE;
WindowRect.left = -32000;
WindowRect.top = -32000;
@ -885,7 +887,7 @@ HRESULT __stdcall ddraw_SetDisplayMode(IDirectDrawImpl *This, DWORD width, DWORD
MSG msg; // workaround for "Not Responding" window problem in cnc games
PeekMessage(&msg, ddraw->hWnd, 0, 0, PM_NOREMOVE);
if (!This->border)
if (!border)
{
real_SetWindowLongA(This->hWnd, GWL_STYLE, GetWindowLong(This->hWnd, GWL_STYLE) & ~(WS_CAPTION | WS_THICKFRAME | WS_MINIMIZE | WS_MAXIMIZE | WS_SYSMENU));
}
@ -1129,12 +1131,20 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (!ddraw->windowed)
ddraw->bnetWasFullscreen = FALSE;
if (!ddraw->bnetActive && ddraw->bnetWasFullscreen)
if (!ddraw->bnetActive)
{
int ws = WindowState;
ToggleFullscreen();
WindowState = ws;
ddraw->bnetWasFullscreen = FALSE;
if (ddraw->bnetWasFullscreen)
{
int ws = WindowState;
ToggleFullscreen();
WindowState = ws;
ddraw->bnetWasFullscreen = FALSE;
}
else if (ddraw->bnetWasUpscaled)
{
SetWindowRect(0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
ddraw->bnetWasUpscaled = FALSE;
}
}
return 0;