From 31627ef68b41f98ca48dcb652387440b92d84a79 Mon Sep 17 00:00:00 2001 From: earth-metal <38820385+earth-metal@users.noreply.github.com> Date: Thu, 1 Nov 2018 08:54:37 -0400 Subject: [PATCH 1/2] Fix case-insensitive file loading. Allow usage of capitalization in directory names above the YQ2 working dir when loading non-PAK/PK3 assets with capitalized "name" criteria. --- src/common/filesystem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/filesystem.c b/src/common/filesystem.c index ab94994f..a743c5d3 100644 --- a/src/common/filesystem.c +++ b/src/common/filesystem.c @@ -367,7 +367,7 @@ FS_FCloseFile(fileHandle_t f) int FS_FOpenFile(const char *name, fileHandle_t *f, qboolean gamedir_only) { - char path[MAX_OSPATH]; + char path[MAX_OSPATH], lwrName[MAX_OSPATH]; fsHandle_t *handle; fsPack_t *pack; fsSearchPath_t *search; @@ -463,7 +463,9 @@ FS_FOpenFile(const char *name, fileHandle_t *f, qboolean gamedir_only) if (!handle->file) { - Q_strlwr(path); + Com_sprintf(lwrName, sizeof(lwrName), "%s", handle->name); + Q_strlwr(lwrName); + Com_sprintf(path, sizeof(path), "%s/%s", search->path, lwrName); handle->file = Q_fopen(path, "rb"); } From feeba61721ec280da003b9dae4bf5057f8f20b03 Mon Sep 17 00:00:00 2001 From: earth-metal <38820385+earth-metal@users.noreply.github.com> Date: Thu, 1 Nov 2018 08:58:18 -0400 Subject: [PATCH 2/2] Fix typo preventing display of Rogue "dmflag" options. --- src/client/menu/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/menu/menu.c b/src/client/menu/menu.c index e49a3675..9e1319e8 100644 --- a/src/client/menu/menu.c +++ b/src/client/menu/menu.c @@ -3397,7 +3397,7 @@ DMOptions_MenuInit(void) Menu_AddItem(&s_dmoptions_menu, &s_quad_drop_box); Menu_AddItem(&s_dmoptions_menu, &s_friendlyfire_box); - if (M_IsGame("rogueg")) + if (M_IsGame("rogue")) { Menu_AddItem(&s_dmoptions_menu, &s_no_mines_box); Menu_AddItem(&s_dmoptions_menu, &s_no_nukes_box);