Feature: Add NotRoadTypes (NRT)

mattkimber · May 1, 2019 · c02ef3e · c02ef3e
1 parent 21edf67
commit c02ef3e
Show file tree

Hide file tree

Showing 106 changed files with 4,462 additions and 1,242 deletions.
diff --git a/bin/baseset/openttd.grf b/bin/baseset/openttd.grf
diff --git a/docs/landscape.html b/docs/landscape.html
@@ -98,6 +98,32 @@ <h3><a name="Landscape">Landscape</a></h3>
     </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>
+  </li>
   <li><span style="font-weight: bold;">m7:</span><br>
    Animation frame/state. Used for houses, industries, objects and stations.
   </li>
@@ -108,7 +134,7 @@ <h3><a name="Landscape">Landscape</a></h3>
  <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>
@@ -535,21 +561,10 @@ <h3><a name="Landscape">Landscape</a></h3>
    <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:
@@ -862,6 +877,7 @@ <h3><a name="Landscape">Landscape</a></h3>
      <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>
@@ -977,8 +993,8 @@ <h3><a name="Landscape">Landscape</a></h3>
      <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>
@@ -1445,6 +1461,7 @@ <h3><a name="Landscape">Landscape</a></h3>
     <ul>
      <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a></li>
      <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram</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
@@ -1581,7 +1598,7 @@ <h3><a name="Landscape">Landscape</a></h3>
      </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>
     </ul>
    </td>

diff --git a/docs/landscape_grid.html b/docs/landscape_grid.html
@@ -143,11 +143,11 @@ <h3 style="font-weight: bold;">Landscape</h3>
       <td class="bits"><span class="free">OOO</span>X XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
-      <td class="bits">XXX<span class="free">O</span> XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OO</span>X<span class="free">O</span> XXXX</td>
+      <td class="bits"><span class="free">OOOO</span> XXXX XX<span class="free">OO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">level crossing</td>
@@ -159,8 +159,8 @@ <h3 style="font-weight: bold;">Landscape</h3>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX <span class="free">OOO</span>X</td>
       <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OO</span>XX XXXX</td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
+      <td class="bits"><span class="free">OOOO</span> XXXX XXXX XXXX</td>
     </tr>
     <tr>
       <td class="caption">road depot</td>
@@ -169,11 +169,11 @@ <h3 style="font-weight: bold;">Landscape</h3>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XXXX <span class="free">OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">-inherit-</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">XXX<span class="free">O</span> XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OO</span>X<span class="free">O</span> XXXX</td>
+      <td class="bits">-inherit-</td>
     </tr>
     <tr>
       <td>3</td>
@@ -237,11 +237,11 @@ <h3 style="font-weight: bold;">Landscape</h3>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XXXX <span class="free">OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
       <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
       <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
-      <td class="bits">XX<span class="free">O</span>X XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOO</span>X XXXX</td>
+      <td class="bits"><span class="free">OOOO</span> XXXX XX<span class="free">OO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">dock</td>
@@ -357,11 +357,11 @@ <h3 style="font-weight: bold;">Landscape</h3>
       <td class="bits"><span class="free">OOO</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits">XXXX <span class="free">OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
       <td class="bits">X<span class="free">OO</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OO</span>XX XXXX</td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
+      <td class="bits"><span class="free">OOOO</span> XXXX XXXX XXXX</td>
     </tr>
     <tr>
       <td>bridge ramp</td>
@@ -370,7 +370,7 @@ <h3 style="font-weight: bold;">Landscape</h3>
       <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
       <td class="bits">-inherit-</td>

diff --git a/media/extra_grf/openttdgui.nfo b/media/extra_grf/openttdgui.nfo
@@ -7,7 +7,7 @@
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
    -1 * 0	 0C "OpenTTD GUI graphics"
-   -1 * 3	 05 15 \b 179 // OPENTTD_SPRITE_COUNT
+   -1 * 3	 05 15 \b 184 // OPENTTD_SPRITE_COUNT
    -1 sprites/openttdgui.png 8bpp  66    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 146    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 226    8  64  31 -31   7 normal
@@ -187,3 +187,8 @@
    -1 sprites/openttdgui_group_livery.png 8bpp  21    0  20  20   0   0 normal
    -1 sprites/openttdgui_group_livery.png 8bpp  42    0  20  20   0   0 normal
    -1 sprites/openttdgui_group_livery.png 8bpp  63    0  20  20   0   0 normal
+   -1 sprites/openttdgui_build_tram.png   8bpp   0   0  20  20   0   0 normal
+   -1 sprites/openttdgui_convert_road.png 8bpp   0   0  20  20   0   0 normal
+   -1 sprites/openttdgui_convert_road.png 8bpp  24   0  32  32   0   0 normal
+   -1 sprites/openttdgui_convert_tram.png 8bpp   0   0  20  20   0   0 normal
+   -1 sprites/openttdgui_convert_tram.png 8bpp  24   0  32  32   0   0 normal
diff --git a/media/extra_grf/openttdgui_build_tram.png b/media/extra_grf/openttdgui_build_tram.png
diff --git a/media/extra_grf/openttdgui_convert_road.png b/media/extra_grf/openttdgui_convert_road.png
diff --git a/media/extra_grf/openttdgui_convert_tram.png b/media/extra_grf/openttdgui_convert_tram.png
diff --git a/media/extra_grf/tramtracks.nfo b/media/extra_grf/tramtracks.nfo
@@ -7,7 +7,7 @@
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
    -1 * 0	 0C "Tram track graphics by PikkaBird"
-   -1 * 3	 05 0B 71
+   -1 * 3	 05 0B 77
    -1 sprites/tramtracks.png 8bpp  18    8  20  13   0   4 normal
    -1 sprites/tramtracks.png 8bpp  50    8  20  13   0   4 normal
    -1 sprites/tramtracks.png 8bpp  82    8  64  36 -18  -8 normal
@@ -121,3 +121,9 @@
    -1 sprites/tramtracks.png 8bpp 722  696  64  23 -31   0 normal
    -1 sprites/tramtracks.png 8bpp   2  776  64  23 -31   0 normal
    -1 sprites/tramtracks.png 8bpp  82  776  64  39 -31  -8 normal
+   -1 sprites/tramtracks_bare_depot.png 8bpp   0    0  64  31 -31   0 normal
+   -1 sprites/tramtracks_bare_depot.png 8bpp  80    0  62  64   2 -49 normal
+   -1 sprites/tramtracks_bare_depot.png 8bpp 158    0  64  31 -31   0 normal
+   -1 sprites/tramtracks_bare_depot.png 8bpp 238    0  62  64 -62 -49 normal
+   -1 sprites/tramtracks_bare_depot.png 8bpp 318    0  62  64 -62 -49 normal
+   -1 sprites/tramtracks_bare_depot.png 8bpp 398    0  62  64   2 -49 normal
diff --git a/media/extra_grf/tramtracks_bare_depot.png b/media/extra_grf/tramtracks_bare_depot.png
diff --git a/projects/openttd_vs140.vcxproj b/projects/openttd_vs140.vcxproj
@@ -584,6 +584,7 @@
     <ClInclude Include="..\src\newgrf_object.h" />
     <ClInclude Include="..\src\newgrf_properties.h" />
     <ClInclude Include="..\src\newgrf_railtype.h" />
+    <ClInclude Include="..\src\newgrf_roadtype.h" />
     <ClInclude Include="..\src\newgrf_sound.h" />
     <ClInclude Include="..\src\newgrf_spritegroup.h" />
     <ClInclude Include="..\src\newgrf_station.h" />
@@ -614,6 +615,7 @@
     <ClInclude Include="..\src\rail_gui.h" />
     <ClInclude Include="..\src\rail_type.h" />
     <ClInclude Include="..\src\rev.h" />
+    <ClInclude Include="..\src\road.h" />
     <ClInclude Include="..\src\road_cmd.h" />
     <ClInclude Include="..\src\road_func.h" />
     <ClInclude Include="..\src\road_gui.h" />
@@ -951,6 +953,7 @@
     <ClInclude Include="..\src\table\railtypes.h" />
     <ClInclude Include="..\src\table\road_land.h" />
     <ClInclude Include="..\src\table\roadveh_movement.h" />
+    <ClInclude Include="..\src\table\roadtypes.h" />
     <ClInclude Include="..\src\..\objs\settings\table\settings.h" />
     <ClInclude Include="..\src\table\sprites.h" />
     <ClInclude Include="..\src\table\station_land.h" />
@@ -1228,6 +1231,7 @@
     <ClCompile Include="..\src\newgrf_industrytiles.cpp" />
     <ClCompile Include="..\src\newgrf_object.cpp" />
     <ClCompile Include="..\src\newgrf_railtype.cpp" />
+    <ClCompile Include="..\src\newgrf_roadtype.cpp" />
     <ClCompile Include="..\src\newgrf_sound.cpp" />
     <ClCompile Include="..\src\newgrf_spritegroup.cpp" />
     <ClCompile Include="..\src\newgrf_station.cpp" />

diff --git a/projects/openttd_vs140.vcxproj.filters b/projects/openttd_vs140.vcxproj.filters
@@ -840,6 +840,9 @@
     <ClInclude Include="..\src\newgrf_railtype.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\newgrf_roadtype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\newgrf_sound.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -930,6 +933,9 @@
     <ClInclude Include="..\src\rev.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\road.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\road_cmd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1941,6 +1947,9 @@
     <ClInclude Include="..\src\table\roadveh_movement.h">
       <Filter>Tables</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\table\roadtypes.h">
+      <Filter>Tables</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\..\objs\settings\table\settings.h">
       <Filter>Tables</Filter>
     </ClInclude>
@@ -2772,6 +2781,9 @@
     <ClCompile Include="..\src\newgrf_railtype.cpp">
       <Filter>NewGRF</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\newgrf_roadtype.cpp">
+      <Filter>NewGRF</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\newgrf_sound.cpp">
       <Filter>NewGRF</Filter>
     </ClCompile>

diff --git a/projects/openttd_vs141.vcxproj b/projects/openttd_vs141.vcxproj
@@ -584,6 +584,7 @@
     <ClInclude Include="..\src\newgrf_object.h" />
     <ClInclude Include="..\src\newgrf_properties.h" />
     <ClInclude Include="..\src\newgrf_railtype.h" />
+    <ClInclude Include="..\src\newgrf_roadtype.h" />
     <ClInclude Include="..\src\newgrf_sound.h" />
     <ClInclude Include="..\src\newgrf_spritegroup.h" />
     <ClInclude Include="..\src\newgrf_station.h" />
@@ -614,6 +615,7 @@
     <ClInclude Include="..\src\rail_gui.h" />
     <ClInclude Include="..\src\rail_type.h" />
     <ClInclude Include="..\src\rev.h" />
+    <ClInclude Include="..\src\road.h" />
     <ClInclude Include="..\src\road_cmd.h" />
     <ClInclude Include="..\src\road_func.h" />
     <ClInclude Include="..\src\road_gui.h" />
@@ -951,6 +953,7 @@
     <ClInclude Include="..\src\table\railtypes.h" />
     <ClInclude Include="..\src\table\road_land.h" />
     <ClInclude Include="..\src\table\roadveh_movement.h" />
+    <ClInclude Include="..\src\table\roadtypes.h" />
     <ClInclude Include="..\src\..\objs\settings\table\settings.h" />
     <ClInclude Include="..\src\table\sprites.h" />
     <ClInclude Include="..\src\table\station_land.h" />
@@ -1228,6 +1231,7 @@
     <ClCompile Include="..\src\newgrf_industrytiles.cpp" />
     <ClCompile Include="..\src\newgrf_object.cpp" />
     <ClCompile Include="..\src\newgrf_railtype.cpp" />
+    <ClCompile Include="..\src\newgrf_roadtype.cpp" />
     <ClCompile Include="..\src\newgrf_sound.cpp" />
     <ClCompile Include="..\src\newgrf_spritegroup.cpp" />
     <ClCompile Include="..\src\newgrf_station.cpp" />

diff --git a/projects/openttd_vs141.vcxproj.filters b/projects/openttd_vs141.vcxproj.filters
@@ -840,6 +840,9 @@
     <ClInclude Include="..\src\newgrf_railtype.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\newgrf_roadtype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\newgrf_sound.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -930,6 +933,9 @@
     <ClInclude Include="..\src\rev.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\road.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\road_cmd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1941,6 +1947,9 @@
     <ClInclude Include="..\src\table\roadveh_movement.h">
       <Filter>Tables</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\table\roadtypes.h">
+      <Filter>Tables</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\..\objs\settings\table\settings.h">
       <Filter>Tables</Filter>
     </ClInclude>
@@ -2772,6 +2781,9 @@
     <ClCompile Include="..\src\newgrf_railtype.cpp">
       <Filter>NewGRF</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\newgrf_roadtype.cpp">
+      <Filter>NewGRF</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\newgrf_sound.cpp">
       <Filter>NewGRF</Filter>
     </ClCompile>

diff --git a/projects/openttd_vs142.vcxproj b/projects/openttd_vs142.vcxproj
@@ -584,6 +584,7 @@
     <ClInclude Include="..\src\newgrf_object.h" />
     <ClInclude Include="..\src\newgrf_properties.h" />
     <ClInclude Include="..\src\newgrf_railtype.h" />
+    <ClInclude Include="..\src\newgrf_roadtype.h" />
     <ClInclude Include="..\src\newgrf_sound.h" />
     <ClInclude Include="..\src\newgrf_spritegroup.h" />
     <ClInclude Include="..\src\newgrf_station.h" />
@@ -614,6 +615,7 @@
     <ClInclude Include="..\src\rail_gui.h" />
     <ClInclude Include="..\src\rail_type.h" />
     <ClInclude Include="..\src\rev.h" />
+    <ClInclude Include="..\src\road.h" />
     <ClInclude Include="..\src\road_cmd.h" />
     <ClInclude Include="..\src\road_func.h" />
     <ClInclude Include="..\src\road_gui.h" />
@@ -951,6 +953,7 @@
     <ClInclude Include="..\src\table\railtypes.h" />
     <ClInclude Include="..\src\table\road_land.h" />
     <ClInclude Include="..\src\table\roadveh_movement.h" />
+    <ClInclude Include="..\src\table\roadtypes.h" />
     <ClInclude Include="..\src\..\objs\settings\table\settings.h" />
     <ClInclude Include="..\src\table\sprites.h" />
     <ClInclude Include="..\src\table\station_land.h" />
@@ -1228,6 +1231,7 @@
     <ClCompile Include="..\src\newgrf_industrytiles.cpp" />
     <ClCompile Include="..\src\newgrf_object.cpp" />
     <ClCompile Include="..\src\newgrf_railtype.cpp" />
+    <ClCompile Include="..\src\newgrf_roadtype.cpp" />
     <ClCompile Include="..\src\newgrf_sound.cpp" />
     <ClCompile Include="..\src\newgrf_spritegroup.cpp" />
     <ClCompile Include="..\src\newgrf_station.cpp" />