Merge branch 'master' into jgrpp-nrt

Merge NRT feature

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_map.h
#	src/build_vehicle_gui.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/road_gui.cpp
#	src/road_map.h
#	src/road_type.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/script/api/script_bridge.cpp
#	src/table/newgrf_debug_data.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp

docs/landscape.html

@@ -98,6 +98,38 @@
     </li>
    </ul>
   </li>
+  <li><span style="font-weight: bold;">m4:</span><br>
+   <a name="RoadType"></a>
+   Road roadtype. Used for all tiles with road (road, station, tunnelbridge).
+   <ul>
+    <li>
+     Bits 5..0: Road roadtype, 0x3F for no road.
+    </li>
+   </ul>
+  </li>
+  <li><span style="font-weight: bold;">m8:</span><br>
+   <a name="TramType"></a>
+   Tram roadtype. Used for all tiles with road (road, station, tunnelbridge).
+   <ul>
+    <li>
+     Bits 11..6: Tram roadtype, 0x3F for no tram.
+    </li>
+   </ul>
+  </li>
+  <li><span style="font-weight: bold;">m8:</span><br>
+   <ul>
+    <li>
+     <a name="RailType"></a>
+     Bits 5..0: Railtype. Used for all tiles with rail (road, rail, station, tunnelbridge).
+    </li>
+   </ul>
+   <ul>
+    <li>
+     <a name="RailType"></a>
+     Bits 11..6: Secondary Railtype. Used for some tiles with rail (rail, tunnelbridge). Used for lower or right track when two parallel tracks on tile.
+    </li>
+   </ul>
+  </li>
   <li><span style="font-weight: bold;">m7:</span><br>
    Animation frame/state. Used for houses, industries, objects and stations.
   </li>
@@ -108,7 +140,7 @@
  <table border=1 cellpadding=3>
   <tr bgcolor="#0099FF">
    <th align=left><font color="#FFFFFF">Class</font></th>
-   <th align=left><font color="#FFFFFF">Meaning & details of encoding</font></th>
+   <th align=left><font color="#FFFFFF">Meaning &amp; details of encoding</font></th>
   </tr>
   <tr bgcolor="#CCCCCC">
    <td align=left><strong><a name="Class0"><tt> 0 </tt></a></strong></td>
@@ -542,21 +574,10 @@
    <td>
     <ul>
      <li>m2: Index into the array of towns (owning town for town roads; closest town otherwise, INVALID_TOWN if there is no town or we are creating a town)</li>
-     <li>m7 bit 5 set = on snow or desert</li>
-     <li>m7 bits 7..6: present road types
-      <table>
-       <tr>
-        <td>bit 0&nbsp; </td>
-        <td>normal road</td>
-       </tr>
-
-       <tr>
-        <td>bit 1&nbsp; </td>
-        <td>tram</td>
-       </tr>
-      </table>
-     </li>
      <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
+     <li>m4 bits 5..0: <a href="#RoadType">Roadtype</a></li>
+     <li>m7 bit 5 set = on snow or desert</li>
+     <li>m8 bits 11..6: <a href="#TramType">Tramtype</a></li>
      <li>m5 bits 7 clear: road or level-crossing
       <ul>
        <li>m6 bits 5..3:
@@ -870,6 +891,7 @@
      <li>m3 bits 7..4: persistent random data for railway stations/waypoints and airports)</li>
      <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram tracks (road stop)</li>
      <li>m4: custom station id; 0 means standard graphics</li>
+     <li>m4: <a href="#RoadType">Roadtype</a> for road stops</li>
      <li>m5: graphics index (range from 0..255 for each station type):
       <table>
        <tr>
@@ -985,8 +1007,8 @@
      <li>m6 bit 2: pbs reservation state for railway stations/waypoints</li>
 
      <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road (road stops)</li>
-     <li>m7 bits 7..6: present road types (road stops)</li>
      <li>m7: animation frame (railway stations/waypoints, airports)</li>
+     <li>m8 bits 11..6: <a href="#TramType">Tramtype</a></li>
      <li>m8 bits 5..0: <a href="#TrackType">track type</a> for railway stations/waypoints</li>
     </ul>
    </td>
@@ -1563,6 +1585,9 @@
      </li>
      <li>m5 bit 4: pbs reservation state for railway (tunnel only)</li>
      <li>m5 bit 7 clear: tunnel entrance/exit</li>
+     <li>m4: <a href="#RoadType">Roadtype</a></li>
+     <li>m5 bit 4: pbs reservation state for railway</li>
+     <li>m5 bits 7 clear: tunnel entrance/exit</li>
      <li>m5 bit 7 set: bridge ramp
       <ul>
        <li>m6 bits 5..2: <a name="BridgeType">bridge type</a>:
@@ -1729,7 +1754,7 @@
      </li>
      <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road</li>
      <li>m7 bit 5 set = on snow or desert</li>
-     <li>m7 bits 7..6: present road types for road</li>
+     <li>m8 bits 11..6: <a href="#TramType">Tramtype</a></li>
      <li>m8 bits 5..0: <a href="#TrackType">track type</a> for railway</li>
      <li style="color: blue">m8 bits 11..6 = <a name="TrackType">secondary track type</a> for railway (used for bridge-bypassing track when two parallel tracks on custom bridge head)</li>
     </ul>