Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r4640) - Add: IsValidDiagDirection, IsValidDirection and IsValidAxis functions.

Browse Source 
- Codechange: Use IsValidDiagDirection() in CmdBuildRoadStop().
This commit is contained in:
matthijs 2006-05-01 09:34:23 +00:00
parent d76279144d
commit 6756304fc1
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
direction.h
View File

@ -93,7 +93,8 @@ static inline Direction DiagDirToDir(DiagDirection dir)
/* the 2 axis */
typedef enum Axis {
AXIS_X = 0,
AXIS_Y = 1
AXIS_Y = 1,
AXIS_END
} Axis;
@ -112,4 +113,19 @@ static inline DiagDirection AxisToDiagDir(Axis a)
return (DiagDirection)(2 - a);
}
static inline bool IsValidDiagDirection(DiagDirection d)
{
return d < DIAGDIR_END;
}
static inline bool IsValidDirection(DiagDirection d)
{
return d < DIR_END;
}
static inline bool IsValidAxis(DiagDirection d)
{
return d < AXIS_END;
}
#endif

2
station_cmd.c
View File

@ -1360,7 +1360,7 @@ int32 CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
bool type = !!p2;
/* Saveguard the parameters */
if (p1 > 3) return CMD_ERROR;
if (!IsValidDiagDirection(p1)) return CMD_ERROR;
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);