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

(svn r2144) - Fix: AI crash when trying to remove stations with index higher than 256.

release/0.4.5
darkvater 2005-04-03 13:57:39 +00:00
parent 31381af8a0
commit 2ac7077571
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ai.c
View File

@ -3609,23 +3609,25 @@ return_to_loop:;
static void AiStateRemoveStation(Player *p) static void AiStateRemoveStation(Player *p)
{ {
// Remove stations that aren't in use by any vehicle // Remove stations that aren't in use by any vehicle
byte in_use[256], *used; byte *in_use;
const byte *used;
const Order *ord; const Order *ord;
Station *st; const Station *st;
uint tile; TileIndex tile;
// Go to this state when we're done. // Go to this state when we're done.
p->ai.state = AIS_1; p->ai.state = AIS_1;
// Get a list of all stations that are in use by a vehicle // Get a list of all stations that are in use by a vehicle
memset(in_use, 0, sizeof(in_use)); in_use = malloc(GetStationPoolSize());
memset(in_use, 0, GetStationPoolSize());
FOR_ALL_ORDERS(ord) { FOR_ALL_ORDERS(ord) {
if (ord->type == OT_GOTO_STATION) if (ord->type == OT_GOTO_STATION)
in_use[ord->station] = 1; in_use[ord->station] = 1;
} }
// Go through all stations and delete those that aren't in use // Go through all stations and delete those that aren't in use
used=in_use; used = in_use;
FOR_ALL_STATIONS(st) { FOR_ALL_STATIONS(st) {
if (st->xy != 0 && st->owner == _current_player && !*used && if (st->xy != 0 && st->owner == _current_player && !*used &&
( (st->bus_stops != NULL && (tile = st->bus_stops->xy) != 0) || ( (st->bus_stops != NULL && (tile = st->bus_stops->xy) != 0) ||
@ -3638,6 +3640,7 @@ static void AiStateRemoveStation(Player *p)
used++; used++;
} }
free(in_use);
} }
static void AiRemovePlayerRailOrRoad(Player *p, TileIndex tile) static void AiRemovePlayerRailOrRoad(Player *p, TileIndex tile)