From 797f2e15ba52c562c65fe637934c2836b09e0565 Mon Sep 17 00:00:00 2001
From: SamuXarick <43006711+SamuXarick@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:57:57 +0100
Subject: [PATCH] Change: Also add OnNewEconomyDay vehicle performance
 measurements to the frame rate statistics

---
 src/aircraft_cmd.cpp | 3 +++
 src/roadveh_cmd.cpp  | 3 +++
 src/ship_cmd.cpp     | 2 ++
 src/train_cmd.cpp    | 2 ++
 src/vehicle.cpp      | 9 +++++----
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 22f6b66be6..5e404fba7a 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -456,6 +456,9 @@ void Aircraft::OnNewCalendarDay()
 void Aircraft::OnNewEconomyDay()
 {
 	if (!this->IsNormalAircraft()) return;
+
+	PerformanceAccumulator framerate(PFE_GL_AIRCRAFT);
+
 	EconomyAgeVehicle(this);
 
 	if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this);
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index b54c0f9d7f..206e2ac502 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -1710,6 +1710,9 @@ void RoadVehicle::OnNewCalendarDay()
 void RoadVehicle::OnNewEconomyDay()
 {
 	if (!this->IsFrontEngine()) return;
+
+	PerformanceAccumulator framerate(PFE_GL_ROADVEHS);
+
 	EconomyAgeVehicle(this);
 
 	if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this);
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index b4ac67cb08..47f832f534 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -260,6 +260,8 @@ void Ship::OnNewCalendarDay()
 /** Economy day handler. */
 void Ship::OnNewEconomyDay()
 {
+	PerformanceAccumulator framerate(PFE_GL_SHIPS);
+
 	EconomyAgeVehicle(this);
 
 	if ((++this->day_counter & 7) == 0) {
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 1f97ef21af..fcc19c8d75 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -4181,6 +4181,8 @@ void Train::OnNewCalendarDay()
 /** Economy day handler. */
 void Train::OnNewEconomyDay()
 {
+	PerformanceAccumulator framerate(PFE_GL_TRAINS);
+
 	EconomyAgeVehicle(this);
 
 	if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this);
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 06876853d9..3c050e33b3 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -985,16 +985,17 @@ void CallVehicleTicks()
 {
 	_vehicles_to_autoreplace.clear();
 
+	PerformanceAccumulator::Reset(PFE_GL_TRAINS);
+	PerformanceAccumulator::Reset(PFE_GL_ROADVEHS);
+	PerformanceAccumulator::Reset(PFE_GL_SHIPS);
+	PerformanceAccumulator::Reset(PFE_GL_AIRCRAFT);
+
 	RunEconomyVehicleDayProc();
 
 	{
 		PerformanceMeasurer framerate(PFE_GL_ECONOMY);
 		for (Station *st : Station::Iterate()) LoadUnloadStation(st);
 	}
-	PerformanceAccumulator::Reset(PFE_GL_TRAINS);
-	PerformanceAccumulator::Reset(PFE_GL_ROADVEHS);
-	PerformanceAccumulator::Reset(PFE_GL_SHIPS);
-	PerformanceAccumulator::Reset(PFE_GL_AIRCRAFT);
 
 	for (Vehicle *v : Vehicle::Iterate()) {
 		[[maybe_unused]] size_t vehicle_index = v->index;