mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r13949) -Codechange [YAPP]: Declare the functions for processing conditional orders as non-static. (michi_cc)
This commit is contained in:
parent
a706766690
commit
0dfaa88c1e
|
@ -1667,7 +1667,7 @@ static bool OrderConditionCompare(OrderConditionComparator occ, int variable, in
|
||||||
* @param v the vehicle to update
|
* @param v the vehicle to update
|
||||||
* @return index of next order to jump to, or INVALID_VEH_ORDER_ID to use the next order
|
* @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;
|
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 order the order the vehicle currently has
|
||||||
* @param v the vehicle to update
|
* @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()) {
|
switch (order->GetType()) {
|
||||||
case OT_GOTO_STATION:
|
case OT_GOTO_STATION:
|
||||||
|
|
|
@ -37,6 +37,8 @@ bool VehicleHasDepotOrders(const Vehicle *v);
|
||||||
void CheckOrders(const Vehicle*);
|
void CheckOrders(const Vehicle*);
|
||||||
void DeleteVehicleOrders(Vehicle *v);
|
void DeleteVehicleOrders(Vehicle *v);
|
||||||
bool ProcessOrders(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);
|
void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int width);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue