Mercurial > hg > openttd

changeset 18328:b256912819c9 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r23164) -Fix (r23149): Default roadvehicles became somewhat short.
author frosch <frosch@openttd.org>
date Tue, 08 Nov 2011 18:21:56 +0000
parents 88632a3b6d03
children d6e5938a5caf
files src/roadveh_cmd.cpp
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -163,7 +163,7 @@
 static uint GetRoadVehLength(const RoadVehicle *v)
 {
 	const Engine *e = v->GetEngine();
-	uint length = e->u.road.shorten_factor;
+	uint length = VEHICLE_LENGTH;
 
 	uint16 veh_len = CALLBACK_FAILED;
 	if (e->GetGRF() != NULL && e->GetGRF()->grf_version >= 8) {
@@ -173,7 +173,8 @@
 		/* Use callback 11 */
 		veh_len = GetVehicleCallback(CBID_VEHICLE_LENGTH, 0, 0, v->engine_type, v);
 	}
-	if (veh_len != CALLBACK_FAILED) {
+	if (veh_len == CALLBACK_FAILED) veh_len = e->u.road.shorten_factor;
+	if (veh_len != 0) {
 		if (veh_len >= VEHICLE_LENGTH) ErrorUnknownCallbackResult(e->GetGRFID(), CBID_VEHICLE_LENGTH, veh_len);
 		length -= Clamp(veh_len, 0, VEHICLE_LENGTH - 1);
 	}