Mercurial > hg > openttd

changeset 18046:f6611691a8e8 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22861) -Add: [NoAI] support the new conditional order introduced in r22858 (Zuu)
author yexo <yexo@openttd.org>
date Wed, 31 Aug 2011 22:41:10 +0000
parents 178f8fc55691
children 90467e7dd135
files src/ai/api/ai_order.cpp src/ai/api/ai_order.hpp src/ai/api/ai_order.hpp.sq
diffstat 3 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/ai/api/ai_order.cpp
+++ b/src/ai/api/ai_order.cpp
@@ -176,6 +176,7 @@
 		case OC_RELIABILITY:
 		case OC_MAX_SPEED:
 		case OC_AGE:
+		case OC_REMAINING_LIFETIME:
 			return compare >= CF_EQUALS && compare <= CF_MORE_EQUALS;
 
 		case OC_REQUIRES_SERVICE:
--- a/src/ai/api/ai_order.hpp
+++ b/src/ai/api/ai_order.hpp
@@ -87,13 +87,14 @@
 	 */
 	enum OrderCondition {
 		/* Order _is_ important, as it's based on OrderConditionVariable in order_type.h. */
-		OC_LOAD_PERCENTAGE,  ///< Skip based on the amount of load, value is in tons.
-		OC_RELIABILITY,      ///< Skip based on the reliability, value is percent (0..100).
-		OC_MAX_SPEED,        ///< Skip based on the maximum speed, value is in OpenTTD's internal speed unit, see AIEngine::GetMaxSpeed.
-		OC_AGE,              ///< Skip based on the age, value is in years.
-		OC_REQUIRES_SERVICE, ///< Skip when the vehicle requires service, no value.
-		OC_UNCONDITIONALLY,  ///< Always skip, no compare function, no value.
-		OC_INVALID = -1,     ///< An invalid condition, do not use.
+		OC_LOAD_PERCENTAGE,    ///< Skip based on the amount of load, value is in tons.
+		OC_RELIABILITY,        ///< Skip based on the reliability, value is percent (0..100).
+		OC_MAX_SPEED,          ///< Skip based on the maximum speed, value is in OpenTTD's internal speed unit, see AIEngine::GetMaxSpeed.
+		OC_AGE,                ///< Skip based on the age, value is in years.
+		OC_REQUIRES_SERVICE,   ///< Skip when the vehicle requires service, no value.
+		OC_UNCONDITIONALLY,    ///< Always skip, no compare function, no value.
+		OC_REMAINING_LIFETIME, ///< Skip based on the remaining lifetime
+		OC_INVALID = -1,       ///< An invalid condition, do not use.
 	};
 
 	/**
--- a/src/ai/api/ai_order.hpp.sq
+++ b/src/ai/api/ai_order.hpp.sq
@@ -66,6 +66,7 @@
 	SQAIOrder.DefSQConst(engine, AIOrder::OC_AGE,                                           "OC_AGE");
 	SQAIOrder.DefSQConst(engine, AIOrder::OC_REQUIRES_SERVICE,                              "OC_REQUIRES_SERVICE");
 	SQAIOrder.DefSQConst(engine, AIOrder::OC_UNCONDITIONALLY,                               "OC_UNCONDITIONALLY");
+	SQAIOrder.DefSQConst(engine, AIOrder::OC_REMAINING_LIFETIME,                            "OC_REMAINING_LIFETIME");
 	SQAIOrder.DefSQConst(engine, AIOrder::OC_INVALID,                                       "OC_INVALID");
 	SQAIOrder.DefSQConst(engine, AIOrder::CF_EQUALS,                                        "CF_EQUALS");
 	SQAIOrder.DefSQConst(engine, AIOrder::CF_NOT_EQUALS,                                    "CF_NOT_EQUALS");