diff options
| author | rubidium <rubidium@openttd.org> | 2009-11-21 12:43:09 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-11-21 12:43:09 +0000 |
| commit | 37056b564ce6d05e221a7dae9f67917eef227795 (patch) | |
| tree | 8cf660c6a4989c14a640392c263ed4bef7b7ecc6 /src/order_base.h | |
| parent | 0512761214f42241f830f9f94bf497c47e490cdd (diff) | |
| download | openttd-37056b564ce6d05e221a7dae9f67917eef227795.tar.xz | |
(svn r18204) -Codechange: introduce a type for Ticks and use it; furthermore document some related variables/functions
Diffstat (limited to 'src/order_base.h')
| -rw-r--r-- | src/order_base.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/order_base.h b/src/order_base.h index 9b241ec80..e75733a49 100644 --- a/src/order_base.h +++ b/src/order_base.h @@ -19,6 +19,7 @@ #include "depot_type.h" #include "station_type.h" #include "vehicle_type.h" +#include "date_type.h" typedef Pool<Order, OrderID, 256, 64000> OrderPool; typedef Pool<OrderList, OrderListID, 128, 64000> OrderListPool; @@ -265,7 +266,7 @@ private: uint num_vehicles; ///< NOSAVE: Number of vehicles that share this order list Vehicle *first_shared; ///< NOSAVE: pointer to the first vehicle in the shared order chain - uint timetable_duration; ///< NOSAVE: Total duration of the order list + Ticks timetable_duration; ///< NOSAVE: Total duration of the order list public: /** Default constructor producing an invalid order list. */ @@ -384,22 +385,22 @@ public: bool IsCompleteTimetable() const; /** - * Gets the total duration of the vehicles timetable or -1 is the timetable is not complete. - * @return total timetable duration or -1 for incomplete timetables + * Gets the total duration of the vehicles timetable or INVALID_TICKS is the timetable is not complete. + * @return total timetable duration or INVALID_TICKS for incomplete timetables */ - inline int GetTimetableTotalDuration() const { return this->IsCompleteTimetable() ? (int)this->timetable_duration : -1; } + inline Ticks GetTimetableTotalDuration() const { return this->IsCompleteTimetable() ? this->timetable_duration : INVALID_TICKS; } /** * Gets the known duration of the vehicles timetable even if the timetable is not complete. * @return known timetable duration */ - inline int GetTimetableDurationIncomplete() const { return this->timetable_duration; } + inline Ticks GetTimetableDurationIncomplete() const { return this->timetable_duration; } /** * Must be called if an order's timetable is changed to update internal book keeping. * @param delta By how many ticks has the timetable duration changed */ - void UpdateOrderTimetable(int delta) { this->timetable_duration += delta; } + void UpdateOrderTimetable(Ticks delta) { this->timetable_duration += delta; } /** * Free a complete order chain. |