cpp/openttd-patchpack/source Changeset - r7523:7ca21ac5caa0

Changeset - r7523:7ca21ac5caa0

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 17 years ago 2007-09-04 12:06:38
rubidium@openttd.org

(svn r11042) -Fix [FS#1196]: so newgrf callbacks returned slightly wrong heights (height of nothern corner instead of height of lowest corner). Patch by frosch.

3 files changed with 7 insertions and 3 deletions:

src/newgrf_canal.cpp

src/newgrf_house.cpp

src/newgrf_industrytiles.cpp

0 comments (0 inline, 0 general)

src/newgrf_canal.cpp

➞

Show inline comments

@@ @@ -42,7 +42,7 @@ static uint32 CanalGetVariable(const Res @@
 	switch (variable) {
 		case 0x80:
-			return TileHeight(tile);
+			return GetTileZ(tile) / TILE_HEIGHT;
 		case 0x81:
 			return GetTerrainType(tile);

src/newgrf_house.cpp

➞

Show inline comments

@@ @@ -185,7 +185,9 @@ uint32 GetNearbyTileInformation(byte par @@
 	tile = GetNearbyTile(parameter, tile);
 	tile_type = GetTerrainType(tile) << 2 | (IsTileType(tile, MP_WATER) ? 1 : 0) << 1;
 	return GetTileType(tile) << 24 | (TileHeight(tile) * 8) << 16 | tile_type << 8 | GetTileSlope(tile, NULL);
 	uint z;
 	Slope tileh = GetTileSlope(tile, &z);
 	return GetTileType(tile) << 24 | z << 16 | tile_type << 8 | tileh;
+}
 /**

src/newgrf_industrytiles.cpp

➞

Show inline comments

@@ @@ -39,7 +39,9 @@ uint32 GetNearbyIndustryTileInformation( @@
 	is_same_industry = (IsTileType(tile, MP_INDUSTRY) && GetIndustryIndex(tile) == index);
 	tile_type = GetTerrainType(tile) << 2 | (IsTileType(tile, MP_WATER) ? 1 : 0) << 1 | (is_same_industry ? 1 : 0);
 	return GetTileType(tile) << 24 | (TileHeight(tile) * 8) << 16 | tile_type << 8 | GetTileSlope(tile, NULL);
 	uint z;
 	Slope tileh = GetTileSlope(tile, &z);
 	return GetTileType(tile) << 24 | z << 16 | tile_type << 8 | tileh;
+}
 /** This is the position of the tile relative to the northernmost tile of the industry.

0 comments (0 inline, 0 general)