From bd5bf2a40afd466245ded5630a66352ccbb524ce Mon Sep 17 00:00:00 2001 From: Braden Obrzut Date: Tue, 15 Jul 2014 21:26:26 -0400 Subject: [PATCH] - Expand environment variables for autoload paths. - Forgot to save the French translation file for the last commit, so a few more corrections there. --- src/d_main.cpp | 2 +- wadsrc/static/language.fr | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index 93e6368c17..29a12c9c29 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -1598,7 +1598,7 @@ void D_AddConfigWads (TArray &wadfiles, const char *section) { // D_AddWildFile resets GameConfig's position, so remember it GameConfig->GetPosition (pos); - D_AddWildFile (wadfiles, value); + D_AddWildFile (wadfiles, ExpandEnvVars(value)); // Reset GameConfig's position to get next wad GameConfig->SetPosition (pos); } diff --git a/wadsrc/static/language.fr b/wadsrc/static/language.fr index 10021fd828..4e146955de 100644 --- a/wadsrc/static/language.fr +++ b/wadsrc/static/language.fr @@ -991,8 +991,8 @@ HHUSTR_E5M9 = "L ECHEVAUX DE D'SPARIL"; // Keys -TXT_GOTBLUEKEY = "CLE BLEUE"; -TXT_GOTYELLOWKEY = "CLE JAUNE"; +TXT_GOTBLUEKEY = "CLÉ BLEUE"; +TXT_GOTYELLOWKEY = "CLÉ JAUNE"; TXT_GOTGREENKEY = "CLÉ VERTE"; // Artifacts