dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r3655) Simplify a boolean expression and turn 3 if-cascades into switches

Browse Source
This commit is contained in:
tron
2006-02-23 07:26:49 +00:00
parent ae02bd6506
commit ce71415584
1 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
road_cmd.c
View File

@@ -43,9 +43,9 @@ static bool HasTileRoadAt(TileIndex tile, int i)
break; break;
case MP_STATION: case MP_STATION:
b = _m[tile].m5; return
if (!IS_BYTE_INSIDE(b, 0x43, 0x43 + 8)) return false; IS_BYTE_INSIDE(_m[tile].m5, 0x43, 0x43 + 8) &&
return ((~(b - 0x43) & 3) == i); (~(_m[tile].m5 - 0x43) & 3) == i;
case MP_TUNNELBRIDGE: case MP_TUNNELBRIDGE:
mask = GetRoadBitsByTile(tile); mask = GetRoadBitsByTile(tile);
@@ -373,14 +373,22 @@ int32 CmdBuildRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
switch (ti.type) { switch (ti.type) {
case MP_STREET: case MP_STREET:
if (!(ti.map5 & 0xF0)) { switch (GB(ti.map5, 4, 4)) {
if ((pieces & (byte)ti.map5) == pieces) case 0: // normal road
return_cmd_error(STR_1007_ALREADY_BUILT); if ((pieces & (byte)ti.map5) == pieces) {
existing = ti.map5; return_cmd_error(STR_1007_ALREADY_BUILT);
} else { }
if (!(ti.map5 & 0xE0) && pieces != ((ti.map5 & 8) ? 5 : 10)) existing = ti.map5;
return_cmd_error(STR_1007_ALREADY_BUILT); break;
goto do_clear;
case 1: // level crossing
if (pieces != (ti.map5 & 8 ? 5 : 10)) {
return_cmd_error(STR_1007_ALREADY_BUILT);
}
goto do_clear;
default: // depot
goto do_clear;
} }
break; break;
@@ -1108,27 +1116,31 @@ static const byte _road_trackbits[16] = {
static uint32 GetTileTrackStatus_Road(TileIndex tile, TransportType mode) static uint32 GetTileTrackStatus_Road(TileIndex tile, TransportType mode)
{ {
if (mode == TRANSPORT_RAIL) { switch (mode) {
if (!IsLevelCrossing(tile)) case TRANSPORT_RAIL:
return 0; if (!IsLevelCrossing(tile)) return 0;
return _m[tile].m5 & 8 ? 0x101 : 0x202; return _m[tile].m5 & 8 ? 0x101 : 0x202;
} else if (mode == TRANSPORT_ROAD) {
byte b = _m[tile].m5;
if ((b & 0xF0) == 0) {
/* Ordinary road */
if (!_road_special_gettrackstatus && GB(_m[tile].m4, 4, 3) >= 6)
return 0;
return _road_trackbits[b&0xF] * 0x101;
} else if (IsLevelCrossing(tile)) {
/* Crossing */
uint32 r = 0x101;
if (b&8) r <<= 1;
if (b&4) { case TRANSPORT_ROAD:
r *= 0x10001; switch (GB(_m[tile].m5, 4, 4)) {
case 0: // normal road
if (!_road_special_gettrackstatus && GB(_m[tile].m4, 4, 3) >= 6) {
return 0;
}
return _road_trackbits[GB(_m[tile].m5, 0, 4)] * 0x101;
case 1: { // level crossing
uint32 r = (_m[tile].m5 & 8 ? 0x202 : 0x101);
if (_m[tile].m5 & 4) r *= 0x10001;
return r;
}
default: // depot
break;
} }
return r; break;
}
default: break;
} }
return 0; return 0;
} }