cpp/openttd-patchpack/source Changeset - r10604:3c1ed1b55521

Changeset - r10604:3c1ed1b55521

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 15 years ago 2009-01-07 13:26:48
rubidium@openttd.org

(svn r14889) -Codechange: replace some magic numbers with constants.

2 files changed with 14 insertions and 10 deletions:

src/command.cpp

src/command_type.h

0 comments (0 inline, 0 general)

src/command.cpp

➞

Show inline comments

@@ @@ -350,7 +350,7 @@ static const Command _command_proc_table @@
  */
 bool IsValidCommand(uint32 cmd)
+{
-	cmd &= 0xFF;
+	cmd &= CMD_ID_MASK;
 	return
 		cmd < lengthof(_command_proc_table) &&
@@ @@ -358,7 +358,7 @@ bool IsValidCommand(uint32 cmd) @@
+}
 /*!
- * This function mask the parameter with 0xFF and returns
+ * This function mask the parameter with CMD_ID_MASK and returns
  * the flags which belongs to the given command.
+ *
  * @param cmd The integer value of the command
@@ @@ -368,7 +368,7 @@ byte GetCommandFlags(uint32 cmd) @@
+{
 	assert(IsValidCommand(cmd));
-	return _command_proc_table[cmd & 0xFF].flags;
+	return _command_proc_table[cmd & CMD_ID_MASK].flags;
+}
 static int _docommand_recursive = 0;
@@ @@ -503,8 +503,9 @@ bool DoCommandP(TileIndex tile, uint32 p @@
 	if (cmd & CMD_NO_WATER) flags |= DC_NO_WATER;
 	/* get pointer to command handler */
 	assert((cmd & 0xFF) < lengthof(_command_proc_table));
 	proc = _command_proc_table[cmd & 0xFF].proc;
 	byte cmd_id = cmd & CMD_ID_MASK;
 	assert(cmd_id < lengthof(_command_proc_table));
 	proc = _command_proc_table[cmd_id].proc;
 	if (proc == NULL) return false;
 	if (GetCommandFlags(cmd) & CMD_AUTO) flags |= DC_AUTO;
@@ @@ -521,11 +522,12 @@ bool DoCommandP(TileIndex tile, uint32 p @@
 	 * CMD_CLONE_VEHICLE: Both building new vehicles and refitting them can be
 	 * influenced by newgrf callbacks, which makes it impossible to accurately
 	 * estimate the cost of cloning a vehicle. */
 	notest =
 		(cmd & 0xFF) == CMD_CLEAR_AREA ||
 		(cmd & 0xFF) == CMD_LEVEL_LAND ||
 		(cmd & 0xFF) == CMD_REMOVE_LONG_ROAD ||
 		(cmd & 0xFF) == CMD_CLONE_VEHICLE;
 		cmd_id == CMD_CLEAR_AREA ||
 		cmd_id == CMD_LEVEL_LAND ||
 		cmd_id == CMD_REMOVE_LONG_ROAD ||
 		cmd_id == CMD_CLONE_VEHICLE;
 	_docommand_recursive = 1;
@@ @@ -534,7 +536,7 @@ bool DoCommandP(TileIndex tile, uint32 p @@
 			_shift_pressed &&
 			IsLocalCompany() &&
 			!(cmd & (CMD_NETWORK_COMMAND | CMD_SHOW_NO_ERROR)) &&
-			(cmd & 0xFF) != CMD_PAUSE) {
+			cmd_id != CMD_PAUSE) {
 		/* estimate the cost. */
 		SetTownRatingTestMode(true);
 		res = proc(tile, flags, p1, p2, text);

src/command_type.h

➞

Show inline comments

@@ @@ -328,6 +328,8 @@ 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_FLAGS_MASK            = 0xFF00, ///< mask for all command flags
 	CMD_ID_MASK               = 0x00FF, ///< mask for the command ID
 };
 /**

0 comments (0 inline, 0 general)