mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14465) -Codechange: minor code style of command.cpp.

release/0.7
rubidium 2008-10-14 18:49:21 +00:00
parent 272b2ef0e9
commit 0c5c199f2f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/command.cpp
View File

@ -349,7 +349,7 @@ static const Command _command_proc_table[] = {
* @param cmd The integervalue of a command * @param cmd The integervalue of a command
* @return true if the command is valid (and got a CommandProc function) * @return true if the command is valid (and got a CommandProc function)
*/ */
bool IsValidCommand(uint cmd) bool IsValidCommand(uint32 cmd)
{ {
cmd &= 0xFF; cmd &= 0xFF;
@ -364,12 +364,11 @@ bool IsValidCommand(uint cmd)
* *
* @param cmd The integer value of the command * @param cmd The integer value of the command
* @return The flags for this command * @return The flags for this command
* @bug integervalues which are less equals 0xFF and greater than the
* size of _command_proc_table can result in an index out of bounce
* error (which doesn't happend anyway). Check function #IsValidCommand(). (Progman)
*/ */
byte GetCommandFlags(uint cmd) byte GetCommandFlags(uint32 cmd)
{ {
assert(IsValidCommand(cmd));
return _command_proc_table[cmd & 0xFF].flags; return _command_proc_table[cmd & 0xFF].flags;
} }
@ -389,7 +388,6 @@ static int _docommand_recursive = 0;
CommandCost DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint32 procc) CommandCost DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint32 procc)
{ {
CommandCost res; CommandCost res;
CommandProc *proc;
/* Do not even think about executing out-of-bounds tile-commands */ /* Do not even think about executing out-of-bounds tile-commands */
if (!IsValidTile(tile)) { if (!IsValidTile(tile)) {
@ -397,7 +395,7 @@ CommandCost DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint32
return CMD_ERROR; return CMD_ERROR;
} }
proc = _command_proc_table[procc].proc; CommandProc *proc = _command_proc_table[procc].proc;
if (_docommand_recursive == 0) _error_message = INVALID_STRING_ID; if (_docommand_recursive == 0) _error_message = INVALID_STRING_ID;