From 5221f35182beb396615dc8bcd2e902828a83aa65 Mon Sep 17 00:00:00 2001 From: truelight Date: Sun, 12 Dec 2004 15:43:55 +0000 Subject: [PATCH] (svn r1025) -Fix: [Network] [ 1083687 ] Sending to depot caused desync because the new pathfinder uses a random, and the goto_depot uses the new pathfinder (if enabled) --- command.c | 1 - train_gui.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/command.c b/command.c index 394ad6f121..c9bcdb59ab 100644 --- a/command.c +++ b/command.c @@ -422,7 +422,6 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback, (cmd & 0xFF) == CMD_CLEAR_AREA || (cmd & 0xFF) == CMD_CONVERT_RAIL || (cmd & 0xFF) == CMD_LEVEL_LAND || - (cmd & 0xFF) == CMD_TRAIN_GOTO_DEPOT || (cmd & 0xFF) == CMD_REMOVE_ROAD; _docommand_recursive = 1; diff --git a/train_gui.c b/train_gui.c index e05778ea93..92175b13e2 100644 --- a/train_gui.c +++ b/train_gui.c @@ -831,7 +831,8 @@ static void TrainViewWndProc(Window *w, WindowEvent *e) ScrollMainWindowTo(v->x_pos, v->y_pos); break; case 6: /* goto depot */ - DoCommandP(v->tile, v->index, 0, NULL, CMD_TRAIN_GOTO_DEPOT | CMD_MSG(STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT)); + /* TrainGotoDepot has a nice randomizer in the pathfinder, which causes desyncs... */ + DoCommandP(v->tile, v->index, 0, NULL, CMD_TRAIN_GOTO_DEPOT | CMD_NO_TEST_IF_IN_NETWORK | CMD_MSG(STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT)); break; case 7: /* force proceed */ DoCommandP(v->tile, v->index, 0, NULL, CMD_FORCE_TRAIN_PROCEED | CMD_MSG(STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL));