dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums

Browse Source
This commit is contained in:
tron
2006-04-23 13:48:16 +00:00
parent b5ce99c52d
commit 0347fb2ab6
28 changed files with 339 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tile.h
View File

@@ -5,6 +5,7 @@
#include "macros.h"
#include "map.h"
#include "slope.h"
typedef enum TileTypes {
MP_CLEAR,
@@ -26,11 +27,11 @@ typedef enum TropicZones {
TROPICZONE_RAINFOREST = 2,
} TropicZone;
uint GetTileh(uint n, uint w, uint e, uint s, uint *h);
uint GetTileSlope(TileIndex tile, uint *h);
Slope GetTileh(uint n, uint w, uint e, uint s, uint *h);
Slope GetTileSlope(TileIndex tile, uint *h);
uint GetTileZ(TileIndex tile);
static inline bool CorrectZ(uint tileh)
static inline bool CorrectZ(Slope tileh)
{
/* tile height must be corrected if the north corner is not raised, but
* any other corner is. These are the cases 1 till 7 */
@@ -43,11 +44,6 @@ static inline uint TileHeight(TileIndex tile)
return GB(_m[tile].type_height, 0, 4);
}
static inline bool IsSteepTileh(uint tileh)
{
return (tileh & 0x10);
}
static inline void SetTileHeight(TileIndex tile, uint height)
{
assert(tile < MapSize());