equal
deleted
inserted
replaced
307 } |
307 } |
308 } |
308 } |
309 } |
309 } |
310 |
310 |
311 // not found |
311 // not found |
312 order.type = OT_NOTHING; |
312 order.Free(); |
313 order.flags = 0; |
|
314 order.dest = INVALID_STATION; |
313 order.dest = INVALID_STATION; |
315 return order; |
314 return order; |
316 } |
315 } |
317 |
316 |
318 static bool HandleOrderVehClick(const Vehicle *v, const Vehicle *u, Window *w) |
317 static bool HandleOrderVehClick(const Vehicle *v, const Vehicle *u, Window *w) |
345 // check if we're clicking on a vehicle first.. clone orders in that case. |
344 // check if we're clicking on a vehicle first.. clone orders in that case. |
346 u = CheckMouseOverVehicle(); |
345 u = CheckMouseOverVehicle(); |
347 if (u != NULL && HandleOrderVehClick(v, u, w)) return; |
346 if (u != NULL && HandleOrderVehClick(v, u, w)) return; |
348 |
347 |
349 cmd = GetOrderCmdFromTile(v, tile); |
348 cmd = GetOrderCmdFromTile(v, tile); |
350 if (cmd.type == OT_NOTHING) return; |
349 if (!cmd.IsValid()) return; |
351 |
350 |
352 if (DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), PackOrder(&cmd), NULL, CMD_INSERT_ORDER | CMD_MSG(STR_8833_CAN_T_INSERT_NEW_ORDER))) { |
351 if (DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), PackOrder(&cmd), NULL, CMD_INSERT_ORDER | CMD_MSG(STR_8833_CAN_T_INSERT_NEW_ORDER))) { |
353 if (WP(w,order_d).sel != -1) WP(w,order_d).sel++; |
352 if (WP(w,order_d).sel != -1) WP(w,order_d).sel++; |
354 ResetObjectToPlace(); |
353 ResetObjectToPlace(); |
355 } |
354 } |