diff options
author | rubidium <rubidium@openttd.org> | 2009-05-23 09:10:56 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-05-23 09:10:56 +0000 |
commit | 6237fe146228e84761c6aba14bf7acf6c359f061 (patch) | |
tree | 0ff89de7f14a652d59d972e949761819642296a4 /src/aircraft_cmd.cpp | |
parent | da5661a0c8870c532c393ec3d330c3fbb44eb8ac (diff) | |
download | openttd-6237fe146228e84761c6aba14bf7acf6c359f061.tar.xz |
(svn r16394) -Codechange: move (NewGRF) cache variables into a separate struct so (some vehicle related) NewGRF cache 'desyncs' can be tested easier.
Diffstat (limited to 'src/aircraft_cmd.cpp')
-rw-r--r-- | src/aircraft_cmd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index c06e3e64b..488b260b2 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -757,9 +757,9 @@ void UpdateAircraftCache(Aircraft *v) /* Convert from original units to (approx) km/h */ max_speed = (max_speed * 129) / 10; - v->cached_max_speed = max_speed; + v->acache.cached_max_speed = max_speed; } else { - v->cached_max_speed = 0xFFFF; + v->acache.cached_max_speed = 0xFFFF; } } @@ -791,9 +791,9 @@ static int UpdateAircraftSpeed(Aircraft *v, uint speed_limit = SPEED_LIMIT_NONE, * and take-off speeds being too low. */ speed_limit *= _settings_game.vehicle.plane_speed; - if (v->cached_max_speed < speed_limit) { + if (v->acache.cached_max_speed < speed_limit) { if (v->cur_speed < speed_limit) hard_limit = false; - speed_limit = v->cached_max_speed; + speed_limit = v->acache.cached_max_speed; } speed_limit = min(speed_limit, v->max_speed); |