cpp/openttd-patchpack/source Changeset - r3699:fbc996c74eb0

Changeset - r3699:fbc996c74eb0

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

matthijs - 18 years ago 2006-05-01 09:34:23
matthijs@openttd.org

(svn r4640) - Add: IsValidDiagDirection, IsValidDirection and IsValidAxis functions.
- Codechange: Use IsValidDiagDirection() in CmdBuildRoadStop().

2 files changed with 18 insertions and 2 deletions:

direction.h

station_cmd.c

0 comments (0 inline, 0 general)

direction.h

➞

Show inline comments

@@ @@ -93,7 +93,8 @@ static inline Direction DiagDirToDir(Dia @@
 /* 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 AxisToDiagDi @@
 	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

station_cmd.c

➞

Show inline comments

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

0 comments (0 inline, 0 general)