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

remove old setting

Browse Source
This commit is contained in:
FunkyFr3sh 2023-07-27 07:48:23 +02:00
parent f0586cb4cf
commit a9418fc02a
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/dd.h
View File

@ -140,7 +140,6 @@ typedef struct CNCDDRAW
BOOL wine; BOOL wine;
HCURSOR old_cursor; HCURSOR old_cursor;
int show_cursor_count; int show_cursor_count;
BOOL novidmem;
BOOL fpupreserve; BOOL fpupreserve;
BOOL allow_wmactivate; BOOL allow_wmactivate;
int d3d9_adapter; int d3d9_adapter;

6
src/config.c
View File

@ -40,7 +40,6 @@ void cfg_load()
g_ddraw->fixchilds = cfg_get_int("fixchilds", FIX_CHILDS_DETECT_PAINT); g_ddraw->fixchilds = cfg_get_int("fixchilds", FIX_CHILDS_DETECT_PAINT);
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->fixnotresponding = cfg_get_bool("fixnotresponding", 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);
@ -370,7 +369,6 @@ static void cfg_create_ini()
"accuratetimers=false\n" "accuratetimers=false\n"
"fixpitch=true\n" "fixpitch=true\n"
"fixwndprochook=false\n" "fixwndprochook=false\n"
"novidmem=false\n"
"fixnotresponding=false\n" "fixnotresponding=false\n"
"locktopleft=false\n" "locktopleft=false\n"
"lock_surfaces=false\n" "lock_surfaces=false\n"
@ -849,7 +847,6 @@ static void cfg_create_ini()
"fixmousehook=true\n" "fixmousehook=true\n"
"noactivateapp=true\n" "noactivateapp=true\n"
"releasealt=true\n" "releasealt=true\n"
"novidmem=true\n"
"\n" "\n"
"; Jagged Alliance 2: Wildfire\n" "; Jagged Alliance 2: Wildfire\n"
"[WF6]\n" "[WF6]\n"
@ -857,7 +854,6 @@ static void cfg_create_ini()
"fixmousehook=true\n" "fixmousehook=true\n"
"noactivateapp=true\n" "noactivateapp=true\n"
"releasealt=true\n" "releasealt=true\n"
"novidmem=true\n"
"\n" "\n"
"; Jagged Alliance 2 - UC mod\n" "; Jagged Alliance 2 - UC mod\n"
"[JA2_UC]\n" "[JA2_UC]\n"
@ -865,7 +861,6 @@ static void cfg_create_ini()
"fixmousehook=true\n" "fixmousehook=true\n"
"noactivateapp=true\n" "noactivateapp=true\n"
"releasealt=true\n" "releasealt=true\n"
"novidmem=true\n"
"\n" "\n"
"; Jagged Alliance 2 - Vengeance Reloaded mod\n" "; Jagged Alliance 2 - Vengeance Reloaded mod\n"
"[JA2_Vengeance]\n" "[JA2_Vengeance]\n"
@ -873,7 +868,6 @@ static void cfg_create_ini()
"fixmousehook=true\n" "fixmousehook=true\n"
"noactivateapp=true\n" "noactivateapp=true\n"
"releasealt=true\n" "releasealt=true\n"
"novidmem=true\n"
"\n" "\n"
"; Kings Quest 8\n" "; Kings Quest 8\n"
"[Mask]\n" "[Mask]\n"

10
src/ddsurface.c
View File

@ -689,11 +689,6 @@ HRESULT dds_GetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC lpDDSur
lpDDSurfaceDesc->ddsCaps.dwCaps = This->caps; lpDDSurfaceDesc->ddsCaps.dwCaps = This->caps;
lpDDSurfaceDesc->dwBackBufferCount = This->backbuffer_count; lpDDSurfaceDesc->dwBackBufferCount = This->backbuffer_count;
if (g_ddraw && !g_ddraw->novidmem)
{
lpDDSurfaceDesc->ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY;
}
if (This->bpp == 8) if (This->bpp == 8)
{ {
lpDDSurfaceDesc->ddpfPixelFormat.dwFlags |= DDPF_PALETTEINDEXED8; lpDDSurfaceDesc->ddpfPixelFormat.dwFlags |= DDPF_PALETTEINDEXED8;
@ -1353,6 +1348,11 @@ HRESULT dd_CreateSurface(
} }
else else
{ {
if (!(dst_surface->caps & DDSCAPS_SYSTEMMEMORY))
{
dst_surface->caps |= DDSCAPS_VIDEOMEMORY;
}
dst_surface->width = lpDDSurfaceDesc->dwWidth; dst_surface->width = lpDDSurfaceDesc->dwWidth;
dst_surface->height = lpDDSurfaceDesc->dwHeight; dst_surface->height = lpDDSurfaceDesc->dwHeight;
} }