Mercurial > hg > openttd

diff src/train_cmd.cpp @ 17693:cdeed5a57cdb draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added
author planetmaker <planetmaker@openttd.org>
date Wed, 18 May 2011 12:19:58 +0000
parents d5ff867052a5
children 7fc728e847d1
line wrap: on
line diff
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -2292,7 +2292,7 @@
 	TileIndex      old_dest_tile;
 	StationID      old_last_station_visited;
 	VehicleOrderID index;
-	bool           suppress_automatic_orders;
+	bool           suppress_implicit_orders;
 
 public:
 	VehicleOrderSaver(Train *_v) :
@@ -2301,7 +2301,7 @@
 		old_dest_tile(_v->dest_tile),
 		old_last_station_visited(_v->last_station_visited),
 		index(_v->cur_real_order_index),
-		suppress_automatic_orders(HasBit(_v->gv_flags, GVF_SUPPRESS_AUTOMATIC_ORDERS))
+		suppress_implicit_orders(HasBit(_v->gv_flags, GVF_SUPPRESS_IMPLICIT_ORDERS))
 	{
 	}
 
@@ -2310,7 +2310,7 @@
 		this->v->current_order = this->old_order;
 		this->v->dest_tile = this->old_dest_tile;
 		this->v->last_station_visited = this->old_last_station_visited;
-		SB(this->v->gv_flags, GVF_SUPPRESS_AUTOMATIC_ORDERS, 1, suppress_automatic_orders ? 1: 0);
+		SB(this->v->gv_flags, GVF_SUPPRESS_IMPLICIT_ORDERS, 1, suppress_implicit_orders ? 1: 0);
 	}
 
 	/**
@@ -3770,7 +3770,7 @@
 		return;
 	}
 
-	SetBit(v->gv_flags, GVF_SUPPRESS_AUTOMATIC_ORDERS);
+	SetBit(v->gv_flags, GVF_SUPPRESS_IMPLICIT_ORDERS);
 	v->current_order.MakeGoToDepot(depot, ODTFB_SERVICE);
 	v->dest_tile = tfdd.tile;
 	SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);