summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-08-02 22:53:05 +0000
committerrubidium <rubidium@openttd.org>2008-08-02 22:53:05 +0000
commit06ae82f7ebb59fbf4874f447814468b4df88b3dd (patch)
tree2236ebe6ed7e00e4b78a91ce8819d27dde9166f3 /src
parentbf33da38ebfcc2f346529fd0751d6fe5fde3155a (diff)
downloadopenttd-06ae82f7ebb59fbf4874f447814468b4df88b3dd.tar.xz
(svn r13949) -Codechange [YAPP]: Declare the functions for processing conditional orders as non-static. (michi_cc)
Diffstat (limited to 'src')
-rw-r--r--src/order_cmd.cpp4
-rw-r--r--src/order_func.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index df84553ed..07154ee1f 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -1667,7 +1667,7 @@ static bool OrderConditionCompare(OrderConditionComparator occ, int variable, in
* @param v the vehicle to update
* @return index of next order to jump to, or INVALID_VEH_ORDER_ID to use the next order
*/
-static VehicleOrderID ProcessConditionalOrder(const Order *order, const Vehicle *v)
+VehicleOrderID ProcessConditionalOrder(const Order *order, const Vehicle *v)
{
if (order->GetType() != OT_CONDITIONAL) return INVALID_VEH_ORDER_ID;
@@ -1693,7 +1693,7 @@ static VehicleOrderID ProcessConditionalOrder(const Order *order, const Vehicle
* @param order the order the vehicle currently has
* @param v the vehicle to update
*/
-static bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth = 0)
+bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth)
{
switch (order->GetType()) {
case OT_GOTO_STATION:
diff --git a/src/order_func.h b/src/order_func.h
index be2ceea11..1e7c051bb 100644
--- a/src/order_func.h
+++ b/src/order_func.h
@@ -37,6 +37,8 @@ bool VehicleHasDepotOrders(const Vehicle *v);
void CheckOrders(const Vehicle*);
void DeleteVehicleOrders(Vehicle *v);
bool ProcessOrders(Vehicle *v);
+bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth = 0);
+VehicleOrderID ProcessConditionalOrder(const Order *order, const Vehicle *v);
void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int width);