From da0b09557c2de80907fe9b07bd8d671fcecaab2a Mon Sep 17 00:00:00 2001 From: alberth Date: Sun, 30 Jan 2011 21:32:21 +0000 Subject: (svn r21930) -Codechange: Remove unused vehicle GetTypeString() functions. --- src/aircraft.h | 1 - src/effectvehicle_base.h | 1 - src/roadveh.h | 1 - src/ship.h | 1 - src/train.h | 1 - src/vehicle_base.h | 7 ------- 6 files changed, 12 deletions(-) diff --git a/src/aircraft.h b/src/aircraft.h index 4059d7ea5..491a1a09f 100644 --- a/src/aircraft.h +++ b/src/aircraft.h @@ -54,7 +54,6 @@ struct Aircraft : public SpecializedVehicle { /** We want to 'destruct' the right class. */ virtual ~Aircraft() { this->PreDestructor(); } - const char *GetTypeString() const { return "aircraft"; } void MarkDirty(); void UpdateDeltaXY(Direction direction); ExpensesType GetExpenseType(bool income) const { return income ? EXPENSES_AIRCRAFT_INC : EXPENSES_AIRCRAFT_RUN; } diff --git a/src/effectvehicle_base.h b/src/effectvehicle_base.h index 8ad17adc8..11067db61 100644 --- a/src/effectvehicle_base.h +++ b/src/effectvehicle_base.h @@ -31,7 +31,6 @@ struct EffectVehicle : public SpecializedVehicle { /** We want to 'destruct' the right class. */ virtual ~EffectVehicle() {} - const char *GetTypeString() const { return "special vehicle"; } void UpdateDeltaXY(Direction direction); bool Tick(); }; diff --git a/src/roadveh.h b/src/roadveh.h index 516257512..f1ac00901 100644 --- a/src/roadveh.h +++ b/src/roadveh.h @@ -98,7 +98,6 @@ struct RoadVehicle : public GroundVehicle { friend struct GroundVehicle; // GroundVehicle needs to use the acceleration functions defined at RoadVehicle. - const char *GetTypeString() const { return "road vehicle"; } void MarkDirty(); void UpdateDeltaXY(Direction direction); ExpensesType GetExpenseType(bool income) const { return income ? EXPENSES_ROADVEH_INC : EXPENSES_ROADVEH_RUN; } diff --git a/src/ship.h b/src/ship.h index 7d47ae876..9dc3a78a8 100644 --- a/src/ship.h +++ b/src/ship.h @@ -27,7 +27,6 @@ struct Ship: public SpecializedVehicle { /** We want to 'destruct' the right class. */ virtual ~Ship() { this->PreDestructor(); } - const char *GetTypeString() const { return "ship"; } void MarkDirty(); void UpdateDeltaXY(Direction direction); ExpensesType GetExpenseType(bool income) const { return income ? EXPENSES_SHIP_INC : EXPENSES_SHIP_RUN; } diff --git a/src/train.h b/src/train.h index 94848bf52..085987a7f 100644 --- a/src/train.h +++ b/src/train.h @@ -91,7 +91,6 @@ struct Train : public GroundVehicle { friend struct GroundVehicle; // GroundVehicle needs to use the acceleration functions defined at Train. - const char *GetTypeString() const { return "train"; } void MarkDirty(); void UpdateDeltaXY(Direction direction); ExpensesType GetExpenseType(bool income) const { return income ? EXPENSES_TRAIN_INC : EXPENSES_TRAIN_RUN; } diff --git a/src/vehicle_base.h b/src/vehicle_base.h index c12232ec0..c5290e770 100644 --- a/src/vehicle_base.h +++ b/src/vehicle_base.h @@ -258,12 +258,6 @@ public: void HandleLoading(bool mode = false); - /** - * Get a string 'representation' of the vehicle type. - * @return the string representation. - */ - virtual const char *GetTypeString() const { return "base vehicle"; } - /** * Marks the vehicles to be redrawn and updates cached variables * @@ -916,7 +910,6 @@ struct DisasterVehicle : public SpecializedVehicle