summaryrefslogtreecommitdiff
path: root/src/landscape.h
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-11-04 10:18:13 +0000
committerrubidium <rubidium@openttd.org>2011-11-04 10:18:13 +0000
commit7757a2ed406996be35c7179185f2e4e7cba37e12 (patch)
treeccf4b25e4efba9fee88cfb65ccabd68972c09400 /src/landscape.h
parent47203dbeb5080a5d24131a61ec12d1d3164bcb42 (diff)
downloadopenttd-7757a2ed406996be35c7179185f2e4e7cba37e12.tar.xz
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
Diffstat (limited to 'src/landscape.h')
-rw-r--r--src/landscape.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/landscape.h b/src/landscape.h
index dedc4d135..b70b0a39a 100644
--- a/src/landscape.h
+++ b/src/landscape.h
@@ -35,11 +35,11 @@ byte HighestSnowLine();
byte LowestSnowLine();
void ClearSnowLine();
-uint GetPartialZ(int x, int y, Slope corners);
-uint GetSlopeZ(int x, int y);
-void GetSlopeZOnEdge(Slope tileh, DiagDirection edge, int *z1, int *z2);
-int GetSlopeZInCorner(Slope tileh, Corner corner);
-Slope GetFoundationSlope(TileIndex tile, uint *z);
+uint GetPartialPixelZ(int x, int y, Slope corners);
+uint GetSlopePixelZ(int x, int y);
+void GetSlopePixelZOnEdge(Slope tileh, DiagDirection edge, int *z1, int *z2);
+int GetSlopePixelZInCorner(Slope tileh, Corner corner);
+Slope GetFoundationPixelSlope(TileIndex tile, uint *z);
/**
* Map 3D world or tile coordinate to equivalent 2D coordinate as used in the viewports and smallmap.
@@ -67,7 +67,7 @@ static inline Point RemapCoords(int x, int y, int z)
*/
static inline Point RemapCoords2(int x, int y)
{
- return RemapCoords(x, y, GetSlopeZ(x, y));
+ return RemapCoords(x, y, GetSlopePixelZ(x, y));
}
/**
@@ -84,7 +84,7 @@ static inline Point InverseRemapCoords(int x, int y)
return pt;
}
-uint ApplyFoundationToSlope(Foundation f, Slope *s);
+uint ApplyPixelFoundationToSlope(Foundation f, Slope *s);
void DrawFoundation(TileInfo *ti, Foundation f);
bool HasFoundationNW(TileIndex tile, Slope slope_here, uint z_here);
bool HasFoundationNE(TileIndex tile, Slope slope_here, uint z_here);