(svn r2294) - CodeChange: check the service interval settings when changing of all vehicle-types. To simplify things introduce GetServiceIntervalClamped() that returns the same or clamped value of the new service interval. There were some inconsistencies in the gui files so I had to change those, and const correctness kicked in, so it's a bit messy at certain points.

1 files changed, 4 insertions, 4 deletions

diff --git a/vehicle.h b/vehicle.h
index 8083ea53a..6e8237296 100644
--- a/vehicle.h
+++ b/vehicle.h
@@ -271,9 +271,9 @@ void AddRearEngineToMultiheadedTrain(Vehicle *v, Vehicle *u, bool building) ;
 
 /* train_cmd.h */
 int GetTrainImage(const Vehicle *v, byte direction);
-int GetAircraftImage(Vehicle *v, byte direction);
-int GetRoadVehImage(Vehicle *v, byte direction);
-int GetShipImage(Vehicle *v, byte direction);
+int GetAircraftImage(const Vehicle *v, byte direction);
+int GetRoadVehImage(const Vehicle *v, byte direction);
+int GetShipImage(const Vehicle *v, byte direction);
 
 Vehicle *CreateEffectVehicle(int x, int y, int z, EffectVehicle type);
 Vehicle *CreateEffectVehicleAbove(int x, int y, int z, EffectVehicle type);
@@ -307,7 +307,7 @@ UnitID GetFreeUnitNumber(byte type);
 int LoadUnloadVehicle(Vehicle *v);
 
 void UpdateTrainAcceleration(Vehicle *v);
-int32 GetTrainRunningCost(Vehicle *v);
+int32 GetTrainRunningCost(const Vehicle *v);
 
 int CheckTrainStoppedInDepot(const Vehicle *v);