summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-01-07 14:58:43 +0000
committerrubidium <rubidium@openttd.org>2009-01-07 14:58:43 +0000
commitf5b23103d7f73f1b5e5828133f20e8914f7e2a3e (patch)
tree1d38a81e79537c236e726e6db92d13409cf818e3
parent5fcf07f3881b76fcccca7917ad7773ef46a75625 (diff)
downloadopenttd-f5b23103d7f73f1b5e5828133f20e8914f7e2a3e.tar.xz
(svn r14896) -Codechange: remove an unused constant and the related dead code.
-rw-r--r--src/command.cpp2
-rw-r--r--src/command_type.h5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/command.cpp b/src/command.cpp
index 37834fb66..03a7d3c80 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -517,7 +517,7 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallbac
if (!IsGeneratingWorld() &&
_shift_pressed &&
IsLocalCompany() &&
- !(cmd & (CMD_NETWORK_COMMAND | CMD_SHOW_NO_ERROR)) &&
+ !(cmd & CMD_NETWORK_COMMAND) &&
cmd_id != CMD_PAUSE) {
/* estimate the cost. */
SetTownRatingTestMode(true);
diff --git a/src/command_type.h b/src/command_type.h
index ccbd3704d..ccc0df26c 100644
--- a/src/command_type.h
+++ b/src/command_type.h
@@ -324,9 +324,8 @@ enum {
* This enumeration defines some flags which are binary-or'ed on a command.
*/
enum {
- CMD_NETWORK_COMMAND = 0x0800, ///< execute the command without sending it on the network
- CMD_NO_TEST_IF_IN_NETWORK = 0x1000, ///< When enabled, the command will bypass the no-DC_EXEC round if in network
- CMD_SHOW_NO_ERROR = 0x2000, ///< do not show the error message
+ CMD_NETWORK_COMMAND = 0x0100, ///< execute the command without sending it on the network
+ CMD_NO_TEST_IF_IN_NETWORK = 0x0200, ///< When enabled, the command will bypass the no-DC_EXEC round if in network
CMD_FLAGS_MASK = 0xFF00, ///< mask for all command flags
CMD_ID_MASK = 0x00FF, ///< mask for the command ID
};