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

(svn r23748) -Fix: Make vehicle variables A8 and A9 always return 0. Returning cur_image is a potential desyncer due to Action1 in static NewGRFs.

release/1.2
frosch 2012-01-03 23:53:53 +00:00
parent 3c355da531
commit bc9c8db287
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_engine.cpp
View File

@ -743,8 +743,8 @@ static uint32 VehicleGetVariable(Vehicle *v, const ResolverObject *object, byte
case 0x1D: return GB(v->y_pos, 8, 8); case 0x1D: return GB(v->y_pos, 8, 8);
case 0x1E: return v->z_pos; case 0x1E: return v->z_pos;
case 0x1F: return object->u.vehicle.info_view ? DIR_W : v->direction; case 0x1F: return object->u.vehicle.info_view ? DIR_W : v->direction;
case 0x28: return v->cur_image; case 0x28: return 0; // cur_image is a potential desyncer due to Action1 in static NewGRFs.
case 0x29: return GB(v->cur_image, 8, 8); case 0x29: return 0; // cur_image is a potential desyncer due to Action1 in static NewGRFs.
case 0x32: return v->vehstatus; case 0x32: return v->vehstatus;
case 0x33: return 0; // non-existent high byte of vehstatus case 0x33: return 0; // non-existent high byte of vehstatus
case 0x34: return v->type == VEH_AIRCRAFT ? (v->cur_speed * 10) / 128 : v->cur_speed; case 0x34: return v->type == VEH_AIRCRAFT ? (v->cur_speed * 10) / 128 : v->cur_speed;