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

(svn r16544) -Codechange: use double-linked list for vehicle position caches in order to improve performance (~5% with many vehicles)

This commit is contained in:
smatz 2009-06-09 17:20:06 +00:00
parent ea1a523a89
commit 249b6e6798
2 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/vehicle.cpp
View File

@ -375,26 +375,16 @@ static void UpdateNewVehiclePosHash(Vehicle *v, bool remove)
/* Remove from the old position in the hash table */
if (old_hash != NULL) {
Vehicle *last = NULL;
Vehicle *u = *old_hash;
while (u != v) {
last = u;
u = u->next_new_hash;
assert(u != NULL);
}
if (last == NULL) {
*old_hash = v->next_new_hash;
} else {
last->next_new_hash = v->next_new_hash;
}
if (v->next_new_hash != NULL) v->next_new_hash->prev_new_hash = v->prev_new_hash;
*v->prev_new_hash = v->next_new_hash;
}
/* Insert vehicle at beginning of the new position in the hash table */
if (new_hash != NULL) {
v->next_new_hash = *new_hash;
if (v->next_new_hash != NULL) v->next_new_hash->prev_new_hash = &v->next_new_hash;
v->prev_new_hash = new_hash;
*new_hash = v;
assert(v != v->next_new_hash);
}
/* Remember current hash position */
@ -418,24 +408,15 @@ static void UpdateVehiclePosHash(Vehicle *v, int x, int y)
/* remove from hash table? */
if (old_hash != NULL) {
Vehicle *last = NULL;
Vehicle *u = *old_hash;
while (u != v) {
last = u;
u = u->next_hash;
assert(u != NULL);
}
if (last == NULL) {
*old_hash = v->next_hash;
} else {
last->next_hash = v->next_hash;
}
if (v->next_hash != NULL) v->next_hash->prev_hash = v->prev_hash;
*v->prev_hash = v->next_hash;
}
/* insert into hash table? */
if (new_hash != NULL) {
v->next_hash = *new_hash;
if (v->next_hash != NULL) v->next_hash->prev_hash = &v->next_hash;
v->prev_hash = new_hash;
*new_hash = v;
}
}

4
src/vehicle_base.h
View File

@ -100,8 +100,8 @@ public:
/* Boundaries for the current position in the world and a next hash link.
* NOSAVE: All of those can be updated with VehiclePositionChanged() */
Rect coord;
Vehicle *next_hash;
Vehicle *next_new_hash;
Vehicle *next_hash, **prev_hash;
Vehicle *next_new_hash, **prev_new_hash;
Vehicle **old_new_hash;
SpriteID colourmap; // NOSAVE: cached colour mapping