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

fix for carmageddon 2

Browse Source
This commit is contained in:
FunkyFr3sh 2018-11-02 02:21:16 +01:00
parent 7b55df3ed7
commit 8ba6185965
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inc/main.h
View File

@ -133,7 +133,12 @@ struct IDirectDrawImplVtbl
HRESULT(__stdcall *Initialize)(IDirectDrawImpl *, GUID *); HRESULT(__stdcall *Initialize)(IDirectDrawImpl *, GUID *);
HRESULT(__stdcall *RestoreDisplayMode)(IDirectDrawImpl *); HRESULT(__stdcall *RestoreDisplayMode)(IDirectDrawImpl *);
HRESULT(__stdcall *SetCooperativeLevel)(IDirectDrawImpl *, HWND, DWORD); HRESULT(__stdcall *SetCooperativeLevel)(IDirectDrawImpl *, HWND, DWORD);
HRESULT(__stdcall *SetDisplayMode)(IDirectDrawImpl *, DWORD, DWORD,DWORD); union
{
HRESULT(__stdcall *SetDisplayMode1)(IDirectDrawImpl *, DWORD, DWORD, DWORD);
HRESULT(__stdcall *SetDisplayMode2)(IDirectDrawImpl *, DWORD, DWORD, DWORD, DWORD, DWORD);
};
HRESULT(__stdcall *WaitForVerticalBlank)(IDirectDrawImpl *, DWORD, HANDLE); HRESULT(__stdcall *WaitForVerticalBlank)(IDirectDrawImpl *, DWORD, HANDLE);
}; };

9
src/main.c
View File

@ -19,6 +19,7 @@
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <d3d9.h> #include <d3d9.h>
#include <InitGuid.h>
#include "ddraw.h" #include "ddraw.h"
#include "main.h" #include "main.h"
#include "opengl.h" #include "opengl.h"
@ -623,6 +624,11 @@ HRESULT __stdcall ddraw_SetDisplayMode(IDirectDrawImpl *This, DWORD width, DWORD
return DD_OK; return DD_OK;
} }
HRESULT __stdcall ddraw_SetDisplayMode2(IDirectDrawImpl *This, DWORD width, DWORD height, DWORD bpp, DWORD refreshRate, DWORD flags)
{
return ddraw_SetDisplayMode(This, width, height, bpp);
}
// LastSetWindowPosTick = Workaround for a wine+gnome bug where each SetWindowPos call triggers a WA_INACTIVE message // LastSetWindowPosTick = Workaround for a wine+gnome bug where each SetWindowPos call triggers a WA_INACTIVE message
DWORD LastSetWindowPosTick; DWORD LastSetWindowPosTick;
@ -1174,6 +1180,9 @@ HRESULT __stdcall ddraw_QueryInterface(IDirectDrawImpl *This, REFIID riid, void
{ {
printf("DirectDraw::QueryInterface(This=%p, riid=%08X, obj=%p)\n", This, (unsigned int)riid, obj); printf("DirectDraw::QueryInterface(This=%p, riid=%08X, obj=%p)\n", This, (unsigned int)riid, obj);
if (riid && !IsEqualGUID(&IID_IDirectDraw, riid))
This->lpVtbl->SetDisplayMode2 = ddraw_SetDisplayMode2;
*obj = This; *obj = This;
return S_OK; return S_OK;

5
src/settings.c
View File

@ -228,6 +228,11 @@ static void CreateSettingsIni()
"[battlegrounds_x1]\n" "[battlegrounds_x1]\n"
"hidemouse=false\n" "hidemouse=false\n"
"\n" "\n"
"[Carma2_SW]\n"
"renderer=opengl\n"
"noactivateapp=true\n"
"maxgameticks=60\n"
"\n"
, fh); , fh);
fclose(fh); fclose(fh);