|
|
|
@ -1275,7 +1275,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|
|
|
|
if (c == NULL) break;
|
|
|
|
|
|
|
|
|
|
if (c->name != NULL) {
|
|
|
|
|
int64 args_array[] = {(uint64)(size_t)c->name};
|
|
|
|
|
int64 args_array[] = {(int64)(size_t)c->name};
|
|
|
|
|
StringParameters tmp_params(args_array);
|
|
|
|
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
|
|
|
|
} else {
|
|
|
|
@ -1301,7 +1301,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|
|
|
|
case SCC_DEPOT_NAME: { // {DEPOT}
|
|
|
|
|
VehicleType vt = (VehicleType)args->GetInt32(SCC_DEPOT_NAME);
|
|
|
|
|
if (vt == VEH_AIRCRAFT) {
|
|
|
|
|
uint64 args_array[] = {args->GetInt32()};
|
|
|
|
|
uint64 args_array[] = {(uint64)args->GetInt32()};
|
|
|
|
|
WChar types_array[] = {SCC_STATION_NAME};
|
|
|
|
|
StringParameters tmp_params(args_array, 1, types_array);
|
|
|
|
|
buff = GetStringWithArgs(buff, STR_FORMAT_DEPOT_NAME_AIRCRAFT, &tmp_params, last);
|
|
|
|
@ -1310,7 +1310,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|
|
|
|
|
|
|
|
|
const Depot *d = Depot::Get(args->GetInt32());
|
|
|
|
|
if (d->name != NULL) {
|
|
|
|
|
int64 args_array[] = {(uint64)(size_t)d->name};
|
|
|
|
|
int64 args_array[] = {(int64)(size_t)d->name};
|
|
|
|
|
StringParameters tmp_params(args_array);
|
|
|
|
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
|
|
|
|
} else {
|
|
|
|
@ -1326,7 +1326,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|
|
|
|
if (e == NULL) break;
|
|
|
|
|
|
|
|
|
|
if (e->name != NULL && e->IsEnabled()) {
|
|
|
|
|
int64 args_array[] = {(uint64)(size_t)e->name};
|
|
|
|
|
int64 args_array[] = {(int64)(size_t)e->name};
|
|
|
|
|
StringParameters tmp_params(args_array);
|
|
|
|
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
|
|
|
|
} else {
|
|
|
|
@ -1341,7 +1341,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|
|
|
|
if (g == NULL) break;
|
|
|
|
|
|
|
|
|
|
if (g->name != NULL) {
|
|
|
|
|
int64 args_array[] = {(uint64)(size_t)g->name};
|
|
|
|
|
int64 args_array[] = {(int64)(size_t)g->name};
|
|
|
|
|
StringParameters tmp_params(args_array);
|
|
|
|
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
|
|
|
|
} else {
|
|
|
|
@ -1378,7 +1378,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|
|
|
|
if (c == NULL) break;
|
|
|
|
|
|
|
|
|
|
if (c->president_name != NULL) {
|
|
|
|
|
int64 args_array[] = {(uint64)(size_t)c->president_name};
|
|
|
|
|
int64 args_array[] = {(int64)(size_t)c->president_name};
|
|
|
|
|
StringParameters tmp_params(args_array);
|
|
|
|
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
|
|
|
|
} else {
|
|
|
|
@ -1403,7 +1403,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (st->name != NULL) {
|
|
|
|
|
int64 args_array[] = {(uint64)(size_t)st->name};
|
|
|
|
|
int64 args_array[] = {(int64)(size_t)st->name};
|
|
|
|
|
StringParameters tmp_params(args_array);
|
|
|
|
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
|
|
|
|
} else {
|
|
|
|
@ -1432,7 +1432,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|
|
|
|
if (t == NULL) break;
|
|
|
|
|
|
|
|
|
|
if (t->name != NULL) {
|
|
|
|
|
int64 args_array[] = {(uint64)(size_t)t->name};
|
|
|
|
|
int64 args_array[] = {(int64)(size_t)t->name};
|
|
|
|
|
StringParameters tmp_params(args_array);
|
|
|
|
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
|
|
|
|
} else {
|
|
|
|
@ -1446,7 +1446,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|
|
|
|
if (wp == NULL) break;
|
|
|
|
|
|
|
|
|
|
if (wp->name != NULL) {
|
|
|
|
|
int64 args_array[] = {(uint64)(size_t)wp->name};
|
|
|
|
|
int64 args_array[] = {(int64)(size_t)wp->name};
|
|
|
|
|
StringParameters tmp_params(args_array);
|
|
|
|
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
|
|
|
|
} else {
|
|
|
|
@ -1464,7 +1464,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|
|
|
|
if (v == NULL) break;
|
|
|
|
|
|
|
|
|
|
if (v->name != NULL) {
|
|
|
|
|
int64 args_array[] = {(uint64)(size_t)v->name};
|
|
|
|
|
int64 args_array[] = {(int64)(size_t)v->name};
|
|
|
|
|
StringParameters tmp_params(args_array);
|
|
|
|
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
|
|
|
|
} else {
|
|
|
|
@ -1490,7 +1490,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
|
|
|
|
|
if (si == NULL) break;
|
|
|
|
|
|
|
|
|
|
if (si->name != NULL) {
|
|
|
|
|
int64 args_array[] = {(uint64)(size_t)si->name};
|
|
|
|
|
int64 args_array[] = {(int64)(size_t)si->name};
|
|
|
|
|
StringParameters tmp_params(args_array);
|
|
|
|
|
buff = GetStringWithArgs(buff, STR_JUST_RAW_STRING, &tmp_params, last);
|
|
|
|
|
} else {
|
|
|
|
|