amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-26 00:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: use EnumIndexArray for Direction and DiagDirection indexed arrays

Browse Source
This commit is contained in:
Peter Nelson
2026-05-30 07:39:21 +01:00
committed by Peter Nelson
parent d68553bbd6
commit 81bdc44d1a
28 changed files with 267 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/map.cpp
+18 -18
View File
@@ -138,24 +138,24 @@ extern const AxisIndexArray<TileIndexDiffC> _tileoffs_by_axis{{{
}}};
/** 'Lookup table' for tile offsets given a DiagDirection */
extern const TileIndexDiffC _tileoffs_by_diagdir[] = {
{-1, 0}, ///< DIAGDIR_NE
{ 0, 1}, ///< DIAGDIR_SE
{ 1, 0}, ///< DIAGDIR_SW
{ 0, -1} ///< DIAGDIR_NW
};
extern const DiagDirectionIndexArray<TileIndexDiffC> _tileoffs_by_diagdir{{{
{-1, 0}, // DIAGDIR_NE
{ 0, 1}, // DIAGDIR_SE
{ 1, 0}, // DIAGDIR_SW
{ 0, -1}, // DIAGDIR_NW
}}};
/** 'Lookup table' for tile offsets given a Direction */
extern const TileIndexDiffC _tileoffs_by_dir[] = {
{-1, -1}, ///< DIR_N
{-1, 0}, ///< DIR_NE
{-1, 1}, ///< DIR_E
{ 0, 1}, ///< DIR_SE
{ 1, 1}, ///< DIR_S
{ 1, 0}, ///< DIR_SW
{ 1, -1}, ///< DIR_W
{ 0, -1} ///< DIR_NW
};
extern const DirectionIndexArray<TileIndexDiffC> _tileoffs_by_dir{{{
{-1, -1}, // DIR_N
{-1, 0}, // DIR_NE
{-1, 1}, // DIR_E
{ 0, 1}, // DIR_SE
{ 1, 1}, // DIR_S
{ 1, 0}, // DIR_SW
{ 1, -1}, // DIR_W
{ 0, -1}, // DIR_NW
}}};
/**
* Gets the Manhattan distance between the two given tiles.
@@ -280,8 +280,8 @@ uint GetClosestWaterDistance(TileIndex tile, bool water)
/* going counter-clockwise around this square */
for (DiagDirection dir = DIAGDIR_BEGIN; dir < DIAGDIR_END; dir++) {
static const int8_t ddx[DIAGDIR_END] = { -1, 1, 1, -1};
static const int8_t ddy[DIAGDIR_END] = { 1, 1, -1, -1};
static constexpr DiagDirectionIndexArray<int8_t> ddx{-1, 1, 1, -1};
static constexpr DiagDirectionIndexArray<int8_t> ddy{ 1, 1, -1, -1};
int dx = ddx[dir];
int dy = ddy[dir];