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/tracerestrict_gui.cpp

@@ -1206,9 +1206,8 @@ static void DrawInstructionString(const TraceRestrictProgram *prog, TraceRestric
 		} else {
 			auto insert_warning = [&](uint dparam_index, StringID warning) {
 				char buf[256];
-				int64 args_array[] = { (int64)GetDParam(dparam_index) };
-				StringParameters tmp_params(args_array);
-				char *end = GetStringWithArgs(buf, warning, &tmp_params, lastof(buf));
+				auto tmp_params = MakeParameters(GetDParam(dparam_index));
+				char *end = GetStringWithArgs(buf, warning, tmp_params, lastof(buf));
 				_temp_special_strings[0].assign(buf, end);
 				SetDParam(dparam_index, SPECSTR_TEMP_START);
 			};