mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r18714) -Codechange: move the TileArea struct to it's own header

This commit is contained in:
rubidium 2010-01-04 18:05:14 +00:00
parent 02a297669a
commit 8b88bb0c9b
5 changed files with 68 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/openttd_vs80.vcproj
View File

@ -1467,6 +1467,10 @@
RelativePath=".\..\src\tgp.h"
>
</File>
<File
RelativePath=".\..\src\tilearea_type.h"
>
</File>
<File
RelativePath=".\..\src\tile_cmd.h"
>

4
projects/openttd_vs90.vcproj
View File

@ -1464,6 +1464,10 @@
RelativePath=".\..\src\tgp.h"
>
</File>
<File
RelativePath=".\..\src\tilearea_type.h"
>
</File>
<File
RelativePath=".\..\src\tile_cmd.h"
>

1
source.list
View File

@ -276,6 +276,7 @@ terraform_gui.h
textbuf_gui.h
texteff.hpp
tgp.h
tilearea_type.h
tile_cmd.h
tile_type.h
tilehighlight_func.h

42
src/station_type.h
View File

@ -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;

58
src/tilearea_type.h Normal file
View File

@ -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 */