gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability

Browse Source
This commit is contained in:
tron 2005-03-28 07:25:36 +00:00
parent ae359d0d02
commit bba102e624
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
rail_cmd.c
View File

@ -113,29 +113,36 @@ static bool CheckTrackCombination(byte map5, byte trackbits, byte flags)
{
_error_message = STR_1001_IMPOSSIBLE_TRACK_COMBINATION;
if ((map5&RAIL_TYPE_MASK) == RAIL_TYPE_SIGNALS) {
switch (map5 & RAIL_TYPE_MASK) {
case RAIL_TYPE_NORMAL:
if (map5 & trackbits) {
_error_message = STR_1007_ALREADY_BUILT;
return false;
}
if (map5 & trackbits) {
_error_message = STR_1007_ALREADY_BUILT;
if (flags & DC_NO_RAIL_OVERLAP) {
// Computer players are not allowed to intersect pieces of rail.
map5 |= trackbits;
return
map5 == (RAIL_BIT_UPPER | RAIL_BIT_LOWER) ||
map5 == (RAIL_BIT_LEFT | RAIL_BIT_RIGHT);
} else {
return true;
}
case RAIL_TYPE_SIGNALS:
if (map5 & trackbits) {
_error_message = STR_1007_ALREADY_BUILT;
return false;
}
map5 |= trackbits;
return
map5 == (RAIL_TYPE_SIGNALS | RAIL_BIT_UPPER | RAIL_BIT_LOWER) ||
map5 == (RAIL_TYPE_SIGNALS | RAIL_BIT_LEFT | RAIL_BIT_RIGHT);
default:
return false;
}
map5 |= trackbits;
return (map5 == (RAIL_TYPE_SIGNALS|RAIL_BIT_UPPER|RAIL_BIT_LOWER) || map5 == (RAIL_TYPE_SIGNALS|RAIL_BIT_LEFT|RAIL_BIT_RIGHT));
} else if ((map5&RAIL_TYPE_MASK) == RAIL_TYPE_NORMAL) {
_error_message = STR_1007_ALREADY_BUILT;
if (map5 & trackbits)
return false;
// Computer players are not allowed to intersect pieces of rail.
if (!(flags&DC_NO_RAIL_OVERLAP))
return true;
map5 |= trackbits;
return (map5 == (RAIL_BIT_UPPER|RAIL_BIT_LOWER) || map5 == (RAIL_BIT_LEFT|RAIL_BIT_RIGHT));
} else {
return false;
}
}