mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-21 05:29:11 +00:00
Code Issues Activity

(svn r21095) -Codechange: Use a function to convert aircraft speed to old units.

Browse Source
This commit is contained in:
terkhen
2010-11-06 12:47:12 +00:00
parent 609e6dae3f
commit cfac2ced69
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/newgrf_engine.cpp
View File

@@ -715,8 +715,20 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by
case 0x17: return v->tick_counter;
case 0x18:
case 0x19: {
uint max_speed = v->type == VEH_TRAIN ? Train::From(v)->tcache.cached_max_speed : v->max_speed;
if (v->type == VEH_AIRCRAFT) max_speed = max_speed * 10 / 128;
uint max_speed;
switch (v->type) {
case VEH_TRAIN:
max_speed = Train::From(v)->tcache.cached_max_speed;
break;
case VEH_AIRCRAFT:
max_speed = Aircraft::From(v)->GetSpeedOldUnits(); // Convert to old units.
break;
default:
max_speed = v->max_speed;
break;
}
return (variable - 0x80) == 0x18 ? max_speed : GB(max_speed, 8, 8);
}
case 0x1A: return v->x_pos;