equal
deleted
inserted
replaced
48 order.type = GB(packed, 0, 4); |
48 order.type = GB(packed, 0, 4); |
49 order.flags = GB(packed, 4, 4); |
49 order.flags = GB(packed, 4, 4); |
50 order.dest = GB(packed, 8, 8); |
50 order.dest = GB(packed, 8, 8); |
51 order.next = NULL; |
51 order.next = NULL; |
52 |
52 |
|
53 order.refit_cargo = CT_NO_REFIT; |
|
54 order.refit_subtype = 0; |
|
55 order.index = 0; // avoid compiler warning |
|
56 |
53 // Sanity check |
57 // Sanity check |
54 // TTD stores invalid orders as OT_NOTHING with non-zero flags/station |
58 // TTD stores invalid orders as OT_NOTHING with non-zero flags/station |
55 if (order.type == OT_NOTHING && (order.flags != 0 || order.dest != 0)) { |
59 if (order.type == OT_NOTHING && (order.flags != 0 || order.dest != 0)) { |
56 order.type = OT_DUMMY; |
60 order.type = OT_DUMMY; |
57 order.flags = 0; |
61 order.flags = 0; |
58 } |
62 } |
59 |
|
60 order.refit_cargo = CT_INVALID; |
|
61 order.refit_subtype = 0; |
|
62 |
63 |
63 return order; |
64 return order; |
64 } |
65 } |
65 |
66 |
66 /** |
67 /** |
74 order.type = GB(packed, 0, 4); |
75 order.type = GB(packed, 0, 4); |
75 order.flags = GB(packed, 4, 4); |
76 order.flags = GB(packed, 4, 4); |
76 order.dest = GB(packed, 8, 8); |
77 order.dest = GB(packed, 8, 8); |
77 order.next = NULL; |
78 order.next = NULL; |
78 order.index = 0; // avoid compiler warning |
79 order.index = 0; // avoid compiler warning |
79 order.refit_cargo = CT_INVALID; |
80 order.refit_cargo = CT_NO_REFIT; |
80 order.refit_subtype = 0; |
81 order.refit_subtype = 0; |
81 return order; |
82 return order; |
82 } |
83 } |
83 |
84 |
84 /** |
85 /** |
126 OrderID index = order->index; |
127 OrderID index = order->index; |
127 |
128 |
128 memset(order, 0, sizeof(*order)); |
129 memset(order, 0, sizeof(*order)); |
129 order->index = index; |
130 order->index = index; |
130 order->next = NULL; |
131 order->next = NULL; |
|
132 order->refit_cargo = CT_NO_REFIT; |
|
133 order->refit_subtype = 0; |
131 |
134 |
132 return order; |
135 return order; |
133 } |
136 } |
134 } |
137 } |
135 |
138 |
149 { |
152 { |
150 order->type = data.type; |
153 order->type = data.type; |
151 order->flags = data.flags; |
154 order->flags = data.flags; |
152 order->dest = data.dest; |
155 order->dest = data.dest; |
153 |
156 |
154 order->refit_cargo = CT_NO_REFIT; |
157 order->refit_cargo = data.refit_cargo; |
155 order->refit_subtype = CT_NO_REFIT; |
158 order->refit_subtype = data.refit_subtype; |
156 } |
159 } |
157 |
160 |
158 |
161 |
159 /** |
162 /** |
160 * Delete all news items regarding defective orders about a vehicle |
163 * Delete all news items regarding defective orders about a vehicle |