Merge 4ed4fa556c into c69fc76395

.github/workflows/release-windows-store.yml

@@ -74,16 +74,16 @@ jobs:
         mkdir -p builds/common-binaries/baseset
         cd builds/common-binaries/baseset
 
-        echo "::group::Download OpenGFX"
-        curl -L https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip -o opengfx-all.zip
+        echo "::group::Download OpenGFX2"
+        curl -L https://github.com/OpenTTD/OpenGFX2/releases/download/v0.7/opengfx2_8.tar -o opengfx2_8.tar
         echo "::endgroup::"
 
-        echo "::group::Unpack OpenGFX"
-        unzip opengfx-all.zip
-        tar xf opengfx-*.tar
+        echo "::group::Unpack OpenGFX2"
+        tar xf opengfx2_8.tar
+        mv opengfx2_8 OpenGFX2_Classic-0.7
         echo "::endgroup::"
 
-        rm -f opengfx-all.zip opengfx-*.tar
+        rm -f opengfx2_8.tar
 
     - name: Install OpenMSX
       shell: bash

.github/workflows/upload-gog.yml

@@ -56,16 +56,16 @@ jobs:
         mkdir -p gog/opengfx/baseset
         cd gog/opengfx/baseset
 
-        echo "::group::Download OpenGFX"
-        curl -L https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip -o opengfx-all.zip
+        echo "::group::Download OpenGFX2"
+        curl -L https://github.com/OpenTTD/OpenGFX2/releases/download/v0.7/opengfx2_8.tar -o opengfx2_8.tar
         echo "::endgroup::"
 
-        echo "::group::Unpack OpenGFX"
-        unzip opengfx-all.zip
-        tar xf opengfx-*.tar
+        echo "::group::Unpack OpenGFX2"
+        tar xf opengfx2_8.tar
+        mv opengfx2_8 OpenGFX2_Classic-0.7
         echo "::endgroup::"
 
-        rm -f opengfx-all.zip opengfx-*.tar
+        rm -f opengfx2_8.tar
 
     - name: Install OpenMSX
       shell: bash

src/rail.h

@@ -184,7 +184,7 @@ public:
 	/**
 	 * Bridge offset
 	 */
-	SpriteID bridge_offset;
+	uint8_t bridge_offset;
 
 	/**
 	 * Original railtype number to use when drawing non-newgrf railtypes, or when drawing stations.