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

(svn r16262) -Fix [NoAI]: Check slopes passed to the API better for validity

release/1.0
yexo 2009-05-09 19:45:02 +00:00
parent f8944cc9b3
commit 8d22e4bec3
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ai/api/ai_tile.cpp
View File

@ -73,14 +73,14 @@
/* static */ bool AITile::IsSteepSlope(Slope slope) /* static */ bool AITile::IsSteepSlope(Slope slope)
{ {
if (slope == SLOPE_INVALID) return false; if ((slope & ~(SLOPE_ELEVATED | SLOPE_STEEP | SLOPE_HALFTILE_MASK)) != 0) return false;
return ::IsSteepSlope((::Slope)slope); return ::IsSteepSlope((::Slope)slope);
} }
/* static */ bool AITile::IsHalftileSlope(Slope slope) /* static */ bool AITile::IsHalftileSlope(Slope slope)
{ {
if (slope == SLOPE_INVALID) return false; if ((slope & ~(SLOPE_ELEVATED | SLOPE_STEEP | SLOPE_HALFTILE_MASK)) != 0) return false;
return ::IsHalftileSlope((::Slope)slope); return ::IsHalftileSlope((::Slope)slope);
} }
@ -124,9 +124,7 @@
/* static */ AITile::Slope AITile::GetComplementSlope(Slope slope) /* static */ AITile::Slope AITile::GetComplementSlope(Slope slope)
{ {
if (slope == SLOPE_INVALID) return SLOPE_INVALID; if ((slope & ~SLOPE_ELEVATED) != 0) return SLOPE_INVALID;
if (IsSteepSlope(slope)) return SLOPE_INVALID;
if (IsHalftileSlope(slope)) return SLOPE_INVALID;
return (Slope)::ComplementSlope((::Slope)slope); return (Slope)::ComplementSlope((::Slope)slope);
} }