(svn r8050) -Codechange: Rename map member extra to m6, since its usage has been widden.

Only doc landscape_grid.html has been updated, landscape.html will be done latter.
-CodeChange: Replace a direct access to m6 with SetTropicZone in InitializeLandscape, as it is the only part of m6 still untouched without the brute-forced m6=0

1 files changed, 4 insertions, 4 deletions

diff --git a/src/bridge_map.h b/src/bridge_map.h
index 1cda0da9d..260917e19 100644
--- a/src/bridge_map.h
+++ b/src/bridge_map.h
@@ -41,7 +41,7 @@ static inline bool MayHaveBridgeAbove(TileIndex t)
 static inline bool IsBridgeAbove(TileIndex t)
 {
 	assert(MayHaveBridgeAbove(t));
-	return GB(_m[t].extra, 6, 2) != 0;
+	return GB(_m[t].m6, 6, 2) != 0;
 }
 
 
@@ -70,7 +70,7 @@ static inline DiagDirection GetBridgeRampDirection(TileIndex t)
 static inline Axis GetBridgeAxis(TileIndex t)
 {
 	assert(IsBridgeAbove(t));
-	return (Axis)(GB(_m[t].extra, 6, 2) - 1);
+	return (Axis)(GB(_m[t].m6, 6, 2) - 1);
 }
 
 
@@ -121,7 +121,7 @@ uint GetBridgeFoundation(Slope tileh, Axis axis);
 static inline void ClearSingleBridgeMiddle(TileIndex t, Axis a)
 {
 	assert(MayHaveBridgeAbove(t));
-	CLRBIT(_m[t].extra, 6 + a);
+	CLRBIT(_m[t].m6, 6 + a);
 }
 
 
@@ -134,7 +134,7 @@ static inline void ClearBridgeMiddle(TileIndex t)
 static inline void SetBridgeMiddle(TileIndex t, Axis a)
 {
 	assert(MayHaveBridgeAbove(t));
-	SETBIT(_m[t].extra, 6 + a);
+	SETBIT(_m[t].m6, 6 + a);
 }