mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r65) -Fix [1009567] problem with transferred cargo crashes game. Invalid st->xy on deleted station.

release/0.4.5
darkvater 2004-08-16 13:54:37 +00:00
parent f98482d45a
commit d33c833a82
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/english.txt
View File

@ -2179,6 +2179,7 @@ STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Service non-stop at {TOWN} Train Depot
STR_HEADING_FOR_TRAIN_DEPOT :{LTBLUE}Heading for {TOWN} Train Depot
STR_HEADING_FOR_TRAIN_DEPOT_VEL :{LTBLUE}Heading for {TOWN} Train Depot, {VELOCITY}
STR_UNKNOWN_DESTINATION :unknown destination
STR_8812_EMPTY :{LTBLUE}Empty
STR_8813_FROM :{LTBLUE}{CARGO} from {STATION}
STR_8814_TRAIN_IS_WAITING_IN_DEPOT :{WHITE}Train {COMMA16} is waiting in depot

5
strings.c
View File

@ -496,7 +496,10 @@ static byte *DecodeString(byte *buff, const byte *str)
Station *st;
InjectDparam(1);
st = DEREF_STATION(GET_DPARAM16(1));
assert(st->xy);
if (!st->xy) { // station doesn't exist anymore
buff = GetString(buff, STR_UNKNOWN_DESTINATION);
break;
}
SET_DPARAM16(0, st->town->townnametype);
SET_DPARAM32(1, st->town->townnameparts);
buff = GetString(buff, st->string_id);