From 5db961656a6e2f1e87d921a17215a1ea05b08aed Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Sat, 15 May 2021 02:58:07 +0200 Subject: [PATCH] rename upscale hack related stuff --- inc/dd.h | 2 +- inc/utils.h | 2 +- src/render_d3d9.c | 16 ++++++++-------- src/render_gdi.c | 6 +++--- src/render_ogl.c | 6 +++--- src/utils.c | 2 +- src/winapi_hooks.c | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/inc/dd.h b/inc/dd.h index 349f5eb..270889b 100644 --- a/inc/dd.h +++ b/inc/dd.h @@ -94,7 +94,7 @@ typedef struct cnc_ddraw BOOL isredalert; BOOL iscnc1; BOOL iskkndx; - LONG incutscene; + LONG upscale_hack_active; DWORD (WINAPI *renderer)(void); BOOL fullscreen; BOOL maintas; diff --git a/inc/utils.h b/inc/utils.h index b5f9d95..1f8c54a 100644 --- a/inc/utils.h +++ b/inc/utils.h @@ -13,6 +13,6 @@ void util_toggle_fullscreen(); BOOL util_unadjust_window_rect(LPRECT prc, DWORD dwStyle, BOOL fMenu, DWORD dwExStyle); void util_set_window_rect(int x, int y, int width, int height, UINT flags); BOOL CALLBACK util_enum_child_proc(HWND hwnd, LPARAM lParam); -BOOL util_detect_cutscene(); +BOOL util_detect_low_res_screen(); #endif diff --git a/src/render_d3d9.c b/src/render_d3d9.c index a287400..6bdf8b8 100644 --- a/src/render_d3d9.c +++ b/src/render_d3d9.c @@ -13,7 +13,7 @@ static BOOL d3d9_create_resouces(); static BOOL d3d9_set_states(); -static BOOL d3d9_update_vertices(BOOL in_cutscene, BOOL stretch); +static BOOL d3d9_update_vertices(BOOL upscale_hack, BOOL stretch); static d3d9_renderer g_d3d9; @@ -195,7 +195,7 @@ static BOOL d3d9_create_resouces() &g_d3d9.vertex_buf, NULL)); - err = err || !d3d9_update_vertices(InterlockedExchangeAdd(&g_ddraw->incutscene, 0), TRUE); + err = err || !d3d9_update_vertices(InterlockedExchangeAdd(&g_ddraw->upscale_hack_active, 0), TRUE); int i; for (i = 0; i < D3D9_TEXTURE_COUNT; i++) @@ -276,7 +276,7 @@ static BOOL d3d9_set_states() return !err; } -static BOOL d3d9_update_vertices(BOOL in_cutscene, BOOL stretch) +static BOOL d3d9_update_vertices(BOOL upscale_hack, BOOL stretch) { float vp_x = stretch ? (float)g_ddraw->render.viewport.x : 0.0f; float vp_y = stretch ? (float)g_ddraw->render.viewport.y : 0.0f; @@ -284,8 +284,8 @@ static BOOL d3d9_update_vertices(BOOL in_cutscene, BOOL stretch) float vp_w = stretch ? (float)(g_ddraw->render.viewport.width + g_ddraw->render.viewport.x) : (float)g_ddraw->width; float vp_h = stretch ? (float)(g_ddraw->render.viewport.height + g_ddraw->render.viewport.y) : (float)g_ddraw->height; - float s_h = in_cutscene ? g_d3d9.scale_h * ((float)g_ddraw->upscale_hack_height / g_ddraw->height) : g_d3d9.scale_h; - float s_w = in_cutscene ? g_d3d9.scale_w * ((float)g_ddraw->upscale_hack_width / g_ddraw->width) : g_d3d9.scale_w; + float s_h = upscale_hack ? g_d3d9.scale_h * ((float)g_ddraw->upscale_hack_height / g_ddraw->height) : g_d3d9.scale_h; + float s_w = upscale_hack ? g_d3d9.scale_w * ((float)g_ddraw->upscale_hack_width / g_ddraw->width) : g_d3d9.scale_w; CUSTOMVERTEX vertices[] = { @@ -334,14 +334,14 @@ DWORD WINAPI d3d9_render_main(void) { if (g_ddraw->vhack) { - if (util_detect_cutscene()) + if (util_detect_low_res_screen()) { - if (!InterlockedExchange(&g_ddraw->incutscene, TRUE)) + if (!InterlockedExchange(&g_ddraw->upscale_hack_active, TRUE)) d3d9_update_vertices(TRUE, TRUE); } else { - if (InterlockedExchange(&g_ddraw->incutscene, FALSE)) + if (InterlockedExchange(&g_ddraw->upscale_hack_active, FALSE)) d3d9_update_vertices(FALSE, TRUE); } } diff --git a/src/render_gdi.c b/src/render_gdi.c index c750155..4d130a8 100644 --- a/src/render_gdi.c +++ b/src/render_gdi.c @@ -61,10 +61,10 @@ DWORD WINAPI gdi_render_main(void) } } - BOOL scale_cutscene = g_ddraw->vhack && util_detect_cutscene(); + BOOL upscale_hack = g_ddraw->vhack && util_detect_low_res_screen(); if (g_ddraw->vhack) - InterlockedExchange(&g_ddraw->incutscene, scale_cutscene); + InterlockedExchange(&g_ddraw->upscale_hack_active, upscale_hack); if (!g_ddraw->handlemouse) { @@ -77,7 +77,7 @@ DWORD WINAPI gdi_render_main(void) RECT rc = { 0, 0, g_ddraw->render.width, g_ddraw->render.height }; FillRect(g_ddraw->render.hdc, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH)); } - else if (scale_cutscene) + else if (upscale_hack) { StretchDIBits( g_ddraw->render.hdc, diff --git a/src/render_ogl.c b/src/render_ogl.c index 9498eb0..3b12980 100644 --- a/src/render_ogl.c +++ b/src/render_ogl.c @@ -565,17 +565,17 @@ static void ogl_render() { if (g_ddraw->vhack) { - if (util_detect_cutscene()) + if (util_detect_low_res_screen()) { g_ogl.scale_w *= (float)g_ddraw->upscale_hack_width / g_ddraw->width; g_ogl.scale_h *= (float)g_ddraw->upscale_hack_height / g_ddraw->height; - if (!InterlockedExchange(&g_ddraw->incutscene, TRUE)) + if (!InterlockedExchange(&g_ddraw->upscale_hack_active, TRUE)) scale_changed = TRUE; } else { - if (InterlockedExchange(&g_ddraw->incutscene, FALSE)) + if (InterlockedExchange(&g_ddraw->upscale_hack_active, FALSE)) scale_changed = TRUE; } } diff --git a/src/utils.c b/src/utils.c index 9db3451..5c978e0 100644 --- a/src/utils.c +++ b/src/utils.c @@ -335,7 +335,7 @@ static unsigned char util_get_pixel(int x, int y) return ((unsigned char*)dds_GetBuffer(g_ddraw->primary))[y * g_ddraw->primary->l_pitch + x * g_ddraw->primary->lx_pitch]; } -BOOL util_detect_cutscene() +BOOL util_detect_low_res_screen() { static int* in_movie = (int*)0x00665F58; static int* is_vqa_640 = (int*)0x0065D7BC; diff --git a/src/winapi_hooks.c b/src/winapi_hooks.c index 4aafb03..63e7246 100644 --- a/src/winapi_hooks.c +++ b/src/winapi_hooks.c @@ -65,7 +65,7 @@ BOOL WINAPI fake_GetCursorPos(LPPOINT lpPoint) g_ddraw->cursor.y = pt.y; } - if (g_ddraw->vhack && InterlockedExchangeAdd(&g_ddraw->incutscene, 0)) + if (g_ddraw->vhack && InterlockedExchangeAdd(&g_ddraw->upscale_hack_active, 0)) { diffx = 0; diffy = 0;