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 LimitGameTicks changes since it's causing flickering in unpatched versions of cnc1 and ra1

Browse Source
This commit is contained in:
FunkyFr3sh 2018-11-28 13:28:07 +01:00
parent f051957ddb
commit 8e75c40cc3
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/main.h
View File

@ -36,7 +36,7 @@ extern RECT WindowRect;
extern BOOL ChildWindowExists; extern BOOL ChildWindowExists;
BOOL detect_cutscene(); BOOL detect_cutscene();
void LimitGameTicks(BOOL isBltOrFlip); void LimitGameTicks();
DWORD WINAPI render_main(void); DWORD WINAPI render_main(void);
DWORD WINAPI render_soft_main(void); DWORD WINAPI render_soft_main(void);
BOOL CALLBACK EnumChildProc(HWND hWnd, LPARAM lParam); BOOL CALLBACK EnumChildProc(HWND hWnd, LPARAM lParam);

12
src/main.c
View File

@ -158,26 +158,18 @@ BOOL detect_cutscene()
return FALSE; return FALSE;
} }
void LimitGameTicks(BOOL isBltOrFlip) void LimitGameTicks()
{ {
static DWORD nextGameTick; static DWORD nextGameTick;
static DWORD lastBltOrFlipTick;
if (!nextGameTick) if (!nextGameTick)
{ {
nextGameTick = timeGetTime(); nextGameTick = timeGetTime();
return; return;
} }
nextGameTick += ddraw->ticklength;
DWORD tickCount = timeGetTime(); DWORD tickCount = timeGetTime();
if (isBltOrFlip)
lastBltOrFlipTick = tickCount;
else if (lastBltOrFlipTick + (ddraw->ticklength * 2) >= tickCount)
return;
nextGameTick += ddraw->ticklength;
int sleepTime = nextGameTick - tickCount; int sleepTime = nextGameTick - tickCount;
if (sleepTime <= 0 || sleepTime > ddraw->ticklength) if (sleepTime <= 0 || sleepTime > ddraw->ticklength)
nextGameTick = tickCount; nextGameTick = tickCount;
else else

6
src/surface.c
View File

@ -445,7 +445,7 @@ HRESULT __stdcall ddraw_surface_Blt(IDirectDrawSurfaceImpl *This, LPRECT lpDestR
} }
if (ddraw->ticklength > 0) if (ddraw->ticklength > 0)
LimitGameTicks(TRUE); LimitGameTicks();
} }
return DD_OK; return DD_OK;
@ -688,7 +688,7 @@ HRESULT __stdcall ddraw_surface_Flip(IDirectDrawSurfaceImpl *This, LPDIRECTDRAWS
*/ */
if (ddraw->ticklength > 0) if (ddraw->ticklength > 0)
LimitGameTicks(TRUE); LimitGameTicks();
} }
return DD_OK; return DD_OK;
@ -955,8 +955,6 @@ HRESULT __stdcall ddraw_surface_Unlock(IDirectDrawSurfaceImpl *This, LPVOID lpRe
InterlockedExchange(&ddraw->render.surfaceUpdated, TRUE); InterlockedExchange(&ddraw->render.surfaceUpdated, TRUE);
ReleaseSemaphore(ddraw->render.sem, 1, NULL); ReleaseSemaphore(ddraw->render.sem, 1, NULL);
if (ddraw->ticklength > 0)
LimitGameTicks(FALSE);
} }
return DD_OK; return DD_OK;