2248 } |
2248 } |
2249 } |
2249 } |
2250 |
2250 |
2251 if (HASBIT(t.flags, OFB_PART_OF_ORDERS)) { |
2251 if (HASBIT(t.flags, OFB_PART_OF_ORDERS)) { |
2252 /* Part of orders */ |
2252 /* Part of orders */ |
2253 if (v->type == VEH_TRAIN) v->u.rail.days_since_order_progr = 0; |
|
2254 v->cur_order_index++; |
2253 v->cur_order_index++; |
2255 } else if (HASBIT(t.flags, OFB_HALT_IN_DEPOT)) { |
2254 } else if (HASBIT(t.flags, OFB_HALT_IN_DEPOT)) { |
2256 /* Force depot visit */ |
2255 /* Force depot visit */ |
2257 v->vehstatus |= VS_STOPPED; |
2256 v->vehstatus |= VS_STOPPED; |
2258 if (v->owner == _local_player) { |
2257 if (v->owner == _local_player) { |
2744 SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleRail, force_proceed), SLE_UINT8), |
2743 SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleRail, force_proceed), SLE_UINT8), |
2745 SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleRail, railtype), SLE_UINT8), |
2744 SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleRail, railtype), SLE_UINT8), |
2746 SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleRail, track), SLE_UINT8), |
2745 SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleRail, track), SLE_UINT8), |
2747 |
2746 |
2748 SLE_CONDVARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleRail, flags), SLE_UINT8, 2, SL_MAX_VERSION), |
2747 SLE_CONDVARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleRail, flags), SLE_UINT8, 2, SL_MAX_VERSION), |
2749 SLE_CONDVARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleRail, days_since_order_progr), SLE_UINT16, 2, SL_MAX_VERSION), |
2748 SLE_CONDNULL(2, 2, 59), |
2750 |
2749 |
2751 SLE_CONDNULL(2, 2, 19), |
2750 SLE_CONDNULL(2, 2, 19), |
2752 /* reserve extra space in savegame here. (currently 11 bytes) */ |
2751 /* reserve extra space in savegame here. (currently 11 bytes) */ |
2753 SLE_CONDNULL(11, 2, SL_MAX_VERSION), |
2752 SLE_CONDNULL(11, 2, SL_MAX_VERSION), |
2754 |
2753 |