Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r21533) -Codechange: replace some magic numbers with less magic constants

Browse Source
This commit is contained in:
rubidium 2010-12-16 23:24:30 +00:00
parent 01f924daad
commit 29fc9b1d48
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pathfinder/opf/opf_ship.cpp
View File

@ -118,16 +118,18 @@ static void OPFShipFollowTrack(TileIndex tile, DiagDirection direction, TrackPat
TPFModeShip(tpf, tile, direction); TPFModeShip(tpf, tile, direction);
} }
static const byte _ship_search_directions[6][4] = { /** Directions to search towards given track bits and the ship's enter direction. */
{ 0, 9, 2, 9 }, static const DiagDirection _ship_search_directions[6][4] = {
{ 9, 1, 9, 3 }, { DIAGDIR_NE, INVALID_DIAGDIR, DIAGDIR_SW, INVALID_DIAGDIR },
{ 9, 0, 3, 9 }, { INVALID_DIAGDIR, DIAGDIR_SE, INVALID_DIAGDIR, DIAGDIR_NW },
{ 1, 9, 9, 2 }, { INVALID_DIAGDIR, DIAGDIR_NE, DIAGDIR_NW, INVALID_DIAGDIR },
{ 3, 2, 9, 9 }, { DIAGDIR_SE, INVALID_DIAGDIR, INVALID_DIAGDIR, DIAGDIR_SW },
{ 9, 9, 1, 0 }, { DIAGDIR_NW, DIAGDIR_SW, INVALID_DIAGDIR, INVALID_DIAGDIR },
{ INVALID_DIAGDIR, INVALID_DIAGDIR, DIAGDIR_SE, DIAGDIR_NE },
}; };
static const byte _pick_shiptrack_table[6] = {1, 3, 2, 2, 0, 0}; /** Track to "direction (& 3)" mapping. */
static const byte _pick_shiptrack_table[6] = {DIR_NE, DIR_SE, DIR_E, DIR_E, DIR_N, DIR_N};
static uint FindShipTrack(const Ship *v, TileIndex tile, DiagDirection dir, TrackBits bits, TileIndex skiptile, Track *track) static uint FindShipTrack(const Ship *v, TileIndex tile, DiagDirection dir, TrackBits bits, TileIndex skiptile, Track *track)
{ {
@ -147,7 +149,7 @@ static uint FindShipTrack(const Ship *v, TileIndex tile, DiagDirection dir, Trac
pfs.best_bird_dist = UINT_MAX; pfs.best_bird_dist = UINT_MAX;
pfs.best_length = UINT_MAX; pfs.best_length = UINT_MAX;
OPFShipFollowTrack(tile, (DiagDirection)_ship_search_directions[i][dir], &pfs); OPFShipFollowTrack(tile, _ship_search_directions[i][dir], &pfs);
if (best_track != INVALID_TRACK) { if (best_track != INVALID_TRACK) {
if (pfs.best_bird_dist != 0) { if (pfs.best_bird_dist != 0) {