gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 10:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r23859) -Fix: Inserting conditional orders for ships checked the wrong orders wrt. maximum distance.

Browse Source
This commit is contained in:
frosch 2012-01-27 22:08:51 +00:00
parent 0b4d40b30e
commit a60f19ae14
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/order_cmd.cpp
View File

@ -812,7 +812,14 @@ CommandCost CmdInsertOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
if (++n == sel_ord && prev != NULL) break; if (++n == sel_ord && prev != NULL) break;
} }
if (prev != NULL) { if (prev != NULL) {
uint dist = GetOrderDistance(prev, &new_order, v); uint dist;
if (new_order.IsType(OT_CONDITIONAL)) {
/* The order is not yet inserted, so we have to do the first iteration here. */
dist = GetOrderDistance(prev, v->GetOrder(new_order.GetConditionSkipToOrder()), v);
} else {
dist = GetOrderDistance(prev, &new_order, v);
}
if (dist >= 130) { if (dist >= 130) {
return_cmd_error(STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION); return_cmd_error(STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION);
} }