mirror of
https://github.com/FunkyFr3sh/cnc-ddraw.git
synced 2025-03-15 06:04:49 +01:00
temp changes
This commit is contained in:
parent
b9409ab7ae
commit
7b70ec2297
@ -126,7 +126,7 @@ typedef struct IDirectDrawImpl
|
||||
BOOL hidecursor;
|
||||
BOOL accurateTimers;
|
||||
BOOL bnetActive;
|
||||
BOOL bnetD3d9Fullscreen;
|
||||
BOOL bnetWasFullscreen;
|
||||
SpeedLimiter ticksLimiter;
|
||||
SpeedLimiter flipLimiter;
|
||||
SpeedLimiter fpsLimiter;
|
||||
|
@ -944,7 +944,7 @@ HRESULT __stdcall ddraw_SetDisplayMode2(IDirectDrawImpl *This, DWORD width, DWOR
|
||||
|
||||
void ToggleFullscreen()
|
||||
{
|
||||
if (ddraw->bnetActive && ddraw->renderer == render_d3d9_main)
|
||||
if (ddraw->bnetActive)
|
||||
return;
|
||||
|
||||
if (ddraw->windowed)
|
||||
|
12
src/mouse.c
12
src/mouse.c
@ -193,7 +193,7 @@ void mouse_lock()
|
||||
|
||||
if (ddraw->handlemouse)
|
||||
{
|
||||
//SetCapture(ddraw->hWnd);
|
||||
SetCapture(ddraw->hWnd);
|
||||
real_ClipCursor(&rc);
|
||||
while (real_ShowCursor(FALSE) > 0);
|
||||
}
|
||||
@ -258,7 +258,7 @@ void mouse_unlock()
|
||||
}
|
||||
|
||||
real_ClipCursor(NULL);
|
||||
//ReleaseCapture();
|
||||
ReleaseCapture();
|
||||
|
||||
real_SetCursorPos(
|
||||
rc.left + ddraw->render.viewport.x + (ddraw->cursor.x * ddraw->render.scaleW),
|
||||
@ -435,10 +435,10 @@ BOOL WINAPI fake_DestroyWindow(HWND hWnd)
|
||||
ddraw->bnetActive = FALSE;
|
||||
mouse_lock();
|
||||
|
||||
if (ddraw->windowed && ddraw->bnetD3d9Fullscreen && ddraw->renderer == render_d3d9_main)
|
||||
if (ddraw->windowed && ddraw->bnetWasFullscreen)
|
||||
{
|
||||
ToggleFullscreen();
|
||||
ddraw->bnetD3d9Fullscreen = FALSE;
|
||||
ddraw->bnetWasFullscreen = FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -454,10 +454,10 @@ HWND WINAPI fake_CreateWindowExA(
|
||||
{
|
||||
if (!ddraw->bnetActive)
|
||||
{
|
||||
if (!ddraw->windowed && !ddraw->bnetD3d9Fullscreen && ddraw->renderer == render_d3d9_main)
|
||||
if (!ddraw->windowed && !ddraw->bnetWasFullscreen)
|
||||
{
|
||||
ToggleFullscreen();
|
||||
ddraw->bnetD3d9Fullscreen = TRUE;
|
||||
ddraw->bnetWasFullscreen = TRUE;
|
||||
}
|
||||
|
||||
ddraw->bnetActive = TRUE;
|
||||
|
Loading…
x
Reference in New Issue
Block a user