From ed9c01e8b04305dc62f7173649f44bd27ac4b623 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 9 Aug 2009 19:06:05 +0000 Subject: [PATCH] (svn r17137) -Fix (r17129): strgen complained a lot about english.txt compiled with MSVC. --- src/strgen/strgen.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp index 0329050668..e8f8de50b2 100644 --- a/src/strgen/strgen.cpp +++ b/src/strgen/strgen.cpp @@ -806,7 +806,10 @@ static void ParseFile(const char *file, bool english) FILE *in; char buf[2048]; - _translation = strcmp(file, _file) != 0; + /* Only look at the final filename to determine whether it's be base language or not */ + const char *cur_file = strrchr(_file, PATHSEPCHAR); + const char *next_file = strrchr(file, PATHSEPCHAR); + _translation = next_file != NULL && cur_file != NULL && strcmp(cur_file, next_file) != 0; _file = file; /* For each new file we parse, reset the genders, and language codes */