petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read

Browse Source
This commit is contained in:
tron
2005-07-20 15:29:28 +00:00
parent f432314fa9
commit ac66e3e28f
23 changed files with 130 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
town_cmd.c
View File

@@ -769,9 +769,10 @@ static int GrowTownAtRoad(Town *t, TileIndex tile)
static int GenRandomRoadBits(void)
{
uint32 r = Random();
int a = r&3, b = (r >> 8) & 3;
uint a = GB(r, 0, 2);
uint b = GB(r, 8, 2);
if (a == b) b ^= 2;
return (1<<a)+(1<<b);
return (1 << a) + (1 << b);
}
// Grow the town
@@ -1307,7 +1308,7 @@ static void DoBuildTownHouse(Town *t, TileIndex tile)
ChangePopulation(t, _housetype_population[house]);
// Initial value for map5.
m5 = (r >> 16) & 0x3F;
m5 = GB(r, 16, 6);
}
assert(IsTileType(tile, MP_CLEAR));