diff --git a/src/object/ObjectRepository.cpp b/src/object/ObjectRepository.cpp index 6625661331..ebef251657 100644 --- a/src/object/ObjectRepository.cpp +++ b/src/object/ObjectRepository.cpp @@ -126,7 +126,7 @@ public: // SortItems(); } - const size_t GetNumObjects() const override + size_t GetNumObjects() const override { return _items.size(); } diff --git a/src/object/ObjectRepository.h b/src/object/ObjectRepository.h index 4efa39a734..e369960daf 100644 --- a/src/object/ObjectRepository.h +++ b/src/object/ObjectRepository.h @@ -63,7 +63,7 @@ interface IObjectRepository virtual ~IObjectRepository() { } virtual void LoadOrConstruct() abstract; - virtual const size_t GetNumObjects() const abstract; + virtual size_t GetNumObjects() const abstract; virtual const ObjectRepositoryItem * GetObjects() const abstract; virtual const ObjectRepositoryItem * FindObject(const utf8 * name) const abstract; virtual const ObjectRepositoryItem * FindObject(const rct_object_entry * objectEntry) const abstract; diff --git a/src/ride/ride.c b/src/ride/ride.c index 79817dfe29..1f313afc3a 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -8668,12 +8668,12 @@ const uint8* ride_seek_available_modes(rct_ride *ride) } // Gets the approximate value of customers per hour for this ride. Multiplies ride_customers_in_last_5_minutes() by 12. -const uint32 ride_customers_per_hour(const rct_ride *ride) { +uint32 ride_customers_per_hour(const rct_ride *ride) { return ride_customers_in_last_5_minutes(ride) * 12; } // Calculates the number of customers for this ride in the last 5 minutes (or more correctly 9600 game ticks) -const uint32 ride_customers_in_last_5_minutes(const rct_ride *ride) { +uint32 ride_customers_in_last_5_minutes(const rct_ride *ride) { uint32 sum = ride->num_customers[0] + ride->num_customers[1] + ride->num_customers[2] diff --git a/src/ride/ride.h b/src/ride/ride.h index 0dd9059591..36ac7de2ff 100644 --- a/src/ride/ride.h +++ b/src/ride/ride.h @@ -1148,8 +1148,8 @@ const uint8* ride_seek_available_modes(rct_ride *ride); void window_ride_measurements_design_cancel(); void window_ride_construction_mouseup_demolish_next_piece(int x, int y, int z, int direction, int type); -const uint32 ride_customers_per_hour(const rct_ride *ride); -const uint32 ride_customers_in_last_5_minutes(const rct_ride *ride); +uint32 ride_customers_per_hour(const rct_ride *ride); +uint32 ride_customers_in_last_5_minutes(const rct_ride *ride); rct_vehicle * ride_get_broken_vehicle(rct_ride *ride);