From aac74cf93a106ab9352e58175796fdf9a3c3f551 Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 6 Apr 2024 01:31:43 +0300 Subject: [PATCH 1/3] Don't call menu drawer in wipes on dedicated servers --- src/f_wipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/f_wipe.c b/src/f_wipe.c index 9909de0f0..da5b9dac1 100644 --- a/src/f_wipe.c +++ b/src/f_wipe.c @@ -383,7 +383,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu) I_OsPolling(); I_UpdateNoBlit(); - if (drawMenu) + if (rendermode != render_none && drawMenu) { #ifdef HAVE_THREADS I_lock_mutex(&m_menu_mutex); From af265d017d761d3b23a4ae7b5f913d623399c463 Mon Sep 17 00:00:00 2001 From: Indev Date: Thu, 11 Apr 2024 18:55:55 +0300 Subject: [PATCH 2/3] Fix potential negative array index in V_ThinStringWidth --- src/v_video.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/v_video.c b/src/v_video.c index c56711f20..7b9383f06 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -2944,6 +2944,9 @@ INT32 V_ThinStringWidth(const char *string, INT32 option) if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09 continue; + if (c < HU_FONTSTART) + continue; + if (!lowercase || !tny_font[c-HU_FONTSTART]) c = toupper(c); c -= HU_FONTSTART; From 7cd6a031cd46f57ae5feb9325db252381298901e Mon Sep 17 00:00:00 2001 From: Indev Date: Thu, 11 Apr 2024 19:12:14 +0300 Subject: [PATCH 3/3] Fix compilation warning regarding calloc and sizeof --- src/apng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apng.c b/src/apng.c index 694b3d1e8..711024ee3 100644 --- a/src/apng.c +++ b/src/apng.c @@ -71,7 +71,7 @@ apng_create_info_struct (png_structp pngp) { apng_infop ainfop; (void)pngp; - if (( ainfop = calloc(sizeof (apng_info),1) )) + if (( ainfop = calloc(1, sizeof (apng_info)) )) { apng_set_write_fn(pngp, ainfop, 0, 0, 0, 0, 0); apng_set_set_acTL_fn(pngp, ainfop, 0);