Merge branch 'master' into jgrpp

# Conflicts:
#	src/error.h
#	src/error_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/misc_gui.cpp
#	src/newgrf_gui.cpp
#	src/news_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/gamelog_sl.cpp
#	src/script/api/script_text.cpp
#	src/script/script_instance.cpp
#	src/statusbar_gui.cpp
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h
#	src/table/settings/gui_settings.ini
#	src/table/settings/linkgraph_settings.ini
#	src/textbuf_gui.h

src/townname.cpp

@@ -49,9 +49,8 @@ TownNameParams::TownNameParams(const Town *t) :
 char *GetTownName(char *buff, const TownNameParams *par, uint32 townnameparts, const char *last)
 {
 	if (par->grfid == 0) {
-		int64 args_array[1] = { townnameparts };
-		StringParameters tmp_params(args_array);
-		return GetStringWithArgs(buff, par->type, &tmp_params, last);
+		auto tmp_params = MakeParameters(townnameparts);
+		return GetStringWithArgs(buff, par->type, tmp_params, last);
 	}
 
 	return GRFTownNameGenerate(buff, par->grfid, par->type, townnameparts, last);