summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNiels Martin Hansen <nielsm@indvikleren.dk>2019-01-06 10:31:56 +0100
committerNiels Martin Hansen <nielsm@indvikleren.dk>2019-01-06 11:45:21 +0100
commit15a7f9da9d12a40bb65dda7cef4f4b3ec5342087 (patch)
treeb7a9ec2be66c96ab7d978b1b65de9acd3a98a78b /src
parent13056aedbc0a6c22704a525c1395980d887e0ad2 (diff)
downloadopenttd-15a7f9da9d12a40bb65dda7cef4f4b3ec5342087.tar.xz
Fix 13056ae: PR #7017 added new enum value in bad position, move it
Diffstat (limited to 'src')
-rw-r--r--src/lang/english.txt2
-rw-r--r--src/order_type.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 20608a278..cb4e685c4 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -3854,12 +3854,12 @@ STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Vehicle
# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Load percentage
STR_ORDER_CONDITIONAL_RELIABILITY :Reliability
-STR_ORDER_CONDITIONAL_MAX_RELIABILITY :Maximum reliability
STR_ORDER_CONDITIONAL_MAX_SPEED :Maximum speed
STR_ORDER_CONDITIONAL_AGE :Age (years)
STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Requires service
STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Always
STR_ORDER_CONDITIONAL_REMAINING_LIFETIME :Remaining lifetime (years)
+STR_ORDER_CONDITIONAL_MAX_RELIABILITY :Maximum reliability
STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP :{BLACK}How to compare the vehicle data to the given value
STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS :is equal to
diff --git a/src/order_type.h b/src/order_type.h
index ade099296..ac66bfa38 100644
--- a/src/order_type.h
+++ b/src/order_type.h
@@ -118,12 +118,12 @@ DECLARE_ENUM_AS_BIT_SET(OrderDepotActionFlags)
enum OrderConditionVariable {
OCV_LOAD_PERCENTAGE, ///< Skip based on the amount of load
OCV_RELIABILITY, ///< Skip based on the reliability
- OCV_MAX_RELIABILITY, ///< Skip based on the maximum reliability
OCV_MAX_SPEED, ///< Skip based on the maximum speed
OCV_AGE, ///< Skip based on the age
OCV_REQUIRES_SERVICE, ///< Skip when the vehicle requires service
OCV_UNCONDITIONALLY, ///< Always skip
OCV_REMAINING_LIFETIME, ///< Skip based on the remaining lifetime
+ OCV_MAX_RELIABILITY, ///< Skip based on the maximum reliability
OCV_END
};