diff options
| -rw-r--r-- | src/aircraft.h | 6 | ||||
| -rw-r--r-- | src/roadveh.h | 6 | ||||
| -rw-r--r-- | src/ship.h | 6 | ||||
| -rw-r--r-- | src/train.h | 6 | ||||
| -rw-r--r-- | src/vehicle.h | 12 |
5 files changed, 18 insertions, 18 deletions
diff --git a/src/aircraft.h b/src/aircraft.h index 34c4cdc6a..8af928495 100644 --- a/src/aircraft.h +++ b/src/aircraft.h @@ -130,11 +130,11 @@ struct Aircraft : public Vehicle { /** We want to 'destruct' the right class. */ virtual ~Aircraft() {} - const char *GetTypeString() { return "aircraft"; } + const char *GetTypeString() const { return "aircraft"; } void MarkDirty(); void UpdateDeltaXY(Direction direction); - ExpensesType GetExpenseType(bool income) { return income ? EXPENSES_AIRCRAFT_INC : EXPENSES_AIRCRAFT_RUN; } - WindowClass GetVehicleListWindowClass() { return WC_AIRCRAFT_LIST; } + ExpensesType GetExpenseType(bool income) const { return income ? EXPENSES_AIRCRAFT_INC : EXPENSES_AIRCRAFT_RUN; } + WindowClass GetVehicleListWindowClass() const { return WC_AIRCRAFT_LIST; } }; #endif /* AIRCRAFT_H */ diff --git a/src/roadveh.h b/src/roadveh.h index c3d8cbf94..3db44ff45 100644 --- a/src/roadveh.h +++ b/src/roadveh.h @@ -38,11 +38,11 @@ struct RoadVehicle : public Vehicle { /** We want to 'destruct' the right class. */ virtual ~RoadVehicle() {} - const char *GetTypeString() { return "road vehicle"; } + const char *GetTypeString() const { return "road vehicle"; } void MarkDirty(); void UpdateDeltaXY(Direction direction); - ExpensesType GetExpenseType(bool income) { return income ? EXPENSES_ROADVEH_INC : EXPENSES_ROADVEH_RUN; } - WindowClass GetVehicleListWindowClass() { return WC_ROADVEH_LIST; } + ExpensesType GetExpenseType(bool income) const { return income ? EXPENSES_ROADVEH_INC : EXPENSES_ROADVEH_RUN; } + WindowClass GetVehicleListWindowClass() const { return WC_ROADVEH_LIST; } }; #endif /* ROADVEH_H */ diff --git a/src/ship.h b/src/ship.h index 0d4e324ae..fe5598230 100644 --- a/src/ship.h +++ b/src/ship.h @@ -39,11 +39,11 @@ struct Ship: public Vehicle { /** We want to 'destruct' the right class. */ virtual ~Ship() {} - const char *GetTypeString() { return "ship"; } + const char *GetTypeString() const { return "ship"; } void MarkDirty(); void UpdateDeltaXY(Direction direction); - ExpensesType GetExpenseType(bool income) { return income ? EXPENSES_SHIP_INC : EXPENSES_SHIP_RUN; } - WindowClass GetVehicleListWindowClass() { return WC_SHIPS_LIST; } + ExpensesType GetExpenseType(bool income) const { return income ? EXPENSES_SHIP_INC : EXPENSES_SHIP_RUN; } + WindowClass GetVehicleListWindowClass() const { return WC_SHIPS_LIST; } }; #endif /* SHIP_H */ diff --git a/src/train.h b/src/train.h index eaebf04bc..74f4341ba 100644 --- a/src/train.h +++ b/src/train.h @@ -243,11 +243,11 @@ struct Train : public Vehicle { /** We want to 'destruct' the right class. */ virtual ~Train() {} - const char *GetTypeString() { return "train"; } + const char *GetTypeString() const { return "train"; } void MarkDirty(); void UpdateDeltaXY(Direction direction); - ExpensesType GetExpenseType(bool income) { return income ? EXPENSES_TRAIN_INC : EXPENSES_TRAIN_RUN; } - WindowClass GetVehicleListWindowClass() { return WC_TRAINS_LIST; } + ExpensesType GetExpenseType(bool income) const { return income ? EXPENSES_TRAIN_INC : EXPENSES_TRAIN_RUN; } + WindowClass GetVehicleListWindowClass() const { return WC_TRAINS_LIST; } }; #endif /* TRAIN_H */ diff --git a/src/vehicle.h b/src/vehicle.h index 1b2be2eb1..904a9f9e5 100644 --- a/src/vehicle.h +++ b/src/vehicle.h @@ -352,7 +352,7 @@ struct Vehicle { * Get a string 'representation' of the vehicle type. * @return the string representation. */ - virtual const char* GetTypeString() = 0; + virtual const char* GetTypeString() const = 0; /** * Marks the vehicles to be redrawn and updates cached variables @@ -370,12 +370,12 @@ struct Vehicle { * Sets the expense type associated to this vehicle type * @param income whether this is income or (running) expenses of the vehicle */ - virtual ExpensesType GetExpenseType(bool income) { return EXPENSES_OTHER; } + virtual ExpensesType GetExpenseType(bool income) const { return EXPENSES_OTHER; } /** * Invalidates the vehicle list window of this type of vehicle */ - virtual WindowClass GetVehicleListWindowClass() { return WC_NONE; } + virtual WindowClass GetVehicleListWindowClass() const { return WC_NONE; } }; /** @@ -400,7 +400,7 @@ struct SpecialVehicle : public Vehicle { /** We want to 'destruct' the right class. */ virtual ~SpecialVehicle() {} - const char *GetTypeString() { return "special vehicle"; } + const char *GetTypeString() const { return "special vehicle"; } void UpdateDeltaXY(Direction direction); }; @@ -419,7 +419,7 @@ struct DisasterVehicle : public Vehicle { /** We want to 'destruct' the right class. */ virtual ~DisasterVehicle() {} - const char *GetTypeString() { return "disaster vehicle"; } + const char *GetTypeString() const { return "disaster vehicle"; } void UpdateDeltaXY(Direction direction); }; @@ -438,7 +438,7 @@ struct InvalidVehicle : public Vehicle { /** We want to 'destruct' the right class. */ virtual ~InvalidVehicle() {} - const char *GetTypeString() { return "invalid vehicle"; } + const char *GetTypeString() const { return "invalid vehicle"; } }; #define is_custom_sprite(x) (x >= 0xFD) |