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

(svn r11031) -Codechange: reduce the amount of duplication of bit counting functions. Based on patches by skidd13, SmatZ and Belugas.

Browse Source
This commit is contained in:
rubidium
2007-09-01 08:31:36 +00:00
parent 0df355bbda
commit 56ab253307
7 changed files with 30 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/road_cmd.cpp
View File

@@ -33,19 +33,6 @@
#include "tunnel_map.h"
#include "misc/autoptr.hpp"
static uint CountRoadBits(RoadBits r)
{
uint count = 0;
if (r & ROAD_NW) ++count;
if (r & ROAD_SW) ++count;
if (r & ROAD_SE) ++count;
if (r & ROAD_NE) ++count;
return count;
}
bool CheckAllowRemoveRoad(TileIndex tile, RoadBits remove, Owner owner, bool *edge_road, RoadType rt)
{
RoadBits present;
@@ -225,7 +212,7 @@ CommandCost CmdRemoveRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
MarkTileDirtyByTile(tile);
}
}
return CommandCost(CountRoadBits(c) * _price.remove_road);
return CommandCost(COUNTBITS(c) * _price.remove_road);
}
case ROAD_TILE_CROSSING: {
@@ -487,7 +474,7 @@ do_clear:;
pieces &= ComplementRoadBits(existing);
}
cost.AddCost(CountRoadBits(pieces) * _price.build_road);
cost.AddCost(COUNTBITS(pieces) * _price.build_road);
if (IsTileType(tile, MP_TUNNELBRIDGE)) {
/* Pay for *every* tile of the bridge or tunnel */
cost.MultiplyCost(DistanceManhattan(IsTunnel(tile) ? GetOtherTunnelEnd(tile) : GetOtherBridgeEnd(tile), tile));