diff options
| author | frosch <frosch@openttd.org> | 2012-01-03 23:53:53 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2012-01-03 23:53:53 +0000 |
| commit | bc9c8db287a1e2f7f81f24f67373627c56a5c3dd (patch) | |
| tree | 032bcaaa658438ea8d635c6808944f66809b7796 | |
| parent | 3c355da531fa44029b94ebfc9b3c351314f18a29 (diff) | |
| download | openttd-bc9c8db287a1e2f7f81f24f67373627c56a5c3dd.tar.xz | |
(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.
| -rw-r--r-- | src/newgrf_engine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index 87c309006..980ee33f2 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -743,8 +743,8 @@ static uint32 VehicleGetVariable(Vehicle *v, const ResolverObject *object, byte case 0x1D: return GB(v->y_pos, 8, 8); case 0x1E: return v->z_pos; case 0x1F: return object->u.vehicle.info_view ? DIR_W : v->direction; - case 0x28: return v->cur_image; - case 0x29: return GB(v->cur_image, 8, 8); + case 0x28: return 0; // cur_image is a potential desyncer due to Action1 in static NewGRFs. + case 0x29: return 0; // cur_image is a potential desyncer due to Action1 in static NewGRFs. case 0x32: return v->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; |