diff options
| author | celestar <celestar@openttd.org> | 2007-01-10 14:52:10 +0000 |
|---|---|---|
| committer | celestar <celestar@openttd.org> | 2007-01-10 14:52:10 +0000 |
| commit | f3b4cf10b651e131ea37d8bdf0d1aa6e74405029 (patch) | |
| tree | 4ae5a97107b0d1cdc6508b18a384dd05317cba8a | |
| parent | 52d14b3dd0c4d17fe4d13df7ad9014c4ba3827e8 (diff) | |
| download | openttd-f3b4cf10b651e131ea37d8bdf0d1aa6e74405029.tar.xz | |
(svn r8027) -Fix (FS#486) If a pause command is issues, it will now pause the game even if shift is pressed instead of giving a cost estimate of 0. This fixes a problem where the server does not pause_on_join when the player on the interactive server has the shift button pressed. (Thanks to pvz for the report and the fix)
| -rw-r--r-- | src/command.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/command.c b/src/command.c index f99371946..ad93fc643 100644 --- a/src/command.c +++ b/src/command.c @@ -463,7 +463,11 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback, _docommand_recursive = 1; // cost estimation only? - if (!IsGeneratingWorld() && _shift_pressed && IsLocalPlayer() && !(cmd & (CMD_NETWORK_COMMAND | CMD_SHOW_NO_ERROR))) { + if (!IsGeneratingWorld() && + _shift_pressed && + IsLocalPlayer() && + !(cmd & (CMD_NETWORK_COMMAND | CMD_SHOW_NO_ERROR)) && + (cmd & 0xFF) != CMD_PAUSE) { // estimate the cost. res = proc(tile, flags, p1, p2); if (CmdFailed(res)) { |