summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-01-04 18:05:14 +0000
committerrubidium <rubidium@openttd.org>2010-01-04 18:05:14 +0000
commit8b88bb0c9bf1072881b4111a339eb6781fdb80bc (patch)
treea7c088ba37027beb12e51e672ff116e14b174c24 /src
parent02a297669a5353518d51f6f4d9641114e557aede (diff)
downloadopenttd-8b88bb0c9bf1072881b4111a339eb6781fdb80bc.tar.xz
(svn r18714) -Codechange: move the TileArea struct to it's own header
Diffstat (limited to 'src')
-rw-r--r--src/station_type.h42
-rw-r--r--src/tilearea_type.h58
2 files changed, 59 insertions, 41 deletions
diff --git a/src/station_type.h b/src/station_type.h
index 769455d20..141e6dc61 100644
--- a/src/station_type.h
+++ b/src/station_type.h
@@ -15,6 +15,7 @@
#include "core/enum_type.hpp"
#include "core/smallvec_type.hpp"
#include "tile_type.h"
+#include "tilearea_type.h"
typedef uint16 StationID;
typedef uint16 RoadStopID;
@@ -91,47 +92,6 @@ enum {
MAX_LENGTH_STATION_NAME_PIXELS = 180, ///< The maximum length of a station name in pixels
};
-/** Represents the covered area of e.g. a rail station */
-struct TileArea {
- /** Just construct this tile area */
- TileArea() {}
-
- /**
- * Construct this tile area with some set values
- * @param tile the base tile
- * @param w the width
- * @param h the height
- */
- TileArea(TileIndex tile, uint8 w, uint8 h) : tile(tile), w(w), h(h) {}
-
- /**
- * Construct this tile area based on two points.
- * @param start the start of the area
- * @param end the end of the area
- */
- TileArea(TileIndex start, TileIndex end);
-
- TileIndex tile; ///< The base tile of the area
- uint8 w; ///< The width of the area
- uint8 h; ///< The height of the area
-
- /**
- * Add a single tile to a tile area; enlarge if needed.
- * @param to_add The tile to add
- */
- 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;
- }
-};
-
/** List of stations */
typedef SmallVector<Station *, 2> StationList;
diff --git a/src/tilearea_type.h b/src/tilearea_type.h
new file mode 100644
index 000000000..8bac2fbbf
--- /dev/null
+++ b/src/tilearea_type.h
@@ -0,0 +1,58 @@
+/* $Id$ */
+
+/*
+ * 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 "tile_type.h"
+
+/** Represents the covered area of e.g. a rail station */
+struct TileArea {
+ /** Just construct this tile area */
+ TileArea() {}
+
+ /**
+ * Construct this tile area with some set values
+ * @param tile the base tile
+ * @param w the width
+ * @param h the height
+ */
+ TileArea(TileIndex tile, uint8 w, uint8 h) : tile(tile), w(w), h(h) {}
+
+ /**
+ * Construct this tile area based on two points.
+ * @param start the start of the area
+ * @param end the end of the area
+ */
+ TileArea(TileIndex start, TileIndex end);
+
+ TileIndex tile; ///< The base tile of the area
+ uint8 w; ///< The width of the area
+ uint8 h; ///< The height of the area
+
+ /**
+ * Add a single tile to a tile area; enlarge if needed.
+ * @param to_add The tile to add
+ */
+ 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;
+ }
+};
+
+#endif /* TILEAREA_TYPE_H */