Merge branch 'improved_breakdowns' into improved_breakdowns-sx

9 years ago · 6ffb9c24c5
parent cc79a4d0f8 3ee8c76fa8
commit 6ffb9c24c5
1 changed files with 3 additions and 4 deletions
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@ -914,15 +914,14 @@ void CallVehicleTicks()

 			case VEH_TRAIN:
 				if (HasBit(Train::From(v)->flags, VRF_TOO_HEAVY)) {
-					_current_company = v->owner;
-					if (IsLocalCompany()) {
+					if (v->owner == _local_company) {
 						SetDParam(0, v->index);
 						SetDParam(1, STR_ERROR_TRAIN_TOO_HEAVY);
 						AddVehicleNewsItem(STR_ERROR_TRAIN_TOO_HEAVY, NT_ADVICE, v->index);
-						ClrBit(Train::From(v)->flags, VRF_TOO_HEAVY);
 					}
-					_current_company = OWNER_NONE;
+					ClrBit(Train::From(v)->flags, VRF_TOO_HEAVY);
 				}
+				/* FALL THROUGH */
 			case VEH_ROAD:
 			case VEH_AIRCRAFT:
 			case VEH_SHIP: {