openttd-mini: src/tile_map.cpp@4dc6a0c0ef47 (annotated)

2186 db48cf29b983 (svn r2701) Insert Id tags into all source files tron parents: 2049 diff changeset	1	/* $Id$ */
db48cf29b983 (svn r2701) Insert Id tags into all source files tron parents: 2049 diff changeset	2
8348 4d7c1c5055b3 (svn r11914) -Documentation: fix some @file statement glx parents: 8113 diff changeset	3	/** @file tile_map.cpp */
6422 6679df1c05ba (svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done belugas parents: 5587 diff changeset	4
1213 fc87a2ee4161 (svn r1717) -Fix: some compilation problems for braindead VS6 and added missing files to project (thx bociusz) darkvater parents: 1211 diff changeset	5	#include "stdafx.h"
8108 b42a0e5c67ef (svn r11669) -Codechange: refactor tile.h -> tile_type.h and tile_map.h rubidium parents: 7324 diff changeset	6	#include "openttd.h"
b42a0e5c67ef (svn r11669) -Codechange: refactor tile.h -> tile_type.h and tile_map.h rubidium parents: 7324 diff changeset	7	#include "tile_map.h"
8113 31b7784db761 (svn r11674) -Codechange: refactor some functions out of macros.h into more logical locations. rubidium parents: 8108 diff changeset	8	#include "core/math_func.hpp"
1211 43ae74415fdd (svn r1715) Move [GS]etMapExtraBits to tile.[ch] tron parents: diff changeset	9
3636 a36cc46e754d (svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums tron parents: 3422 diff changeset	10	Slope GetTileSlope(TileIndex tile, uint *h)
1335 a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	11	{
a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	12	uint a;
a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	13	uint b;
a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	14	uint c;
a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	15	uint d;
4067 5ef297943eff (svn r5363) Revert 5312, 5288, 5248, 3992, 3249, 3228 tron parents: 3773 diff changeset	16	uint min;
5ef297943eff (svn r5363) Revert 5312, 5288, 5248, 3992, 3249, 3228 tron parents: 3773 diff changeset	17	uint r;
1335 a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	18
a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	19	assert(tile < MapSize());
a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	20
a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	21	if (TileX(tile) == MapMaxX() \|\| TileY(tile) == MapMaxY()) {
a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	22	if (h != NULL) *h = 0;
5587 167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5584 diff changeset	23	return SLOPE_FLAT;
1335 a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	24	}
a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	25
4067 5ef297943eff (svn r5363) Revert 5312, 5288, 5248, 3992, 3249, 3228 tron parents: 3773 diff changeset	26	min = a = TileHeight(tile);
1981 3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1854 diff changeset	27	b = TileHeight(tile + TileDiffXY(1, 0));
7323 20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	28	if (min > b) min = b;
1981 3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1854 diff changeset	29	c = TileHeight(tile + TileDiffXY(0, 1));
7323 20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	30	if (min > c) min = c;
1981 3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1854 diff changeset	31	d = TileHeight(tile + TileDiffXY(1, 1));
7323 20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	32	if (min > d) min = d;
1335 a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	33
4067 5ef297943eff (svn r5363) Revert 5312, 5288, 5248, 3992, 3249, 3228 tron parents: 3773 diff changeset	34	r = SLOPE_FLAT;
5ef297943eff (svn r5363) Revert 5312, 5288, 5248, 3992, 3249, 3228 tron parents: 3773 diff changeset	35	if ((a -= min) != 0) r += (--a << 4) + SLOPE_N;
5ef297943eff (svn r5363) Revert 5312, 5288, 5248, 3992, 3249, 3228 tron parents: 3773 diff changeset	36	if ((c -= min) != 0) r += (--c << 4) + SLOPE_E;
5ef297943eff (svn r5363) Revert 5312, 5288, 5248, 3992, 3249, 3228 tron parents: 3773 diff changeset	37	if ((d -= min) != 0) r += (--d << 4) + SLOPE_S;
5ef297943eff (svn r5363) Revert 5312, 5288, 5248, 3992, 3249, 3228 tron parents: 3773 diff changeset	38	if ((b -= min) != 0) r += (--b << 4) + SLOPE_W;
5ef297943eff (svn r5363) Revert 5312, 5288, 5248, 3992, 3249, 3228 tron parents: 3773 diff changeset	39
5ef297943eff (svn r5363) Revert 5312, 5288, 5248, 3992, 3249, 3228 tron parents: 3773 diff changeset	40	if (h != NULL) h = min TILE_HEIGHT;
5ef297943eff (svn r5363) Revert 5312, 5288, 5248, 3992, 3249, 3228 tron parents: 3773 diff changeset	41
5587 167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5584 diff changeset	42	return (Slope)r;
1335 a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	43	}
a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	44
a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	45	uint GetTileZ(TileIndex tile)
a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	46	{
7323 20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	47	if (TileX(tile) == MapMaxX() \|\| TileY(tile) == MapMaxY()) return 0;
20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	48
20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	49	uint h = TileHeight(tile);
20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	50	h = min(h, TileHeight(tile + TileDiffXY(1, 0)));
20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	51	h = min(h, TileHeight(tile + TileDiffXY(0, 1)));
20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	52	h = min(h, TileHeight(tile + TileDiffXY(1, 1)));
20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	53
20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	54	return h * TILE_HEIGHT;
1335 a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1213 diff changeset	55	}
3773 0019b5f70ea9 (svn r4765) Add GetTileMaxZ(), which returns the height of the highest corner of a tile, and use it to simplify the code in a few places tron parents: 3636 diff changeset	56
0019b5f70ea9 (svn r4765) Add GetTileMaxZ(), which returns the height of the highest corner of a tile, and use it to simplify the code in a few places tron parents: 3636 diff changeset	57
0019b5f70ea9 (svn r4765) Add GetTileMaxZ(), which returns the height of the highest corner of a tile, and use it to simplify the code in a few places tron parents: 3636 diff changeset	58	uint GetTileMaxZ(TileIndex t)
0019b5f70ea9 (svn r4765) Add GetTileMaxZ(), which returns the height of the highest corner of a tile, and use it to simplify the code in a few places tron parents: 3636 diff changeset	59	{
7324 5bbb17fe83f7 (svn r10687) -Fix (r10686): subversion does not like it when you change code when you are typing the commit message. rubidium parents: 7323 diff changeset	60	if (TileX(t) == MapMaxX() \|\| TileY(t) == MapMaxY()) return 0;
3773 0019b5f70ea9 (svn r4765) Add GetTileMaxZ(), which returns the height of the highest corner of a tile, and use it to simplify the code in a few places tron parents: 3636 diff changeset	61
7323 20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	62	uint h = TileHeight(t);
20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	63	h = max(h, TileHeight(t + TileDiffXY(1, 0)));
20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	64	h = max(h, TileHeight(t + TileDiffXY(0, 1)));
20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	65	h = max(h, TileHeight(t + TileDiffXY(1, 1)));
20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	66
20a18eb8efaf (svn r10686) -Fix [FS#1058]: determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis). Furthermore GetTileZ did much more than absolutely necessary. rubidium parents: 6422 diff changeset	67	return h * TILE_HEIGHT;
3773 0019b5f70ea9 (svn r4765) Add GetTileMaxZ(), which returns the height of the highest corner of a tile, and use it to simplify the code in a few places tron parents: 3636 diff changeset	68	}

author	rubidium
	Fri, 25 Apr 2008 15:22:32 +0000
changeset 9055	4dc6a0c0ef47
parent 8348	4d7c1c5055b3
child 9111	48ce04029fe4
permissions	-rw-r--r--