diff options
author | rubidium <rubidium@openttd.org> | 2007-01-02 19:19:48 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-01-02 19:19:48 +0000 |
commit | 66bbf336c6af7353ef0aeed58002c46543b30635 (patch) | |
tree | ad4a63860df2626b22f77e7dac712e958bea54cb /tile.c | |
parent | ccc0a3f4dbf58c005b22341ac8874252924690cd (diff) | |
download | openttd-66bbf336c6af7353ef0aeed58002c46543b30635.tar.xz |
(svn r7759) -Merge: makefile rewrite. This merge features:
- A proper ./configure, so everything needs to be configured only once, not for every make.
- Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
- A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
- Proper support for OSX universal binaries.
- Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
- Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.
Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.
Diffstat (limited to 'tile.c')
-rw-r--r-- | tile.c | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/tile.c b/tile.c deleted file mode 100644 index ba6900a36..000000000 --- a/tile.c +++ /dev/null @@ -1,63 +0,0 @@ -/* $Id$ */ - -#include "stdafx.h" -#include "tile.h" - -Slope GetTileSlope(TileIndex tile, uint *h) -{ - uint a; - uint b; - uint c; - uint d; - uint min; - uint r; - - assert(tile < MapSize()); - - if (TileX(tile) == MapMaxX() || TileY(tile) == MapMaxY()) { - if (h != NULL) *h = 0; - return 0; - } - - min = a = TileHeight(tile); - b = TileHeight(tile + TileDiffXY(1, 0)); - if (min >= b) min = b; - c = TileHeight(tile + TileDiffXY(0, 1)); - if (min >= c) min = c; - d = TileHeight(tile + TileDiffXY(1, 1)); - if (min >= d) min = d; - - r = SLOPE_FLAT; - if ((a -= min) != 0) r += (--a << 4) + SLOPE_N; - if ((c -= min) != 0) r += (--c << 4) + SLOPE_E; - if ((d -= min) != 0) r += (--d << 4) + SLOPE_S; - if ((b -= min) != 0) r += (--b << 4) + SLOPE_W; - - if (h != NULL) *h = min * TILE_HEIGHT; - - return r; -} - -uint GetTileZ(TileIndex tile) -{ - uint h; - GetTileSlope(tile, &h); - return h; -} - - -uint GetTileMaxZ(TileIndex t) -{ - uint max; - uint h; - - h = TileHeight(t); - max = h; - h = TileHeight(t + TileDiffXY(1, 0)); - if (h > max) max = h; - h = TileHeight(t + TileDiffXY(0, 1)); - if (h > max) max = h; - h = TileHeight(t + TileDiffXY(1, 1)); - if (h > max) max = h; - return max * 8; -} |