openttd-ottdgrfs: comparison src/order

equal deleted inserted replaced

-:55c8267c933f
+:aefc131bf5ce
 *
 */
 Order UnpackOldOrder(uint16 packed)
 {
 	Order order;
-	order.type    = GB(packed, 0, 4);
+	order.type    = (OrderType)GB(packed, 0, 4);
 	order.flags   = GB(packed, 4, 4);
 	order.dest    = GB(packed, 8, 8);
 	order.next    = NULL;
 	order.refit_cargo   = CT_NO_REFIT;
 *
 */
 static Order UnpackVersion4Order(uint16 packed)
 {
 	Order order;
-	order.type  = GB(packed, 0, 4);
+	order.type  = (OrderType)GB(packed, 0, 4);
 	order.flags = GB(packed, 4, 4);
 	order.dest  = GB(packed, 8, 8);
 	order.next  = NULL;
 	order.index = 0; // avoid compiler warning
 	order.refit_cargo   = CT_NO_REFIT;
 			return_cmd_error(STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO);
 	}
 	if (flags & DC_EXEC) {
 		Vehicle *u;
-		Order *new = AllocateOrder();
+		Order *new_o = AllocateOrder();
-		AssignOrder(new, new_order);
+		AssignOrder(new_o, new_order);
 		/* Create new order and link in list */
 		if (v->orders == NULL) {
-			v->orders = new;
+			v->orders = new_o;
 		} else {
 			/* Try to get the previous item (we are inserting above the
 			    selected) */
 			Order *order = GetVehicleOrder(v, sel_ord - 1);
 			if (order == NULL && GetVehicleOrder(v, sel_ord) != NULL) {
 				/* There is no previous item, so we are altering v->orders itself
 				    But because the orders can be shared, we copy the info over
 				    the v->orders, so we don't have to change the pointers of
 				    all vehicles */
-				SwapOrders(v->orders, new);
+				SwapOrders(v->orders, new_o);
 				/* Now update the next pointers */
-				v->orders->next = new;
+				v->orders->next = new_o;
 			} else if (order == NULL) {
 				/* 'sel' is a non-existing order, add him to the end */
 				order = GetLastVehicleOrder(v);
-				order->next = new;
+				order->next = new_o;
 			} else {
 				/* Put the new order in between */
-				new->next = order->next;
+				new_o->next = order->next;
-				order->next = new;
+				order->next = new_o;
 			}
 		}
 		u = GetFirstVehicleFromSharedList(v);
 		DeleteOrderWarnings(u);
 				/* Toggle u->current_order "Full load" flag if it changed.
 				 * However, as the same flag is used for depot orders, check
 				 * whether we are not going to a depot as there are three
 				 * cases where the full load flag can be active and only
 				 * one case where the flag is used for depot orders. In the
-				 * other cases for the OrderType the flags are not used,
+				 * other cases for the OrderTypeByte the flags are not used,
 				 * so do not care and those orders should not be active
 				 * when this function is called.
 				 */
 				if (sel_ord == u->cur_order_index &&
 						u->current_order.type != OT_GOTO_DEPOT &&
 			SlObject(order, _order_desc);
 		}
 	}
 }
-const ChunkHandler _order_chunk_handlers[] = {
+extern const ChunkHandler _order_chunk_handlers[] = {
 	{ 'ORDR', Save_ORDR, Load_ORDR, CH_ARRAY | CH_LAST},
 };

branch	custombridgeheads
changeset 5650	aefc131bf5ce
parent 5649	55c8267c933f
child 6144	5a0ffbf27ced