dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp-beta

Browse Source 
# Conflicts:
#	src/company_cmd.cpp
#	src/economy.cpp
#	src/lang/swedish.txt
#	src/network/network_command.cpp
#	src/news_gui.cpp
#	src/saveload/saveload.h
#	src/script/api/script_list.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/sdl2_v.cpp
This commit is contained in:
Jonathan G Rennison
2021-11-01 18:54:43 +00:00
parent d1f1a6942a 9c7a7b53a1
commit 62afd94b47
78 changed files with 539 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/strgen/strgen.cpp
View File

@@ -46,7 +46,11 @@ void CDECL strgen_warning(const char *s, ...)
va_start(va, s);
vseprintf(buf, lastof(buf), s, va);
va_end(va);
fprintf(stderr, LINE_NUM_FMT("warning"), _file, _cur_line, buf);
if (_show_todo > 0) {
fprintf(stderr, LINE_NUM_FMT("warning"), _file, _cur_line, buf);
} else {
fprintf(stderr, LINE_NUM_FMT("info"), _file, _cur_line, buf);
}
_warnings++;
}

6
src/strgen/strgen_base.cpp
View File

@@ -818,9 +818,13 @@ void StringReader::ParseFile()
char buf[2048];
_warnings = _errors = 0;
_translation = this->master || this->translation;
_translation = this->translation;
_file = this->file;
/* Abusing _show_todo to replace "warning" with "info" for translations. */
_show_todo &= 3;
if (!this->translation) _show_todo |= 4;
/* For each new file we parse, reset the genders, and language codes. */
MemSetT(&_lang, 0);
strecpy(_lang.digit_group_separator, ",", lastof(_lang.digit_group_separator));