[iortcw] 421/497: All: Fix handling of language.cfg files (if present)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit a461a79fbec886e90fa1688ecead90f7d8febf5b
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sat Nov 7 09:38:02 2015 -0500

    All: Fix handling of language.cfg files (if present)
---
 MP/code/qcommon/common.c | 5 +++++
 SP/code/qcommon/common.c | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/MP/code/qcommon/common.c b/MP/code/qcommon/common.c
index fecaac2..1da05a1 100644
--- a/MP/code/qcommon/common.c
+++ b/MP/code/qcommon/common.c
@@ -2358,6 +2358,11 @@ For controlling environment variables
 void Com_ExecuteCfg(void)
 {
 	Cbuf_ExecuteText(EXEC_NOW, "exec default.cfg\n");
+	if ( FS_ReadFile( "language.cfg", NULL ) > 0 ) {
+		Cbuf_ExecuteText(EXEC_APPEND, "exec language.cfg\n");
+	} else if ( FS_ReadFile( "Language.cfg", NULL ) > 0 ) {
+		Cbuf_ExecuteText(EXEC_APPEND, "exec Language.cfg\n");
+	}
 	Cbuf_Execute(); // Always execute after exec to prevent text buffer overflowing
 
 	if(!Com_SafeMode())
diff --git a/SP/code/qcommon/common.c b/SP/code/qcommon/common.c
index 6988ba3..99954d3 100644
--- a/SP/code/qcommon/common.c
+++ b/SP/code/qcommon/common.c
@@ -1901,6 +1901,11 @@ For controlling environment variables
 void Com_ExecuteCfg(void)
 {
 	Cbuf_ExecuteText(EXEC_NOW, "exec default.cfg\n");
+	if ( FS_ReadFile( "language.cfg", NULL ) > 0 ) {
+		Cbuf_ExecuteText(EXEC_APPEND, "exec language.cfg\n");
+	} else if ( FS_ReadFile( "Language.cfg", NULL ) > 0 ) {
+		Cbuf_ExecuteText(EXEC_APPEND, "exec Language.cfg\n");
+	}
 	Cbuf_Execute(); // Always execute after exec to prevent text buffer overflowing
 
 	if(!Com_SafeMode())

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git