From dc8680eec597505e38e8d8e847319481bc0715e3 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Thu, 1 Apr 2021 01:23:08 +0100
Subject: [PATCH] Ensure that cached decel values of free wagon chain heads are
 zeroed

---
 src/train_cmd.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 593ac3f692..9be6b86606 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -349,6 +349,9 @@ void Train::ConsistChanged(ConsistChangeFlags allowed_changes)
 		InvalidateWindowData(WC_VEHICLE_REFIT, this->index, VIWD_CONSIST_CHANGED);
 		InvalidateWindowData(WC_VEHICLE_ORDERS, this->index, VIWD_CONSIST_CHANGED);
 		InvalidateNewGRFInspectWindow(GSF_TRAINS, this->index);
+	} else {
+		this->tcache.cached_deceleration = 0;
+		this->tcache.cached_uncapped_decel = 0;
 	}
 	if (allowed_changes & CCF_LENGTH) {
 		for (Train *u = this->Next(); u != nullptr; u = u->Next()) {