backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-24 17:49:52 +01:00
Code Issues Projects Releases Activity

Revert "always enable fixnotresponding patch"

Browse Source 
This reverts commit a80ffeb7aa350aea2ef45f3382bdefa1c2836a36.
This commit is contained in:
FunkyFr3sh 2023-01-17 04:46:24 +01:00
parent 3333539e34
commit 56488f9dac
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/dd.h
View File

@ -145,6 +145,7 @@ typedef struct CNCDDRAW
BOOL nonexclusive; BOOL nonexclusive;
int fixchilds; int fixchilds;
BOOL fixwndprochook; BOOL fixwndprochook;
BOOL fixnotresponding;
BOOL flipclear; BOOL flipclear;
BOOL locktopleft; BOOL locktopleft;
BOOL lock_surfaces; BOOL lock_surfaces;

3
src/config.c
View File

@ -40,6 +40,7 @@ void cfg_load()
g_ddraw->fixwndprochook = cfg_get_bool("fixwndprochook", FALSE); g_ddraw->fixwndprochook = cfg_get_bool("fixwndprochook", FALSE);
g_ddraw->flipclear = cfg_get_bool("flipclear", FALSE); g_ddraw->flipclear = cfg_get_bool("flipclear", FALSE);
g_ddraw->novidmem = cfg_get_bool("novidmem", FALSE); g_ddraw->novidmem = cfg_get_bool("novidmem", FALSE);
g_ddraw->fixnotresponding = cfg_get_bool("fixnotresponding", FALSE);
g_ddraw->locktopleft = cfg_get_bool("locktopleft", FALSE); g_ddraw->locktopleft = cfg_get_bool("locktopleft", FALSE);
g_ddraw->lock_surfaces = cfg_get_bool("lock_surfaces", FALSE); g_ddraw->lock_surfaces = cfg_get_bool("lock_surfaces", FALSE);
g_ddraw->releasealt = cfg_get_bool("releasealt", FALSE); g_ddraw->releasealt = cfg_get_bool("releasealt", FALSE);
@ -365,6 +366,7 @@ static void cfg_create_ini()
"fixpitch=true\n" "fixpitch=true\n"
"fixwndprochook=false\n" "fixwndprochook=false\n"
"novidmem=false\n" "novidmem=false\n"
"fixnotresponding=false\n"
"locktopleft=false\n" "locktopleft=false\n"
"lock_surfaces=false\n" "lock_surfaces=false\n"
"releasealt=false\n" "releasealt=false\n"
@ -735,6 +737,7 @@ static void cfg_create_ini()
"; Economic War\n" "; Economic War\n"
"[EcoW]\n" "[EcoW]\n"
"maxgameticks=60\n" "maxgameticks=60\n"
"fixnotresponding=true\n"
"\n" "\n"
"; Fallout\n" "; Fallout\n"
"[falloutw]\n" "[falloutw]\n"

8
src/dd.c
View File

@ -711,12 +711,8 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
if (g_ddraw->windowed) if (g_ddraw->windowed)
{ {
/* workaround for "Not Responding" window problem in cnc games */ MSG msg; /* workaround for "Not Responding" window problem in cnc games */
if (GetCurrentThreadId() == g_ddraw->gui_thread_id) PeekMessage(&msg, g_ddraw->hwnd, 0, 0, PM_NOREMOVE);
{
MSG msg;
PeekMessage(&msg, g_ddraw->hwnd, 0, 0, PM_NOREMOVE);
}
if (!border) if (!border)
{ {

5
src/ddsurface.c
View File

@ -940,10 +940,9 @@ HRESULT dds_Lock(
dbg_dump_dds_lock_flags(dwFlags); dbg_dump_dds_lock_flags(dwFlags);
/* workaround for "Not Responding" window problem */ if (g_ddraw && g_ddraw->fixnotresponding)
if (g_ddraw && g_ddraw->windowed && GetCurrentThreadId() == g_ddraw->gui_thread_id)
{ {
MSG msg; MSG msg; /* workaround for "Not Responding" window problem */
PeekMessage(&msg, g_ddraw->hwnd, 0, 0, PM_NOREMOVE); PeekMessage(&msg, g_ddraw->hwnd, 0, 0, PM_NOREMOVE);
} }