mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r3572) - Rewrite GetFreeUnitNumber() so that only one loop of vehicles is required. Instead a list of used/unused numbers is created and the first unused number is chosen. This significantly improves performance in large games.

This commit is contained in:
peter1138 2006-02-07 19:01:01 +00:00
parent 66fcdc5e6d
commit 59333131a5
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
vehicle.c
View File

@ -2004,19 +2004,41 @@ uint32 VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y)
UnitID GetFreeUnitNumber(byte type) UnitID GetFreeUnitNumber(byte type)
{ {
UnitID unit_num = 0; UnitID unit, max;
Vehicle *u; const Vehicle *u;
static bool *cache = NULL;
static UnitID gmax = 0;
restart: switch (type) {
unit_num++; case VEH_Train: max = _patches.max_trains; break;
FOR_ALL_VEHICLES(u) { case VEH_Road: max = _patches.max_roadveh; break;
if (u->type == type && u->owner == _current_player && case VEH_Ship: max = _patches.max_ships; break;
unit_num == u->unitnumber) case VEH_Aircraft: max = _patches.max_aircraft; break;
goto restart; default: assert(0);
} }
return unit_num;
}
if (max > gmax) {
gmax = max;
free(cache);
cache = malloc((max + 1) * sizeof(*cache));
}
// Clear the cache
memset(cache, 0, (max + 1) * sizeof(*cache));
// Fill the cache
FOR_ALL_VEHICLES(u) {
if (u->type == type && u->owner == _current_player && u->unitnumber != 0 && u->unitnumber <= max)
cache[u->unitnumber] = true;
}
// Find the first unused unit number
for (unit = 1; unit <= max; unit++) {
if (!cache[unit]) break;
}
return unit;
}
// Save and load of vehicles // Save and load of vehicles
const SaveLoad _common_veh_desc[] = { const SaveLoad _common_veh_desc[] = {