mirror of
https://github.com/FunkyFr3sh/cnc-ddraw.git
synced 2025-03-15 06:04:49 +01:00
remove old setting
This commit is contained in:
parent
f0586cb4cf
commit
a9418fc02a
1
inc/dd.h
1
inc/dd.h
@ -140,7 +140,6 @@ typedef struct CNCDDRAW
|
||||
BOOL wine;
|
||||
HCURSOR old_cursor;
|
||||
int show_cursor_count;
|
||||
BOOL novidmem;
|
||||
BOOL fpupreserve;
|
||||
BOOL allow_wmactivate;
|
||||
int d3d9_adapter;
|
||||
|
@ -40,7 +40,6 @@ void cfg_load()
|
||||
g_ddraw->fixchilds = cfg_get_int("fixchilds", FIX_CHILDS_DETECT_PAINT);
|
||||
g_ddraw->fixwndprochook = cfg_get_bool("fixwndprochook", 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->locktopleft = cfg_get_bool("locktopleft", FALSE);
|
||||
g_ddraw->lock_surfaces = cfg_get_bool("lock_surfaces", FALSE);
|
||||
@ -370,7 +369,6 @@ static void cfg_create_ini()
|
||||
"accuratetimers=false\n"
|
||||
"fixpitch=true\n"
|
||||
"fixwndprochook=false\n"
|
||||
"novidmem=false\n"
|
||||
"fixnotresponding=false\n"
|
||||
"locktopleft=false\n"
|
||||
"lock_surfaces=false\n"
|
||||
@ -849,7 +847,6 @@ static void cfg_create_ini()
|
||||
"fixmousehook=true\n"
|
||||
"noactivateapp=true\n"
|
||||
"releasealt=true\n"
|
||||
"novidmem=true\n"
|
||||
"\n"
|
||||
"; Jagged Alliance 2: Wildfire\n"
|
||||
"[WF6]\n"
|
||||
@ -857,7 +854,6 @@ static void cfg_create_ini()
|
||||
"fixmousehook=true\n"
|
||||
"noactivateapp=true\n"
|
||||
"releasealt=true\n"
|
||||
"novidmem=true\n"
|
||||
"\n"
|
||||
"; Jagged Alliance 2 - UC mod\n"
|
||||
"[JA2_UC]\n"
|
||||
@ -865,7 +861,6 @@ static void cfg_create_ini()
|
||||
"fixmousehook=true\n"
|
||||
"noactivateapp=true\n"
|
||||
"releasealt=true\n"
|
||||
"novidmem=true\n"
|
||||
"\n"
|
||||
"; Jagged Alliance 2 - Vengeance Reloaded mod\n"
|
||||
"[JA2_Vengeance]\n"
|
||||
@ -873,7 +868,6 @@ static void cfg_create_ini()
|
||||
"fixmousehook=true\n"
|
||||
"noactivateapp=true\n"
|
||||
"releasealt=true\n"
|
||||
"novidmem=true\n"
|
||||
"\n"
|
||||
"; Kings Quest 8\n"
|
||||
"[Mask]\n"
|
||||
|
@ -689,11 +689,6 @@ HRESULT dds_GetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC lpDDSur
|
||||
lpDDSurfaceDesc->ddsCaps.dwCaps = This->caps;
|
||||
lpDDSurfaceDesc->dwBackBufferCount = This->backbuffer_count;
|
||||
|
||||
if (g_ddraw && !g_ddraw->novidmem)
|
||||
{
|
||||
lpDDSurfaceDesc->ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY;
|
||||
}
|
||||
|
||||
if (This->bpp == 8)
|
||||
{
|
||||
lpDDSurfaceDesc->ddpfPixelFormat.dwFlags |= DDPF_PALETTEINDEXED8;
|
||||
@ -1353,6 +1348,11 @@ HRESULT dd_CreateSurface(
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!(dst_surface->caps & DDSCAPS_SYSTEMMEMORY))
|
||||
{
|
||||
dst_surface->caps |= DDSCAPS_VIDEOMEMORY;
|
||||
}
|
||||
|
||||
dst_surface->width = lpDDSurfaceDesc->dwWidth;
|
||||
dst_surface->height = lpDDSurfaceDesc->dwHeight;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user