Mercurial > hg > openttd

changeset 18715:e6411cf4e885 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r23563) -Cleanup: remove useless global variable from strgen; it would always be false at the point it would be read
author rubidium <rubidium@openttd.org>
date Fri, 16 Dec 2011 22:03:59 +0000
parents 002c298a2a96
children 30959e70d2f7
files src/strgen/strgen.cpp
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/strgen/strgen.cpp
+++ b/src/strgen/strgen.cpp
@@ -45,7 +45,6 @@
 	Case *next;
 };
 
-static bool _masterlang;                     ///< Whether we are loading the master language
 static bool _translated;                     ///< Whether the current language is not the master language
 static bool _translation;                    ///< Is the current file actually a translation or not
 static const char *_file = "(unknown file)"; ///< The filename of the input, so we can refer to it in errors/warnings
@@ -1112,7 +1111,7 @@
 				cmdp = ls->english;
 			}
 
-			_translated = _masterlang || (cmdp != ls->english);
+			_translated = cmdp != ls->english;
 
 			if (casep != NULL) {
 				const Case *c;
@@ -1323,7 +1322,6 @@
 		mkpath(pathbuf, lengthof(pathbuf), src_dir, "english.txt");
 
 		/* parse master file */
-		_masterlang = true;
 		ParseFile(pathbuf, true);
 		MakeHashOfStrings();
 		if (_errors != 0) return 1;
@@ -1338,7 +1336,6 @@
 		mkpath(pathbuf, lengthof(pathbuf), src_dir, "english.txt");
 
 		/* parse master file and check if target file is correct */
-		_masterlang = false;
 		ParseFile(pathbuf, true);
 		MakeHashOfStrings();
 		ParseFile(replace_pathsep(mgo.argv[0]), false); // target file