From d7f029344f1344f8f0813414523bac410cce219c Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Mon, 18 Mar 2024 23:39:42 +0000 Subject: [PATCH] Codechange: Don't delete news items or NewGRF window when EffectVehicle is deleted. (#12334) EffectVehicles never create news and can't be debugged, so searching for news items and windows to delete just wastes time. (cherry picked from commit 737e3feaf024f2ccebc4fdee9ec468a8f6c133de) --- src/vehicle.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 68dd5bd824..7e41da1aa9 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1278,8 +1278,10 @@ Vehicle::~Vehicle() if (this->type < VEH_COMPANY_END) UpdateVehicleTileHash(this, true); UpdateVehicleViewportHash(this, INVALID_COORD, 0); - DeleteVehicleNews(this->index, INVALID_STRING_ID); - DeleteNewGRFInspectWindow(GetGrfSpecFeature(this->type), this->index); + if (this->type != VEH_EFFECT) { + DeleteVehicleNews(this->index, INVALID_STRING_ID); + DeleteNewGRFInspectWindow(GetGrfSpecFeature(this->type), this->index); + } } /**