From ac66e3e28f35c6939d3af68d1f0e26eb9b34e377 Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 20 Jul 2005 15:29:28 +0000 Subject: (svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read --- clear_cmd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'clear_cmd.c') diff --git a/clear_cmd.c b/clear_cmd.c index 773d05867..38f1ccd68 100644 --- a/clear_cmd.c +++ b/clear_cmd.c @@ -470,7 +470,7 @@ void DrawHillyLandTile(TileInfo *ti) if (ti->tileh != 0) { DrawGroundSprite(0xFA0 + _tileh_to_sprite[ti->tileh]); } else { - DrawGroundSprite(_landscape_clear_sprites[((ti->x^ti->y) >> 4) & 0x7]); + DrawGroundSprite(_landscape_clear_sprites[GB(ti->x ^ ti->y, 4, 3)]); } } @@ -485,11 +485,11 @@ void DrawClearLandFence(TileInfo *ti, byte img) } if (img & 0x38) { - DrawGroundSpriteAt(_clear_land_fence_sprites_1[((img >> 3) & 7) - 1] + _fence_mod_by_tileh[ti->tileh], ti->x, ti->y, z); + DrawGroundSpriteAt(_clear_land_fence_sprites_1[GB(img, 3, 3) - 1] + _fence_mod_by_tileh[ti->tileh], ti->x, ti->y, z); } if (img & 0x7) { - DrawGroundSpriteAt(_clear_land_fence_sprites_1[(img & 7) - 1] + _fence_mod_by_tileh_2[ti->tileh], ti->x, ti->y, z); + DrawGroundSpriteAt(_clear_land_fence_sprites_1[GB(img, 0, 3) - 1] + _fence_mod_by_tileh_2[ti->tileh], ti->x, ti->y, z); } } @@ -785,7 +785,7 @@ void GenerateClearTile(void) r = Random(); tile = RandomTileSeed(r); if (IsTileType(tile, MP_CLEAR)) { - j = ((r >> 16) & 0xF) + 5; + j = GB(r, 16, 4) + 5; for(;;) { TileIndex tile_new; -- cgit v1.2.3-54-g00ecf