Files
@ r25895:573b0b525189
Branch filter:
Location: cpp/openttd-patchpack/source/src/tilearea_type.h - annotation
r25895:573b0b525189
6.3 KiB
text/x-c
Fix: [Actions] changelog assumed major.minor.patch versioning (#9482)
We now use major.minor versioning, so it failed to pick up the
correct information.
We now use major.minor versioning, so it failed to pick up the
correct information.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 | r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r16301:77dff03489e3 r14156:7136b6af34ec r25451:917146b539af r25451:917146b539af r14156:7136b6af34ec r21202:3a70a357c1f1 r14459:28d2c5eeb292 r14793:a45ff0f9b914 r14793:a45ff0f9b914 r14459:28d2c5eeb292 r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r14156:7136b6af34ec r21202:3a70a357c1f1 r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14156:7136b6af34ec r14168:135d7d8d5e5b r21202:3a70a357c1f1 r14462:59a5df88e4d2 r18548:bf70837bd31f r18548:bf70837bd31f r23617:216c443321e5 r23617:216c443321e5 r14462:59a5df88e4d2 r16301:77dff03489e3 r16301:77dff03489e3 r16301:77dff03489e3 r16301:77dff03489e3 r16301:77dff03489e3 r16301:77dff03489e3 r16301:77dff03489e3 r16301:77dff03489e3 r16301:77dff03489e3 r25451:917146b539af r25451:917146b539af r25451:917146b539af r25451:917146b539af r14156:7136b6af34ec r14156:7136b6af34ec r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r16751:423dbe0ea2b1 r16747:52ae4248bc0a r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r21202:3a70a357c1f1 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16753:968f0105cfca r16756:a08038794be3 r16753:968f0105cfca r16753:968f0105cfca r16753:968f0105cfca r16753:968f0105cfca r16756:a08038794be3 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r18782:6453522c2154 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r25451:917146b539af r25451:917146b539af r25451:917146b539af r25451:917146b539af r25451:917146b539af r25451:917146b539af r25451:917146b539af r25451:917146b539af r25451:917146b539af r19944:25a78576fb5e r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r18604:49cb0a019581 r18604:49cb0a019581 r18604:49cb0a019581 r18604:49cb0a019581 r18604:49cb0a019581 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16751:423dbe0ea2b1 r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r21202:3a70a357c1f1 r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r19944:25a78576fb5e r16747:52ae4248bc0a r18782:6453522c2154 r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r16747:52ae4248bc0a r18604:49cb0a019581 r18604:49cb0a019581 r18604:49cb0a019581 r18604:49cb0a019581 r18604:49cb0a019581 r16747:52ae4248bc0a r16747:52ae4248bc0a r16756:a08038794be3 r16756:a08038794be3 r16756:a08038794be3 r17624:f2c5f47dceaa r17624:f2c5f47dceaa r17624:f2c5f47dceaa r17624:f2c5f47dceaa r19944:25a78576fb5e r17624:f2c5f47dceaa r16756:a08038794be3 r16756:a08038794be3 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r21202:3a70a357c1f1 r16756:a08038794be3 r16756:a08038794be3 r18604:49cb0a019581 r18604:49cb0a019581 r18604:49cb0a019581 r18604:49cb0a019581 r18604:49cb0a019581 r16756:a08038794be3 r16756:a08038794be3 r14156:7136b6af34ec | /*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file tilearea_type.h Type for storing the 'area' of something uses on the map. */
#ifndef TILEAREA_TYPE_H
#define TILEAREA_TYPE_H
#include "map_func.h"
class OrthogonalTileIterator;
/** Represents the covered area of e.g. a rail station */
struct OrthogonalTileArea {
TileIndex tile; ///< The base tile of the area
uint16 w; ///< The width of the area
uint16 h; ///< The height of the area
/**
* Construct this tile area with some set values
* @param tile the base tile
* @param w the width
* @param h the height
*/
OrthogonalTileArea(TileIndex tile = INVALID_TILE, uint8 w = 0, uint8 h = 0) : tile(tile), w(w), h(h)
{
}
OrthogonalTileArea(TileIndex start, TileIndex end);
void Add(TileIndex to_add);
/**
* Clears the 'tile area', i.e. make the tile invalid.
*/
void Clear()
{
this->tile = INVALID_TILE;
this->w = 0;
this->h = 0;
}
bool Intersects(const OrthogonalTileArea &ta) const;
bool Contains(TileIndex tile) const;
OrthogonalTileArea &Expand(int rad);
void ClampToMap();
/**
* Get the center tile.
* @return The tile at the center, or just north of it.
*/
TileIndex GetCenterTile() const
{
return TILE_ADDXY(this->tile, this->w / 2, this->h / 2);
}
OrthogonalTileIterator begin() const;
OrthogonalTileIterator end() const;
};
/** Represents a diagonal tile area. */
struct DiagonalTileArea {
TileIndex tile; ///< Base tile of the area
int16 a; ///< Extent in diagonal "x" direction (may be negative to signify the area stretches to the left)
int16 b; ///< Extent in diagonal "y" direction (may be negative to signify the area stretches upwards)
/**
* Construct this tile area with some set values.
* @param tile The base tile.
* @param a The "x" extent.
* @param b The "y" estent.
*/
DiagonalTileArea(TileIndex tile = INVALID_TILE, int8 a = 0, int8 b = 0) : tile(tile), a(a), b(b)
{
}
DiagonalTileArea(TileIndex start, TileIndex end);
/**
* Clears the TileArea by making the tile invalid and setting a and b to 0.
*/
void Clear()
{
this->tile = INVALID_TILE;
this->a = 0;
this->b = 0;
}
bool Contains(TileIndex tile) const;
};
/** Shorthand for the much more common orthogonal tile area. */
typedef OrthogonalTileArea TileArea;
/** Base class for tile iterators. */
class TileIterator {
protected:
TileIndex tile; ///< The current tile we are at.
/**
* Initialise the iterator starting at this tile.
* @param tile The tile we start iterating from.
*/
TileIterator(TileIndex tile = INVALID_TILE) : tile(tile)
{
}
public:
/** Some compilers really like this. */
virtual ~TileIterator()
{
}
/**
* Get the tile we are currently at.
* @return The tile we are at, or INVALID_TILE when we're done.
*/
inline operator TileIndex () const
{
return this->tile;
}
/**
* Get the tile we are currently at.
* @return The tile we are at, or INVALID_TILE when we're done.
*/
inline TileIndex operator *() const
{
return this->tile;
}
/**
* Move ourselves to the next tile in the rectangle on the map.
*/
virtual TileIterator& operator ++() = 0;
/**
* Allocate a new iterator that is a copy of this one.
*/
virtual TileIterator *Clone() const = 0;
};
/** Iterator to iterate over a tile area (rectangle) of the map. */
class OrthogonalTileIterator : public TileIterator {
private:
int w; ///< The width of the iterated area.
int x; ///< The current 'x' position in the rectangle.
int y; ///< The current 'y' position in the rectangle.
public:
/**
* Construct the iterator.
* @param ta Area, i.e. begin point and width/height of to-be-iterated area.
*/
OrthogonalTileIterator(const OrthogonalTileArea &ta) : TileIterator(ta.w == 0 || ta.h == 0 ? INVALID_TILE : ta.tile), w(ta.w), x(ta.w), y(ta.h)
{
}
/**
* Construct the iterator.
* @param corner1 Tile from where to begin iterating.
* @param corner2 Tile where to end the iterating.
*/
OrthogonalTileIterator(TileIndex corner1, TileIndex corner2)
{
*this = OrthogonalTileIterator(OrthogonalTileArea(corner1, corner2));
}
/**
* Move ourselves to the next tile in the rectangle on the map.
*/
inline TileIterator& operator ++()
{
assert(this->tile != INVALID_TILE);
if (--this->x > 0) {
this->tile++;
} else if (--this->y > 0) {
this->x = this->w;
this->tile += TileDiffXY(1, 1) - this->w;
} else {
this->tile = INVALID_TILE;
}
return *this;
}
virtual TileIterator *Clone() const
{
return new OrthogonalTileIterator(*this);
}
};
/** Iterator to iterate over a diagonal area of the map. */
class DiagonalTileIterator : public TileIterator {
private:
uint base_x; ///< The base tile x coordinate from where the iterating happens.
uint base_y; ///< The base tile y coordinate from where the iterating happens.
int a_cur; ///< The current (rotated) x coordinate of the iteration.
int b_cur; ///< The current (rotated) y coordinate of the iteration.
int a_max; ///< The (rotated) x coordinate of the end of the iteration.
int b_max; ///< The (rotated) y coordinate of the end of the iteration.
public:
/**
* Construct the iterator.
* @param ta Area, i.e. begin point and (diagonal) width/height of to-be-iterated area.
*/
DiagonalTileIterator(const DiagonalTileArea &ta) :
TileIterator(ta.tile), base_x(TileX(ta.tile)), base_y(TileY(ta.tile)), a_cur(0), b_cur(0), a_max(ta.a), b_max(ta.b)
{
}
/**
* Construct the iterator.
* @param corner1 Tile from where to begin iterating.
* @param corner2 Tile where to end the iterating.
*/
DiagonalTileIterator(TileIndex corner1, TileIndex corner2)
{
*this = DiagonalTileIterator(DiagonalTileArea(corner1, corner2));
}
TileIterator& operator ++();
virtual TileIterator *Clone() const
{
return new DiagonalTileIterator(*this);
}
};
#endif /* TILEAREA_TYPE_H */
|