diff options
author | smatz <smatz@openttd.org> | 2010-05-09 18:13:36 +0000 |
---|---|---|
committer | smatz <smatz@openttd.org> | 2010-05-09 18:13:36 +0000 |
commit | 3f961ca671cb81f42330cfd81b2565d11f3c794d (patch) | |
tree | 3cf63f5c985ff3f56ceecee3ac3592d2ccc443c7 | |
parent | 2eaca9e108cf57ca6ab75c28742754289264d539 (diff) | |
download | openttd-3f961ca671cb81f42330cfd81b2565d11f3c794d.tar.xz |
(svn r19775) -Fix: improper use of 'then' in few comments (ln)
-rw-r--r-- | src/ai/ai_instance.cpp | 2 | ||||
-rw-r--r-- | src/ai/api/ai_controller.hpp | 2 | ||||
-rw-r--r-- | src/ai/api/ai_industry.hpp | 2 | ||||
-rw-r--r-- | src/ai/api/ai_order.hpp | 2 | ||||
-rw-r--r-- | src/ai/api/ai_waypoint.hpp | 2 | ||||
-rw-r--r-- | src/pathfinder/npf/queue.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp index fb258eee3..693d76c3a 100644 --- a/src/ai/ai_instance.cpp +++ b/src/ai/ai_instance.cpp @@ -428,7 +428,7 @@ void AIInstance::CollectGarbage() const * The data itself, this differs per type: * - integer: a binary representation of the integer (int32). * - string: First one byte with the string length, then a 0-terminated char - * array. The string can't be longer then 255 bytes (including + * array. The string can't be longer than 255 bytes (including * terminating '\0'). * - array: All data-elements of the array are saved recursive in this * format, and ended with an element of the type diff --git a/src/ai/api/ai_controller.hpp b/src/ai/api/ai_controller.hpp index c322d5ad4..a857886e0 100644 --- a/src/ai/api/ai_controller.hpp +++ b/src/ai/api/ai_controller.hpp @@ -77,7 +77,7 @@ public: * you can control that number here. * @param ticks The minimum amount of ticks to wait. * @pre Ticks should be positive. Too big values will influence performance of the AI. - * @note If the number is lower then the MP setting, the MP setting wins. + * @note If the number is lower than the MP setting, the MP setting wins. */ static void SetCommandDelay(int ticks); diff --git a/src/ai/api/ai_industry.hpp b/src/ai/api/ai_industry.hpp index 815e37ad0..d5eaac817 100644 --- a/src/ai/api/ai_industry.hpp +++ b/src/ai/api/ai_industry.hpp @@ -25,7 +25,7 @@ public: * Gets the number of industries. * @return The number of industries. * @post Return value is always non-negative. - * @note The maximum valid IndustryID can be higher then the value returned. + * @note The maximum valid IndustryID can be higher than the value returned. */ static int32 GetIndustryCount(); diff --git a/src/ai/api/ai_order.hpp b/src/ai/api/ai_order.hpp index f13b164bd..36e536f59 100644 --- a/src/ai/api/ai_order.hpp +++ b/src/ai/api/ai_order.hpp @@ -118,7 +118,7 @@ public: ORDER_INVALID = -1, //!< An invalid order. }; - /** Where to stop trains in a station that's longer then the train */ + /** Where to stop trains in a station that's longer than the train */ enum StopLocation { STOPLOCATION_NEAR, //!< Stop the train as soon as it's completely in the station STOPLOCATION_MIDDLE, //!< Stop the train in the middle of the station diff --git a/src/ai/api/ai_waypoint.hpp b/src/ai/api/ai_waypoint.hpp index 32b1da498..030bb08c2 100644 --- a/src/ai/api/ai_waypoint.hpp +++ b/src/ai/api/ai_waypoint.hpp @@ -43,7 +43,7 @@ public: /** The waypoint is build too close to another waypoint */ ERR_WAYPOINT_TOO_CLOSE_TO_ANOTHER_WAYPOINT, // [STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT] - /** The waypoint would join more then one existing waypoint together. */ + /** The waypoint would join more than one existing waypoint together. */ ERR_WAYPOINT_ADJOINS_MULTIPLE_WAYPOINTS, // [STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING] }; diff --git a/src/pathfinder/npf/queue.cpp b/src/pathfinder/npf/queue.cpp index a954876a6..d4850a0fc 100644 --- a/src/pathfinder/npf/queue.cpp +++ b/src/pathfinder/npf/queue.cpp @@ -183,7 +183,7 @@ static bool BinaryHeap_Push(Queue *q, void *item, int priority) while (i > 1) { /* Get the parent of this object (divide by 2) */ j = i / 2; - /* Is the parent bigger then the current, switch them */ + /* Is the parent bigger than the current, switch them */ if (BIN_HEAP_ARR(i).priority <= BIN_HEAP_ARR(j).priority) { temp = BIN_HEAP_ARR(j); BIN_HEAP_ARR(j) = BIN_HEAP_ARR(i); |