Merge branch 'master' into jgrpp
# Conflicts: # .github/workflows/commit-checker.yml # src/industry_cmd.cpp # src/industry_gui.cpp # src/landscape.cpp # src/linkgraph/linkgraph_gui.cpp # src/order_base.h # src/order_cmd.cpp # src/order_gui.cpp # src/saveload/afterload.cpp # src/saveload/league_sl.cpp # src/saveload/saveload.h # src/script/api/script_object.hpp # src/script/squirrel_helper.hpp # src/settings_table.cpp # src/station_cmd.cpp # src/table/settings.h.preamble # src/tree_cmd.cpp # src/tree_map.h # src/vehicle.cpp # src/waypoint_cmd.cpp
This commit is contained in:
@@ -1177,8 +1177,9 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
||||
|
||||
sub_args.SetParam(i++, param);
|
||||
} else {
|
||||
s++; // skip the leading \"
|
||||
char *g = stredup(s);
|
||||
g[p - s] = '\0';
|
||||
g[p - s - 1] = '\0'; // skip the trailing \"
|
||||
|
||||
sub_args_need_free[i] = true;
|
||||
sub_args.SetParam(i++, (uint64)(size_t)g);
|
||||
@@ -1295,7 +1296,6 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
||||
break;
|
||||
|
||||
case SCC_RAW_STRING_POINTER: { // {RAW_STRING}
|
||||
if (game_script) break;
|
||||
const char *raw_string = (const char *)(size_t)args->GetInt64(SCC_RAW_STRING_POINTER);
|
||||
buff = FormatString(buff, raw_string, args, last);
|
||||
break;
|
||||
|
Reference in New Issue
Block a user