From a8f1ff85fd180956999f4c21c308c28ff9257c45 Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Tue, 14 Nov 2017 04:46:52 +0100 Subject: [PATCH] revert some cutscene changes since we don't need them anymore --- ddraw.dll | Bin 164352 -> 163840 bytes render.c | 4 ++-- render_soft.c | 11 ++++------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ddraw.dll b/ddraw.dll index e619d52f2f304f88cc2c84b949c64d9e6ebe6f4b..3fdf56b66379b41ecce014286eff30e8bda26a70 100644 GIT binary patch delta 4006 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 diff --git a/render.c b/render.c index 539bdc6..facda62 100644 --- a/render.c +++ b/render.c @@ -149,9 +149,9 @@ DWORD WINAPI render_main(void) SwapBuffers(ddraw->render.hDC); - if((ddraw->render.maxfps > 0)) + if(ddraw->render.maxfps > 0) { - tick_end = timeGetTime(); + tick_end = timeGetTime(); if(tick_end - tick_start < frame_len) { diff --git a/render_soft.c b/render_soft.c index 782615b..b45dbe8 100644 --- a/render_soft.c +++ b/render_soft.c @@ -127,12 +127,9 @@ DWORD WINAPI render_soft_main(void) { ddraw->primary->palette->data_rgb = &bmi->bmiColors[0]; } - // for 800 x 600: - //StretchDIBits(ddraw->render.hDC, 0, 0, ddraw->render.width, ddraw->render.height, 0, 200, CUTSCENE_WIDTH, CUTSCENE_HEIGHT, ddraw->primary->surface, bmi, DIB_RGB_COLORS, SRCCOPY); - - StretchDIBits(ddraw->render.hDC, 0, 0, ddraw->render.width, ddraw->render.height, 0, ddraw->height-400, CUTSCENE_WIDTH, CUTSCENE_HEIGHT, ddraw->primary->surface, bmi, DIB_RGB_COLORS, SRCCOPY); + + StretchDIBits(ddraw->render.hDC, 0, 0, ddraw->render.width, ddraw->render.height, 0, ddraw->height-400, CUTSCENE_WIDTH, CUTSCENE_HEIGHT, ddraw->primary->surface, bmi, DIB_RGB_COLORS, SRCCOPY); - if (ddraw->primary->palette && (ddraw->cursorclip.width != CUTSCENE_WIDTH || ddraw->cursorclip.height != CUTSCENE_HEIGHT)) { ddraw->cursorclip.width = CUTSCENE_WIDTH; @@ -151,13 +148,13 @@ DWORD WINAPI render_soft_main(void) LeaveCriticalSection(&ddraw->cs); - if((ddraw->render.maxfps > 0) && !detect_cutscene()) + if(ddraw->render.maxfps > 0) { tick_end = timeGetTime(); if(tick_end - tick_start < frame_len) { - Sleep( frame_len - (tick_end - tick_start) + 1); + Sleep( frame_len - (tick_end - tick_start)); } } }