From d1f82ed56729b2dc44991e8822d1a959db60529d Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sun, 11 Feb 2018 15:14:04 -0600 Subject: [PATCH 1/2] Increase q3_ui .arena filename list buffer size to 4096 bytes Allow listing about 273 .arena filenames for loading in q3_ui instead of only about 136 that fit in a 2048 byte buffer (average 15 bytes per file name). The buffer for filename list runs out of space long before the buffer for arena file content does. There is no warning for file list out of space but there is a warning for arena file content. This was requested by a user with many maps. --- code/q3_ui/ui_gameinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/q3_ui/ui_gameinfo.c b/code/q3_ui/ui_gameinfo.c index 38cd3ea9e8..6d857de04d 100644 --- a/code/q3_ui/ui_gameinfo.c +++ b/code/q3_ui/ui_gameinfo.c @@ -169,7 +169,7 @@ static void UI_LoadArenas( void ) { int numdirs; vmCvar_t arenasFile; char filename[128]; - char dirlist[2048]; + char dirlist[4096]; char* dirptr; int i, n; int dirlen; @@ -188,7 +188,7 @@ static void UI_LoadArenas( void ) { } // get all arenas from .arena files - numdirs = trap_FS_GetFileList("scripts", ".arena", dirlist, 2048 ); + numdirs = trap_FS_GetFileList("scripts", ".arena", dirlist, 4096 ); dirptr = dirlist; for (i = 0; i < numdirs; i++, dirptr += dirlen+1) { dirlen = strlen(dirptr); From 00c348093807a71c4865a127ca9f3b592c979bd1 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sun, 18 Feb 2018 13:05:27 -0600 Subject: [PATCH 2/2] OpenGL2: Fix crash when BSP has deluxe maps and vertex lit surfaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by Mickaël Thomas (mickael9). --- code/renderergl2/tr_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/renderergl2/tr_shader.c b/code/renderergl2/tr_shader.c index b1c88f9b25..fe2cf0c3db 100644 --- a/code/renderergl2/tr_shader.c +++ b/code/renderergl2/tr_shader.c @@ -2232,7 +2232,7 @@ static void CollapseStagesToLightall(shaderStage_t *diffuse, defs |= LIGHTDEF_USE_LIGHT_VERTEX; } - if (r_deluxeMapping->integer && tr.worldDeluxeMapping && lightmap) + if (r_deluxeMapping->integer && tr.worldDeluxeMapping && lightmap && shader.lightmapIndex >= 0) { //ri.Printf(PRINT_ALL, ", deluxemap"); diffuse->bundle[TB_DELUXEMAP] = lightmap->bundle[0];