diff --git a/docs/landscape_grid.html b/docs/landscape_grid.html
index 1a98131bec..5fc33c1c15 100644
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -95,7 +95,7 @@ the array so you can quickly see what is used and what is not.
| -inherit- |
OOOX XXOO |
OOOO OOOO |
- -inherit- |
+ OOOO OOOO OOOO OOOO |
| 1 |
@@ -158,7 +158,7 @@ the array so you can quickly see what is used and what is not.
OOOX XXXX |
-inherit- |
XXXX OOOO |
- -inherit- |
+ OOOO OOOO |
XXXX OOPX |
OOXX XOOO |
XXXX XXXX |
@@ -175,7 +175,7 @@ the array so you can quickly see what is used and what is not.
XXOO OOXX |
OOOO OOOO |
XXXO XXXX |
- -inherit- |
+ OOOO OOOO OOOO OOOO |
| 3 |
@@ -243,7 +243,7 @@ the array so you can quickly see what is used and what is not.
~~~~ ~XXX |
OOXX XOOO |
XXOX XXXX |
- -inherit- |
+ OOOO OOOO OOOO OOOO |
| dock |
@@ -256,7 +256,7 @@ the array so you can quickly see what is used and what is not.
~~~~ ~XXX |
OOXX XOOO |
OOOO OOOO |
- -inherit- |
+ OOOO OOOO OOOO OOOO |
| airport |
@@ -269,7 +269,7 @@ the array so you can quickly see what is used and what is not.
XXXX XXXX |
OOXX XOOO |
XXXX XXXX |
- -inherit- |
+ OOOO OOOO OOOO OOOO |
| buoy |
@@ -282,7 +282,7 @@ the array so you can quickly see what is used and what is not.
~~~~ ~~~~ |
OOXX XOOO |
OOOO OOOO |
- -inherit- |
+ OOOO OOOO OOOO OOOO |
| oilrig |
@@ -295,7 +295,7 @@ the array so you can quickly see what is used and what is not.
~~~~ ~~~~ |
OOXX XOOO |
OOOO OOOO |
- -inherit- |
+ OOOO OOOO OOOO OOOO |
| 6 |
@@ -322,7 +322,7 @@ the array so you can quickly see what is used and what is not.
-inherit- |
OOOO OOOO |
OOOO OOOO |
- -inherit- |
+ OOOO OOOO OOOO OOOO |
| shipdepot |
@@ -335,7 +335,7 @@ the array so you can quickly see what is used and what is not.
-inherit- |
OOOO OOOO |
OOOO OOOO |
- -inherit- |
+ OOOO OOOO OOOO OOOO |
| 8 |
diff --git a/src/clear_map.h b/src/clear_map.h
index 3b5d4a7371..f55e3e1e99 100644
--- a/src/clear_map.h
+++ b/src/clear_map.h
@@ -269,6 +269,7 @@ static inline void MakeClear(TileIndex t, ClearGround g, uint density)
SetClearGroundDensity(t, g, density); // Sets m5
_me[t].m6 = 0;
_me[t].m7 = 0;
+ _me[t].m8 = 0;
}
@@ -289,6 +290,7 @@ static inline void MakeField(TileIndex t, uint field_type, IndustryID industry)
SetClearGroundDensity(t, CLEAR_FIELDS, 3);
SB(_me[t].m6, 2, 4, 0);
_me[t].m7 = 0;
+ _me[t].m8 = 0;
}
/**
diff --git a/src/station_map.h b/src/station_map.h
index 8eac8cfaa0..0d21a306d0 100644
--- a/src/station_map.h
+++ b/src/station_map.h
@@ -542,6 +542,7 @@ static inline void MakeStation(TileIndex t, Owner o, StationID sid, StationType
SB(_me[t].m6, 2, 1, 0);
SB(_me[t].m6, 3, 3, st);
_me[t].m7 = 0;
+ _me[t].m8 = 0;
}
/**
diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp
index 3aa501c299..be0809a764 100644
--- a/src/waypoint_cmd.cpp
+++ b/src/waypoint_cmd.cpp
@@ -148,7 +148,8 @@ extern CommandCost CanExpandRailStation(const BaseStation *st, TileArea &new_ta,
* @param start_tile northern most tile where waypoint will be built
* @param flags type of operation
* @param p1 various bitstuffed elements
- * - p1 = (bit 4) - orientation (Axis)
+ * - p1 = (bit 0- 5) - railtype (not used)
+ * - p1 = (bit 6) - orientation (Axis)
* - p1 = (bit 8-15) - width of waypoint
* - p1 = (bit 16-23) - height of waypoint
* - p1 = (bit 24) - allow waypoints directly adjacent to other waypoints.
@@ -161,7 +162,7 @@ extern CommandCost CanExpandRailStation(const BaseStation *st, TileArea &new_ta,
CommandCost CmdBuildRailWaypoint(TileIndex start_tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
/* Unpack parameters */
- Axis axis = Extract(p1);
+ Axis axis = Extract(p1);
byte width = GB(p1, 8, 8);
byte height = GB(p1, 16, 8);
bool adjacent = HasBit(p1, 24);