Fix: [Actions] Remove Ubuntu:groovy from release pipeline (#9846)

It no longer exists upstream. Let's focus on LTS only for now.

.github/stale.yml

@@ -0,0 +1,34 @@
+daysUntilClose: 7
+staleLabel: stale
+closeComment: false
+exemptMilestones: true
+exemptAssignees: true
+
+issues:
+  daysUntilStale: 60
+  exemptLabels:
+  - pinned
+  - security
+  - "good first issue"
+  - regression
+  markComment: >
+    This issue has been automatically marked as stale because it has not had any activity in the last two months.
+
+    If you believe the issue is still relevant, please test on the latest nightly and report back.
+
+    It will be closed if no further activity occurs within 7 days.
+
+    Thank you for your contributions.
+
+pulls:
+  daysUntilStale: 30
+  exemptLabels:
+  - pinned
+  markComment: >
+    This pull request has been automatically marked as stale because it has not had any activity in the last month.
+
+    Please feel free to give a status update now, ping for review, or re-open when it's ready.
+
+    It will be closed if no further activity occurs within 7 days.
+
+    Thank you for your contributions.

.github/workflows/ci-build.yml

@@ -16,17 +16,17 @@ jobs:
     runs-on: ubuntu-20.04
     container:
       # If you change this version, change the number in the cache step too.
-      image: emscripten/emsdk:3.1.28
+      image: emscripten/emsdk:2.0.31
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
 
     - name: Setup cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: /emsdk/upstream/emscripten/cache
-        key: 3.1.28-${{ runner.os }}
+        key: 2.0.31-${{ runner.os }}
 
     - name: Patch Emscripten to support LZMA
       run: |
@@ -91,7 +91,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
 
     - name: Install dependencies
       run: |
@@ -162,28 +162,19 @@ jobs:
 
     runs-on: macos-latest
     env:
-      MACOSX_DEPLOYMENT_TARGET: 10.13
+      MACOSX_DEPLOYMENT_TARGET: 10.14
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Install dependencies
-      env:
-        HOMEBREW_NO_AUTO_UPDATE: 1
-        HOMEBREW_NO_INSTALL_CLEANUP: 1
-      run: |
-        brew install \
-          pkg-config \
-          # EOF
+      uses: actions/checkout@v2
 
     - name: Prepare cache key
       id: key
       run: |
-        echo "image=$ImageOS-$ImageVersion" >> $GITHUB_OUTPUT
+        echo "::set-output name=image::$ImageOS-$ImageVersion"
 
     - name: Enable vcpkg cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: /usr/local/share/vcpkg/installed
         key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-0 # Increase the number whenever dependencies are modified
@@ -253,7 +244,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
 
     - name: Prepare cache key
       id: key
@@ -262,10 +253,10 @@ jobs:
         # Work around caching failure with GNU tar
         New-Item -Type Junction -Path vcpkg -Target c:\vcpkg
 
-        Write-Output "image=$env:ImageOS-$env:ImageVersion" >> $env:GITHUB_OUTPUT
+        Write-Output "::set-output name=image::$env:ImageOS-$env:ImageVersion"
 
     - name: Enable vcpkg cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: vcpkg/installed
         key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-0 # Increase the number whenever dependencies are modified
@@ -347,7 +338,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
 
     - name: Setup MSYS2
       uses: msys2/setup-msys2@v2
@@ -417,4 +408,4 @@ jobs:
 
     steps:
     - name: Check annotations
-      uses: OpenTTD/actions/annotation-check@v3
+      uses: OpenTTD/actions/annotation-check@v2

.github/workflows/commit-checker.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         fetch-depth: 4
 

.github/workflows/preview_build.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     container:
       # If you change this version, change the number in the cache step too.
-      image: emscripten/emsdk:3.1.28
+      image: emscripten/emsdk:2.0.31
 
     steps:
     - name: Update deployment status to in progress
@@ -31,7 +31,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.PREVIEW_GITHUB_TOKEN }}
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         ref: ${{ github.event.client_payload.sha }}
 
@@ -41,10 +41,10 @@ jobs:
         git checkout -b ${name}
 
     - name: Setup cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: /emsdk/upstream/emscripten/cache
-        key: 3.1.28-${{ runner.os }}
+        key: 2.0.31-${{ runner.os }}
 
     - name: Patch Emscripten to support LZMA
       run: |

.github/workflows/preview_label.yml

@@ -59,7 +59,7 @@ jobs:
 
     - if: steps.core_developer.outcome == 'success'
       name: Trigger 'preview build'
-      uses: peter-evans/repository-dispatch@v2
+      uses: peter-evans/repository-dispatch@v1
       with:
         token: ${{ secrets.PREVIEW_GITHUB_TOKEN }}
         event-type: "Preview build #${{ github.event.number }}"

.github/workflows/preview_push.yml

@@ -59,7 +59,7 @@ jobs:
 
     - if: toJson(fromJson(steps.earlier_preview.outputs.data)) != '[]' && contains(fromJson(steps.preview_label.outputs.data).*.name, 'preview')
       name: Trigger 'preview build'
-      uses: peter-evans/repository-dispatch@v2
+      uses: peter-evans/repository-dispatch@v1
       with:
         token: ${{ secrets.PREVIEW_GITHUB_TOKEN }}
         event-type: "Preview build #${{ github.event.number }}"

.github/workflows/release-docs.yml

@@ -1,85 +0,0 @@
-name: Release (Docs)
-
-on:
-  workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-
-jobs:
-  docs:
-    name: Docs
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - name: Download source
-      uses: actions/download-artifact@v3
-      with:
-        name: internal-source
-
-    - name: Unpack source
-      run: |
-        tar -xf source.tar.gz --strip-components=1
-
-    - name: Install dependencies
-      run: |
-        echo "::group::Update apt"
-        sudo apt-get update
-        echo "::endgroup::"
-
-        echo "::group::Install dependencies"
-        sudo apt-get install -y --no-install-recommends \
-          doxygen \
-          # EOF
-        echo "::endgroup::"
-      env:
-        DEBIAN_FRONTEND: noninteractive
-
-    - name: Build
-      run: |
-        mkdir -p ${GITHUB_WORKSPACE}/build
-        cd ${GITHUB_WORKSPACE}/build
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DOPTION_DOCS_ONLY=ON \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        cmake --build . --target docs
-        echo "::endgroup::"
-
-    - name: Create bundles
-      run: |
-        BASENAME=openttd-${{ inputs.version }}
-
-        cd ${GITHUB_WORKSPACE}/build
-
-        mv docs/source ${BASENAME}-docs
-        mv docs/ai-api ${BASENAME}-docs-ai
-        mv docs/gs-api ${BASENAME}-docs-gs
-
-        mkdir -p bundles
-
-        echo "::group::Create docs bundle"
-        tar --xz -cf bundles/${BASENAME}-docs.tar.xz ${BASENAME}-docs
-        echo "::endgroup::"
-
-        echo "::group::Create AI API docs bundle"
-        tar --xz -cf bundles/${BASENAME}-docs-ai.tar.xz ${BASENAME}-docs-ai
-        echo "::endgroup::"
-
-        echo "::group::Create GameScript API docs bundle"
-        tar --xz -cf bundles/${BASENAME}-docs-gs.tar.xz ${BASENAME}-docs-gs
-        echo "::endgroup::"
-
-    - name: Store bundles
-      uses: actions/upload-artifact@v3
-      with:
-        name: openttd-docs
-        path: build/bundles/*.tar.xz
-        retention-days: 5

.github/workflows/release-linux.yml

@@ -1,152 +0,0 @@
-name: Release (Linux)
-
-on:
-  workflow_call:
-
-jobs:
-  linux:
-    name: Linux (Generic)
-
-    runs-on: ubuntu-20.04
-    container:
-      # manylinux2014 is based on CentOS 7, but already has a lot of things
-      # installed and preconfigured. It makes it easier to build OpenTTD.
-      image: quay.io/pypa/manylinux2014_x86_64
-
-    steps:
-    - name: Download source
-      uses: actions/download-artifact@v3
-      with:
-        name: internal-source
-
-    - name: Unpack source
-      run: |
-        tar -xf source.tar.gz --strip-components=1
-
-    - name: Enable vcpkg cache
-      uses: actions/cache@v3
-      with:
-        path: /vcpkg/installed
-        key: ubuntu-20.04-vcpkg-release-0 # Increase the number whenever dependencies are modified
-        restore-keys: |
-          ubuntu-20.04-vcpkg-release
-
-    - name: Install dependencies
-      run: |
-        echo "::group::Install system dependencies"
-        # ICU is used as vcpkg fails to install ICU. Other dependencies
-        # are needed either for vcpkg or for the packages installed with
-        # vcpkg.
-        yum install -y \
-          libicu-devel \
-          perl-IPC-Cmd \
-          wget \
-          zip \
-          # EOF
-        echo "::endgroup::"
-
-        # The yum variant of fluidsynth depends on all possible audio drivers,
-        # like jack, ALSA, pulseaudio, etc. This is not really useful for us,
-        # as we route the output of fluidsynth back via our sound driver, and
-        # as such do not use these audio driver outputs at all.
-        # The vcpkg variant of fluidsynth depends on ALSA. Similar issue here.
-        # So instead, we compile fluidsynth ourselves, with as few
-        # dependencies as possible. We do it before anything else is installed,
-        # to make sure it doesn't pick up on any of the drivers.
-        echo "::group::Install fluidsynth"
-        wget https://github.com/FluidSynth/fluidsynth/archive/v2.3.3.tar.gz
-        tar xf v2.3.3.tar.gz
-        (
-          cd fluidsynth-2.3.3
-          mkdir build
-          cd build
-          cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-          cmake --build . -j $(nproc)
-          cmake --install .
-        )
-        echo "::endgroup::"
-
-        echo "::group::Install audio drivers"
-        # These audio libs are to make sure the SDL version of vcpkg adds
-        # sound-support; these libraries are not added to the resulting
-        # binary, but the headers are used to enable them in SDL.
-        yum install -y \
-          alsa-lib-devel \
-          jack-audio-connection-kit-devel \
-          pulseaudio-libs-devel \
-          # EOF
-        echo "::endgroup::"
-
-        # We use vcpkg for our dependencies, to get more up-to-date version.
-        echo "::group::Install vcpkg and dependencies"
-
-        # We do a little dance to make sure we copy the cached install folder
-        # into our new clone.
-        git clone --depth=1 https://github.com/microsoft/vcpkg /vcpkg-clone
-        if [ -e /vcpkg/installed ]; then
-          mv /vcpkg/installed /vcpkg-clone/
-          rm -rf /vcpkg
-        fi
-        mv /vcpkg-clone /vcpkg
-
-        (
-          cd /vcpkg
-          ./bootstrap-vcpkg.sh -disableMetrics
-
-          # Make Python3 available for other packages.
-          ./vcpkg install python3
-          ln -sf $(pwd)/installed/x64-linux/tools/python3/python3.[0-9][0-9] /usr/bin/python3
-
-          ./vcpkg install \
-            curl[http2] \
-            fontconfig \
-            freetype \
-            liblzma \
-            libpng \
-            lzo \
-            sdl2 \
-            zlib \
-            # EOF
-        )
-        echo "::endgroup::"
-
-    - name: Install GCC problem matcher
-      uses: ammaraskar/gcc-problem-matcher@master
-
-    - name: Build
-      run: |
-        mkdir -p build
-        cd build
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DOPTION_PACKAGE_DEPENDENCIES=ON \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        cmake --build . -j $(nproc)
-        echo "::endgroup::"
-
-    - name: Create bundles
-      run: |
-        cd ${GITHUB_WORKSPACE}/build
-        echo "::group::Run CPack"
-        cpack
-        echo "::endgroup::"
-
-        echo "::group::Cleanup"
-        # Remove the sha256 files CPack generates; we will do this ourself at
-        # the end of this workflow.
-        rm -f bundles/*.sha256
-        echo "::endgroup::"
-
-    - name: Store bundles
-      uses: actions/upload-artifact@v3
-      with:
-        name: openttd-linux-generic
-        path: build/bundles
-        retention-days: 5

.github/workflows/release-macos.yml

@@ -1,198 +0,0 @@
-name: Release (MacOS)
-
-on:
-  workflow_call:
-
-jobs:
-  macos:
-    name: MacOS
-
-    runs-on: macos-11
-    env:
-      MACOSX_DEPLOYMENT_TARGET: 10.13
-
-    steps:
-    - name: Download source
-      uses: actions/download-artifact@v3
-      with:
-        name: internal-source
-
-    - name: Unpack source
-      run: |
-        tar -xf source.tar.gz --strip-components=1
-
-    - name: Install dependencies
-      env:
-        HOMEBREW_NO_AUTO_UPDATE: 1
-        HOMEBREW_NO_INSTALL_CLEANUP: 1
-      run: |
-        brew install \
-          pandoc \
-          pkg-config \
-          # EOF
-
-    - name: Prepare cache key
-      id: key
-      run: |
-        echo "image=$ImageOS-$ImageVersion" >> $GITHUB_OUTPUT
-
-    - name: Enable vcpkg cache
-      uses: actions/cache@v3
-      with:
-        path: /usr/local/share/vcpkg/installed
-        key: ${{ steps.key.outputs.image }}-vcpkg-release-0 # Increase the number whenever dependencies are modified
-        restore-keys: |
-          ${{ steps.key.outputs.image }}-vcpkg-release
-          ${{ steps.key.outputs.image }}-vcpkg-x64
-
-    - name: Prepare vcpkg
-      run: |
-        vcpkg install \
-          liblzma:x64-osx \
-          liblzma:arm64-osx \
-          libpng:x64-osx \
-          libpng:arm64-osx \
-          lzo:x64-osx \
-          lzo:arm64-osx \
-          zlib:x64-osx \
-          zlib:arm64-osx \
-          # EOF
-
-    - name: Install GCC problem matcher
-      uses: ammaraskar/gcc-problem-matcher@master
-
-    - name: Build tools
-      run: |
-        mkdir build-host
-        cd build-host
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DOPTION_TOOLS_ONLY=ON \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build tools"
-        echo "Running on $(sysctl -n hw.logicalcpu) cores"
-        cmake --build . -j $(sysctl -n hw.logicalcpu) --target tools
-        echo "::endgroup::"
-
-    - name: Import code signing certificates
-      uses: Apple-Actions/import-codesign-certs@v2
-      with:
-        # The certificates in a PKCS12 file encoded as a base64 string
-        p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
-        # The password used to import the PKCS12 file.
-        p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
-      # If this is run on a fork, there may not be a certificate set up - continue in this case
-      continue-on-error: true
-
-    - name: Build arm64
-      run: |
-        mkdir build-arm64
-        cd build-arm64
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -DCMAKE_OSX_ARCHITECTURES=arm64 \
-          -DVCPKG_TARGET_TRIPLET=arm64-osx \
-          -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
-          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(sysctl -n hw.logicalcpu) cores"
-        cmake --build . -j $(sysctl -n hw.logicalcpu)
-        echo "::endgroup::"
-
-    - name: Build x64
-      run: |
-        mkdir build-x64
-        cd build-x64
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -DCMAKE_OSX_ARCHITECTURES=x86_64 \
-          -DVCPKG_TARGET_TRIPLET=x64-osx \
-          -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
-          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DCPACK_BUNDLE_APPLE_CERT_APP=${{ secrets.APPLE_DEVELOPER_CERTIFICATE_ID }} \
-          "-DCPACK_BUNDLE_APPLE_CODESIGN_PARAMETER=--deep -f --options runtime" \
-          -DAPPLE_UNIVERSAL_PACKAGE=1 \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(sysctl -n hw.logicalcpu) cores"
-        cmake --build . -j $(sysctl -n hw.logicalcpu)
-        echo "::endgroup::"
-
-    - name: Create bundles
-      run: |
-        cd build-x64
-
-        echo "::group::Create universal binary"
-        # Combine the `openttd` binaries from each build into a single file
-        lipo -create -output openttd-universal ../build-*/openttd
-        mv openttd-universal openttd
-        echo "::endgroup::"
-
-        echo "::group::Run CPack"
-        cpack
-        echo "::endgroup::"
-
-        echo "::group::Cleanup"
-        # Remove the sha256 files CPack generates; we will do this ourself at
-        # the end of this workflow.
-        rm -f bundles/*.sha256
-        echo "::endgroup::"
-
-    - name: Notarize
-      env:
-        AC_USERNAME: ${{ secrets.APPLE_DEVELOPER_APP_USERNAME }}
-        AC_PASSWORD: ${{ secrets.APPLE_DEVELOPER_APP_PASSWORD }}
-        AC_TEAM_ID: ${{ secrets.APPLE_DEVELOPER_TEAM_ID }}
-      run: |
-        if [ -z "${AC_USERNAME}" ]; then
-            # We may be running on a fork that doesn't have notarization secrets set up; skip this step
-            echo No notarization secrets set up, skipping.
-            exit 0
-        fi
-
-        xcrun notarytool store-credentials --apple-id "${AC_USERNAME}" --password "${AC_PASSWORD}" --team-id "${AC_TEAM_ID}" openttd
-        cd build-x64
-        ../os/macosx/notarize.sh
-
-    - name: Build zip
-      run: |
-        cd build-x64
-
-        pushd _CPack_Packages/*/Bundle/openttd-*/
-
-        # Remove the Applications symlink from the staging folder
-        rm -f Applications
-
-        # Remove the original dmg built by CPack to avoid a conflict when resolving
-        # the zip_filename variable below
-        rm -f ../*.dmg
-
-        zip_filename=(../openttd-*)
-
-        # Package up the existing, notarised .app into a zip file
-        zip -r -9 ${zip_filename}.zip OpenTTD.app
-
-        popd
-
-        # Now move it into place to be uploaded
-        mv _CPack_Packages/*/Bundle/openttd-*.zip bundles/
-
-    - name: Store bundles
-      uses: actions/upload-artifact@v3
-      with:
-        name: openttd-macos-universal
-        path: build-x64/bundles
-        retention-days: 5

.github/workflows/release-source.yml

@@ -1,186 +0,0 @@
-name: Release (Source)
-
-on:
-  workflow_call:
-    outputs:
-      version:
-        value: ${{ jobs.source.outputs.version }}
-      is_tag:
-        value: ${{ jobs.source.outputs.is_tag }}
-      trigger_type:
-        value: ${{ jobs.source.outputs.trigger_type }}
-      folder:
-        value: ${{ jobs.source.outputs.folder }}
-
-jobs:
-  source:
-    name: Source
-
-    runs-on: ubuntu-20.04
-
-    outputs:
-      version: ${{ steps.metadata.outputs.version }}
-      is_tag: ${{ steps.metadata.outputs.is_tag }}
-      trigger_type: ${{ steps.metadata.outputs.trigger_type }}
-      folder: ${{ steps.metadata.outputs.folder }}
-
-    steps:
-    - name: Checkout (Release)
-      if: github.event_name == 'release'
-      uses: actions/checkout@v3
-      with:
-        # We generate a changelog; for this we need the full git log.
-        fetch-depth: 0
-
-    - name: Checkout (Manual)
-      if: github.event_name == 'workflow_dispatch'
-      uses: actions/checkout@v3
-      with:
-        ref: ${{ github.event.inputs.ref }}
-        # We generate a changelog; for this we need the full git log.
-        fetch-depth: 0
-
-    - name: Checkout (Trigger)
-      if: github.event_name == 'repository_dispatch'
-      uses: actions/checkout@v3
-      with:
-        ref: ${{ github.event.client_payload.ref }}
-        # We generate a changelog; for this we need the full git log.
-        fetch-depth: 0
-
-    - name: Check valid branch name
-      run: |
-        if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-          REF="${{ github.event.inputs.ref }}"
-        elif [ "${{ github.event_name }}" = "repository_dispatch" ]; then
-          REF="${{ github.event.client_payload.ref }}"
-        else
-          REF="${{ github.ref }}"
-        fi
-
-        # Check if we are a tag.
-        if [ -n "$(git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || false)" ]; then
-          exit 0
-        fi
-
-        # Check if the checkout caused the branch to be named.
-        if [ "$(git rev-parse --abbrev-ref HEAD)" != "HEAD" ]; then
-          exit 0
-        fi
-
-        # Check if this was a pull request.
-        if [ -n "$(echo ${REF} | grep '^refs/pull/[0-9]*')" ]; then
-          PULL=$(echo ${REF} | cut -d/ -f3)
-          git checkout -b pr${PULL}
-        fi
-
-        # Are we still in a detached state? Error out.
-        if [ "$(git rev-parse --abbrev-ref HEAD)" == "HEAD" ]; then
-          echo "The 'ref' given resulted in a checkout of a detached HEAD."
-          echo "We cannot detect the version for these checkout accurate."
-          echo ""
-          echo "If you want to build a Pull Request, make sure you use 'refs/pull/NNN/head'."
-          echo ""
-          echo "Cancelling build, as without a version we cannot store the artifacts."
-          exit 1
-        fi
-
-    - name: Generate metadata
-      id: metadata
-      run: |
-        echo "::group::Prepare metadata files"
-        cmake -DGENERATE_OTTDREV=1 -P cmake/scripts/FindVersion.cmake
-        ./.github/changelog.sh > .changelog
-        TZ='UTC' date +"%Y-%m-%d %H:%M UTC" > .release_date
-        cat .ottdrev | cut -f 1 -d$'\t' > .version
-
-        if [ $(cat .ottdrev | cut -f 5 -d$'\t') = '1' ]; then
-          # Assume that all tags are always releases. Why else make a tag?
-          IS_TAG="true"
-
-          FOLDER="${{ env.FOLDER_RELEASES }}"
-          TRIGGER_TYPE="new-tag"
-        else
-          IS_TAG="false"
-
-          BRANCH=$(git symbolic-ref -q HEAD | sed 's@.*/@@')
-          if [ -z "${BRANCH}" ]; then
-            echo "Internal error: branch name is empty."
-            echo "An earlier step should have prevented this from happening."
-            echo "Cancelling build, as without a branch name we cannot store the artifacts"
-            exit 1
-          fi
-
-          if [ "${BRANCH}" = "${{ env.NIGHTLIES_BRANCH }}" ]; then
-            # The "master" branch is special, and we call a nightly.
-            FOLDER="${{ env.FOLDER_NIGHTLIES }}/$(date +%Y)"
-            TRIGGER_TYPE="new-master"
-          else
-            # All other branches, which can be builds of Pull Requests, are
-            # put in their own folder.
-            FOLDER="${{ env.FOLDER_BRANCHES }}/${BRANCH}"
-            TRIGGER_TYPE="new-branch"
-          fi
-        fi
-
-        mkdir -p build/bundles
-        cp .changelog build/bundles/changelog.txt
-        cp .release_date build/bundles/released.txt
-        cp README.md build/bundles/README.md
-        echo "::endgroup::"
-
-        echo "Release Date: $(cat .release_date)"
-        echo "Revision: $(cat .ottdrev)"
-        echo "Version: $(cat .version)"
-        echo "Is tag: ${IS_TAG}"
-        echo "Folder on CDN: ${FOLDER}"
-        echo "Workflow trigger: ${TRIGGER_TYPE}"
-
-        echo "version=$(cat .version)" >> $GITHUB_OUTPUT
-        echo "is_tag=${IS_TAG}" >> $GITHUB_OUTPUT
-        echo "folder=${FOLDER}" >> $GITHUB_OUTPUT
-        echo "trigger_type=${TRIGGER_TYPE}" >> $GITHUB_OUTPUT
-      env:
-        NIGHTLIES_BRANCH: master
-        FOLDER_RELEASES: openttd-releases
-        FOLDER_NIGHTLIES: openttd-nightlies
-        FOLDER_BRANCHES: openttd-branches
-
-    - name: Remove VCS information
-      run: |
-        rm -rf .git
-
-    - name: Create bundles
-      run: |
-        FOLDER_NAME=openttd-${{ steps.metadata.outputs.version }}
-
-        # Rename the folder to openttd-NNN
-        mkdir ${FOLDER_NAME}
-        find . -maxdepth 1 -not -name . -not -name build -not -name ${FOLDER_NAME} -exec mv {} ${FOLDER_NAME}/ \;
-
-        echo "::group::Create tarball (xz) bundle"
-        tar --xz -cvf build/bundles/${FOLDER_NAME}-source.tar.xz ${FOLDER_NAME}
-        echo "::endgroup::"
-
-        # This tarball is only to be used within this workflow.
-        echo "::group::Create tarball (gz) bundle"
-        tar --gzip -cvf source.tar.gz ${FOLDER_NAME}
-        echo "::endgroup::"
-
-        echo "::group::Create zip bundle"
-        zip -9 -r build/bundles/${FOLDER_NAME}-source.zip ${FOLDER_NAME}
-        echo "::endgroup::"
-
-    - name: Store bundles
-      uses: actions/upload-artifact@v3
-      with:
-        name: openttd-source
-        path: build/bundles/*
-        retention-days: 5
-
-    - name: Store source (for other jobs)
-      uses: actions/upload-artifact@v3
-      with:
-        name: internal-source
-        path: source.tar.gz
-        retention-days: 1

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

@@ -1,192 +0,0 @@
-name: Release (Windows Store)
-
-on:
-  workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-
-jobs:
-  windows-store:
-    name: Windows Store
-
-    runs-on: windows-latest
-
-    steps:
-    - name: Download source
-      uses: actions/download-artifact@v3
-      with:
-        name: internal-source
-
-    - name: Unpack source
-      shell: bash
-      run: |
-        tar -xf source.tar.gz --strip-components=1
-
-    - name: Download x86 build
-      uses: actions/download-artifact@v3
-      with:
-        name: openttd-windows-x86
-
-    - name: Download x64 build
-      uses: actions/download-artifact@v3
-      with:
-        name: openttd-windows-x64
-
-    - name: Download arm64 build
-      uses: actions/download-artifact@v3
-      with:
-        name: openttd-windows-arm64
-
-    - name: Unpack builds
-      shell: bash
-      run: |
-        mkdir builds
-        cd builds
-
-        function extract {
-            mkdir $1
-
-            # Extract the zip version of the release
-            unzip ../openttd-*-windows-$2.zip -d $1
-
-            # Remove the extraneous directory
-            mv $1/openttd-*-windows-$2/* $1/
-            rmdir $1/openttd-*-windows-$2
-
-            # Move the openttd.exe to the '{arch}-binaries' folder
-            mkdir $1-binaries
-            mv $1/openttd.exe $1-binaries/
-        }
-
-        extract x86 win32
-        extract x64 win64
-        extract arm64 arm64
-
-        # Use the "x86" folder as the source of the common binaries (lang files, etc) and remove the others
-        mv x86 common-binaries
-        rm -rf x64 arm64
-
-    - name: Install OpenGFX
-      shell: bash
-      run: |
-        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 "::endgroup::"
-
-        echo "::group::Unpack OpenGFX"
-        unzip opengfx-all.zip
-        tar xf opengfx-*.tar
-        echo "::endgroup::"
-
-        rm -f opengfx-all.zip opengfx-*.tar
-
-    - name: Install OpenMSX
-      shell: bash
-      run: |
-        mkdir -p builds/common-binaries/baseset
-        cd builds/common-binaries/baseset
-
-        echo "::group::Download OpenMSX"
-        curl -L https://cdn.openttd.org/openmsx-releases/0.4.2/openmsx-0.4.2-all.zip -o openmsx-all.zip
-        echo "::endgroup::"
-
-        echo "::group::Unpack OpenGFX"
-        unzip openmsx-all.zip
-        tar xf openmsx-*.tar
-        echo "::endgroup::"
-
-        rm -f openmsx-all.zip openmsx-*.tar
-
-    - name: Install OpenSFX
-      shell: bash
-      run: |
-        mkdir -p builds/common-binaries/baseset/opensfx
-        cd builds/common-binaries/baseset/opensfx
-
-        echo "::group::Download OpenSFX"
-        curl -L https://cdn.openttd.org/opensfx-releases/1.0.3/opensfx-1.0.3-all.zip -o opensfx-all.zip
-        echo "::endgroup::"
-
-        echo "::group::Unpack OpenSFX"
-        unzip opensfx-all.zip
-        tar xf opensfx-*.tar
-        echo "::endgroup::"
-
-        rm -f opensfx-all.zip opensfx-*.tar
-
-    - name: Generate signing certificate
-      shell: cmd
-      run: |
-        cd builds
-
-        REM We need to provide a signed .appx to the Windows Store, so generate a certificate with password 'password'
-        call ..\os\windows\winstore\generate-key.bat "CN=78024DA8-4BE4-4C77-B12E-547BBF7359D2" password cert.pfx
-
-    - name: Generate assets
-      shell: cmd
-      run: |
-        cd os\windows\winstore
-        call generate-assets.bat
-
-    - name: Prepare manifests
-      shell: cmd
-      run: |
-        cd builds
-        mkdir manifests
-
-        REM Set the version environment variable
-        call ..\os\windows\winstore\set-version.bat x86-binaries\openttd.exe
-
-        call ..\os\windows\winstore\prepare-manifests.bat manifests "CN=78024DA8-4BE4-4C77-B12E-547BBF7359D2" "57420OpenTTDDevelopers.OpenTTDofficial"
-
-    - name: Prepare binaries
-      shell: bash
-      run: |
-        cd builds
-
-        # Copy the Windows Store assets
-        mkdir common-binaries/Assets
-        cp -R ../os/windows/winstore/assets-common/* common-binaries/Assets/
-
-        mkdir Assets
-        cp -R ../os/windows/winstore/assets/* Assets/
-
-        cp manifests/*.xml .
-
-    - name: Build
-      shell: cmd
-      run: |
-        REM Add the Windows SDK tools to the PATH
-
-        echo|set /p="SET VS_INSTALLDIR=" > _vspath.bat
-        vswhere -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath >> _vspath.bat
-        call _vspath.bat
-        call "%VS_INSTALLDIR%\Common7\Tools\VsDevCmd.bat"
-
-        REM Set the version environment variable
-        call os\windows\winstore\set-version.bat builds\x86-binaries\openttd.exe
-
-        cd builds
-        mkdir output
-
-        REM Build and sign the package
-        makeappx build /v /f PackagingLayout.xml /op output\ /bv %OTTD_VERSION% /pv %OTTD_VERSION% /ca
-        SignTool sign /fd sha256 /a /f cert.pfx /p password "output\OpenTTD.appxbundle"
-
-        REM Move resulting files to bundles folder
-        mkdir bundles
-        mkdir bundles\internal
-        move cert.pfx bundles\internal\openttd-${{ inputs.version }}-windows-store.pfx
-        move output\OpenTTD.appxbundle bundles\internal\openttd-${{ inputs.version }}-windows-store.appxbundle
-
-    - name: Store bundles
-      uses: actions/upload-artifact@v3
-      with:
-        name: openttd-windows-store
-        path: builds/bundles
-        retention-days: 5

.github/workflows/release-windows.yml

@@ -1,201 +0,0 @@
-name: Release (Windows)
-
-on:
-  workflow_call:
-    inputs:
-      is_tag:
-        required: true
-        type: string
-
-jobs:
-  windows:
-    name: Windows
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - arch: x86
-          host: x86
-        - arch: x64
-          host: x64
-        - arch: arm64
-          host: x64_arm64
-
-    runs-on: windows-latest
-
-    steps:
-    - name: Download source
-      uses: actions/download-artifact@v3
-      with:
-        name: internal-source
-
-    - name: Unpack source
-      shell: bash
-      run: |
-        tar -xf source.tar.gz --strip-components=1
-
-    - name: Install dependencies
-      shell: bash
-      run: |
-        choco install pandoc
-
-    - name: Prepare cache key
-      id: key
-      shell: powershell
-      run: |
-        # Work around caching failure with GNU tar
-        New-Item -Type Junction -Path vcpkg -Target c:\vcpkg
-
-        Write-Output "image=$env:ImageOS-$env:ImageVersion" >> $env:GITHUB_OUTPUT
-
-    - name: Enable vcpkg cache
-      uses: actions/cache@v3
-      with:
-        path: vcpkg/installed
-        key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-0 # Increase the number whenever dependencies are modified
-        restore-keys: |
-          ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}
-
-    - name: Prepare vcpkg
-      shell: bash
-      run: |
-        vcpkg install --triplet=${{ matrix.arch }}-windows-static \
-          liblzma \
-          libpng \
-          lzo \
-          zlib \
-          # EOF
-
-    - name: Install MSVC problem matcher
-      uses: ammaraskar/msvc-problem-matcher@master
-
-    - name: Configure developer command prompt for tools
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x64
-
-    - name: Build tools
-      shell: bash
-      run: |
-        mkdir build-host
-        cd build-host
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -GNinja \
-          -DOPTION_TOOLS_ONLY=ON \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        cmake --build . --target tools
-        echo "::endgroup::"
-
-    - name: Configure developer command prompt for ${{ matrix.arch }}
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: ${{ matrix.host }}
-
-    - name: Import code signing certificate
-      shell: powershell
-      # If this is run on a fork, there may not be a certificate set up - continue in this case
-      continue-on-error: true
-      run: |
-        $tempFile = [System.IO.Path]::GetTempFileName()
-        $bytes = [System.Convert]::FromBase64String($env:WINDOWS_CERTIFICATE_P12)
-        [IO.File]::WriteAllBytes($tempFile, $bytes)
-        $pwd = ConvertTo-SecureString $env:WINDOWS_CERTIFICATE_PASSWORD -AsPlainText -Force
-        Import-PfxCertificate -FilePath $tempFile -CertStoreLocation Cert:\CurrentUser\My -Password $pwd
-        Remove-Item $tempFile
-      env:
-        WINDOWS_CERTIFICATE_P12: ${{ secrets.WINDOWS_CERTIFICATE_P12 }}
-        WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
-
-    - name: Build (with installer)
-      if: inputs.is_tag == 'true'
-      shell: bash
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -GNinja \
-          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
-          -DCMAKE_TOOLCHAIN_FILE="c:\vcpkg\scripts\buildsystems\vcpkg.cmake" \
-          -DOPTION_USE_NSIS=ON \
-          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DWINDOWS_CERTIFICATE_COMMON_NAME="${WINDOWS_CERTIFICATE_COMMON_NAME}" \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        cmake --build .
-        echo "::endgroup::"
-      env:
-        WINDOWS_CERTIFICATE_COMMON_NAME: ${{ secrets.WINDOWS_CERTIFICATE_COMMON_NAME }}
-
-    - name: Build (without installer)
-      if: inputs.is_tag != 'true'
-      shell: bash
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -GNinja \
-          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
-          -DCMAKE_TOOLCHAIN_FILE="c:\vcpkg\scripts\buildsystems\vcpkg.cmake" \
-          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DWINDOWS_CERTIFICATE_COMMON_NAME="${WINDOWS_CERTIFICATE_COMMON_NAME}" \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        cmake --build .
-        echo "::endgroup::"
-      env:
-        WINDOWS_CERTIFICATE_COMMON_NAME: ${{ secrets.WINDOWS_CERTIFICATE_COMMON_NAME }}
-
-    - name: Create bundles
-      shell: bash
-      run: |
-        cd ${GITHUB_WORKSPACE}/build
-        echo "::group::Run CPack"
-        cpack
-        echo "::endgroup::"
-
-        echo "::group::Prepare PDB to be bundled"
-        PDB=$(ls bundles/*.zip | cut -d/ -f2 | sed 's/.zip$/.pdb/')
-        cp openttd.pdb bundles/${PDB}
-        xz -9 bundles/${PDB}
-        echo "::endgroup::"
-
-        echo "::group::Cleanup"
-        # Remove the sha256 files CPack generates; we will do this ourself at
-        # the end of this workflow.
-        rm -f bundles/*.sha256
-        echo "::endgroup::"
-
-    - name: Sign installer
-      if: inputs.is_tag == 'true'
-      shell: bash
-      # If this is run on a fork, there may not be a certificate set up - continue in this case
-      continue-on-error: true
-      run: |
-        cd ${GITHUB_WORKSPACE}/build/bundles
-        ../../os/windows/sign.bat *.exe "${WINDOWS_CERTIFICATE_COMMON_NAME}"
-      env:
-        WINDOWS_CERTIFICATE_COMMON_NAME: ${{ secrets.WINDOWS_CERTIFICATE_COMMON_NAME }}
-
-    - name: Store bundles
-      uses: actions/upload-artifact@v3
-      with:
-        name: openttd-windows-${{ matrix.arch }}
-        path: build/bundles
-        retention-days: 5

.github/workflows/unused-strings.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
 
     - name: Check for unused strings
       run: |

.github/workflows/upload-cdn.yml

@@ -1,103 +0,0 @@
-name: Upload (CDN)
-
-on:
-  workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-      folder:
-        required: true
-        type: string
-      trigger_type:
-        required: true
-        type: string
-
-jobs:
-  prepare:
-    name: Prepare
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Download all bundles
-      uses: actions/download-artifact@v3
-
-    - name: Calculate checksums
-      run: |
-        echo "::group::Move bundles to a single folder"
-        mkdir bundles
-        mv openttd-*/* bundles/
-        echo "::endgroup::"
-
-        cd bundles
-        for i in $(ls openttd-*); do
-          echo "::group::Calculating checksums for ${i}"
-          openssl dgst -r -md5 -hex $i > $i.md5sum
-          openssl dgst -r -sha1 -hex $i > $i.sha1sum
-          openssl dgst -r -sha256 -hex $i > $i.sha256sum
-          echo "::endgroup::"
-        done
-
-        # Some targets generate files that are meant for our-eyes-only.
-        # They are stored in the "internal" folder, and contains bundles
-        # for targets like Windows Store. No user has a benefit of knowing
-        # they exist, hence: internal.
-        if [ -e internal ]; then
-          cd internal
-          for i in $(ls openttd-*); do
-            echo "::group::Calculating checksums for ${i}"
-            openssl dgst -r -md5 -hex $i > $i.md5sum
-            openssl dgst -r -sha1 -hex $i > $i.sha1sum
-            openssl dgst -r -sha256 -hex $i > $i.sha256sum
-            echo "::endgroup::"
-          done
-        fi
-
-    - name: Store bundles
-      uses: actions/upload-artifact@v3
-      with:
-        name: cdn-bundles
-        path: bundles/*
-        retention-days: 5
-
-  publish:
-    needs:
-    - prepare
-
-    name: Publish
-    uses: OpenTTD/actions/.github/workflows/rw-cdn-upload.yml@v4
-    secrets:
-      CDN_SIGNING_KEY: ${{ secrets.CDN_SIGNING_KEY }}
-      DEPLOYMENT_APP_ID: ${{ secrets.DEPLOYMENT_APP_ID }}
-      DEPLOYMENT_APP_PRIVATE_KEY: ${{ secrets.DEPLOYMENT_APP_PRIVATE_KEY }}
-    with:
-      artifact-name: cdn-bundles
-      folder: ${{ inputs.folder }}
-      version: ${{ inputs.version }}
-
-  docs:
-    if: ${{ inputs.trigger_type == 'new-master' }}
-    needs:
-    - publish
-
-    name: Publish docs
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Generate access token
-      id: generate_token
-      uses: tibdex/github-app-token@v1
-      with:
-        app_id: ${{ secrets.DEPLOYMENT_APP_ID }}
-        private_key: ${{ secrets.DEPLOYMENT_APP_PRIVATE_KEY }}
-        repository: OpenTTD/workflows
-
-    - name: Trigger 'Publish Docs'
-      uses: peter-evans/repository-dispatch@v2
-      with:
-        token: ${{ steps.generate_token.outputs.token }}
-        repository: OpenTTD/workflows
-        event-type: publish-docs
-        client-payload: '{"version": "${{ inputs.version }}", "folder": "${{ inputs.folder }}"}'

.github/workflows/upload-gog.yml

@@ -1,151 +0,0 @@
-name: Upload (GOG)
-
-on:
-  workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-
-jobs:
-  upload:
-    name: Upload (GOG)
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - name: Download source
-      uses: actions/download-artifact@v3
-      with:
-        name: internal-source
-        path: internal-source
-
-    - name: Download bundle (Windows x86)
-      uses: actions/download-artifact@v3
-      with:
-        name: openttd-windows-x86
-        path: openttd-windows-x86
-
-    - name: Download bundle (Windows x64)
-      uses: actions/download-artifact@v3
-      with:
-        name: openttd-windows-x64
-        path: openttd-windows-x64
-
-    - name: Download bundle (MacOS)
-      uses: actions/download-artifact@v3
-      with:
-        name: openttd-macos-universal
-        path: openttd-macos-universal
-
-    - name: Download bundle (Linux)
-      uses: actions/download-artifact@v3
-      with:
-        name: openttd-linux-generic
-        path: openttd-linux-generic
-
-    - name: Install GOG Galaxy Build Creator
-      run: |
-        wget https://cdn.gog.com/open/galaxy/pipeline/build_creator/gnu-linux/GOGGalaxyBuildCreator-1.4.0.AppImage
-        7z x GOGGalaxyBuildCreator-1.4.0.AppImage
-        chmod +x ./app/GOGGalaxyPipelineBuilder
-
-    - name: Install OpenGFX
-      shell: bash
-      run: |
-        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 "::endgroup::"
-
-        echo "::group::Unpack OpenGFX"
-        unzip opengfx-all.zip
-        echo "::endgroup::"
-
-        rm -f opengfx-all.zip
-
-    - name: Install OpenMSX
-      shell: bash
-      run: |
-        mkdir -p gog/openmsx/baseset
-        cd gog/openmsx/baseset
-
-        echo "::group::Download OpenMSX"
-        curl -L https://cdn.openttd.org/openmsx-releases/0.4.2/openmsx-0.4.2-all.zip -o openmsx-all.zip
-        echo "::endgroup::"
-
-        echo "::group::Unpack OpenGFX"
-        unzip openmsx-all.zip
-        tar xf openmsx-*.tar
-        echo "::endgroup::"
-
-        rm -f openmsx-all.zip openmsx-*.tar
-
-    - name: Install OpenSFX
-      shell: bash
-      run: |
-        mkdir -p gog/opensfx/baseset
-        cd gog/opensfx/baseset
-
-        echo "::group::Download OpenSFX"
-        curl -L https://cdn.openttd.org/opensfx-releases/1.0.3/opensfx-1.0.3-all.zip -o opensfx-all.zip
-        echo "::endgroup::"
-
-        echo "::group::Unpack OpenSFX"
-        unzip opensfx-all.zip
-        tar xf opensfx-*.tar
-        echo "::endgroup::"
-
-        rm -f opensfx-all.zip opensfx-*.tar
-
-    - name: Upload to GOG
-      run: |
-        echo "::group::Extracting source"
-        mkdir source
-        (
-          cd source
-          tar -xf ../internal-source/source.tar.gz --strip-components=1
-        )
-        echo "::endgroup::"
-
-        (
-          cd gog
-
-          echo "::group::Prepare Win32"
-          unzip ../openttd-windows-x86/openttd-*-windows-win32.zip
-          mv openttd-*-windows-win32 win32
-          echo "::endgroup::"
-
-          echo "::group::Prepare Win64"
-          unzip ../openttd-windows-x64/openttd-*-windows-win64.zip
-          mv openttd-*-windows-win64 win64
-          echo "::endgroup::"
-
-          echo "::group::Prepare macOS"
-          mkdir macos
-          (
-            cd macos
-            unzip ../../openttd-macos-universal/openttd-*-macos-universal.zip
-          )
-          echo "::endgroup::"
-
-          echo "::group::Prepare Linux"
-          tar xvf ../openttd-linux-generic/openttd-*-linux-generic-amd64.tar.xz
-          mv openttd-*-linux-generic-amd64 linux
-          echo "::endgroup::"
-
-          echo "::group::Preparing build files"
-          cp ../source/os/gog/*.json .
-          for json in $(ls *.json); do
-            sed -i 's/VERSION/${{ inputs.version }}/g;s/CLIENT_ID/${{ secrets.GOG_CLIENT_ID }}/g;s/CLIENT_SECRET/${{ secrets.GOG_CLIENT_SECRET }}/g' ${json}
-          done
-          echo "::endgroup::"
-
-          echo "::group::Upload to GOG"
-          ../app/GOGGalaxyPipelineBuilder build-game --username "${{ secrets.GOG_USERNAME }}" --password "${{ secrets.GOG_PASSWORD }}" --branch Testing windows.json
-          ../app/GOGGalaxyPipelineBuilder build-game --username "${{ secrets.GOG_USERNAME }}" --password "${{ secrets.GOG_PASSWORD }}" --branch Testing macos.json
-          ../app/GOGGalaxyPipelineBuilder build-game --username "${{ secrets.GOG_USERNAME }}" --password "${{ secrets.GOG_PASSWORD }}" --branch Testing linux.json
-          echo "::endgroup::"
-        )

.github/workflows/upload-steam.yml

@@ -1,109 +0,0 @@
-name: Upload (Steam)
-
-on:
-  workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-      trigger_type:
-        required: true
-        type: string
-
-jobs:
-  upload:
-    name: Upload (Steam)
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - name: Download source
-      uses: actions/download-artifact@v3
-      with:
-        name: internal-source
-        path: internal-source
-
-    - name: Download bundle (Windows x86)
-      uses: actions/download-artifact@v3
-      with:
-        name: openttd-windows-x86
-        path: openttd-windows-x86
-
-    - name: Download bundle (Windows x64)
-      uses: actions/download-artifact@v3
-      with:
-        name: openttd-windows-x64
-        path: openttd-windows-x64
-
-    - name: Download bundle (MacOS)
-      uses: actions/download-artifact@v3
-      with:
-        name: openttd-macos-universal
-        path: openttd-macos-universal
-
-    - name: Download bundle (Linux)
-      uses: actions/download-artifact@v3
-      with:
-        name: openttd-linux-generic
-        path: openttd-linux-generic
-
-    - name: Setup steamcmd
-      uses: CyberAndrii/setup-steamcmd@v1
-
-    - name: Generate Steam auth code
-      id: steam-totp
-      uses: CyberAndrii/steam-totp@v1
-      with:
-        shared_secret: ${{ secrets.STEAM_SHARED_SECRET }}
-
-    - name: Upload to Steam
-      run: |
-        echo "::group::Extracting source"
-        mkdir source
-        (
-          cd source
-          tar -xf ../internal-source/source.tar.gz --strip-components=1
-        )
-        echo "::endgroup::"
-
-        mkdir steam
-        (
-          cd steam
-
-          echo "::group::Prepare Win32"
-          unzip ../openttd-windows-x86/openttd-*-windows-win32.zip
-          mv openttd-*-windows-win32 steam-win32
-          echo "::endgroup::"
-
-          echo "::group::Prepare Win64"
-          unzip ../openttd-windows-x64/openttd-*-windows-win64.zip
-          mv openttd-*-windows-win64 steam-win64
-          echo "::endgroup::"
-
-          echo "::group::Prepare macOS"
-          mkdir steam-macos
-          (
-            cd steam-macos
-            unzip ../../openttd-macos-universal/openttd-*-macos-universal.zip
-          )
-          echo "::endgroup::"
-
-          echo "::group::Prepare Linux"
-          tar xvf ../openttd-linux-generic/openttd-*-linux-generic-amd64.tar.xz
-          mv openttd-*-linux-generic-amd64 steam-linux
-          echo "::endgroup::"
-
-          echo "::group::Preparing build file"
-          if [ "${{ inputs.trigger_type }}" = "new-tag" ]; then
-            BRANCH="testing"
-          else
-            BRANCH="nightly"
-          fi
-          cat ../source/os/steam/release.vdf | sed 's/@@DESCRIPTION@@/openttd-${{ inputs.version }}/;s/@@BRANCH@@/'${BRANCH}'/' > release.vdf
-          cat release.vdf
-          echo "::endgroup::"
-
-          echo "::group::Upload to Steam"
-          steamcmd +login ${{ secrets.STEAM_USERNAME }} ${{ secrets.STEAM_PASSWORD }} ${{ steps.steam-totp.outputs.code }} +run_app_build $(pwd)/release.vdf +quit
-          echo "::endgroup::"
-        )

CMakeLists.txt

@@ -5,7 +5,7 @@ if(NOT BINARY_NAME)
 endif()
 
 project(${BINARY_NAME}
-    VERSION 13.4
+    VERSION 12.2
 )
 
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
@@ -22,7 +22,7 @@ if (EMSCRIPTEN)
 endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
+set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14)
 
 # Use GNUInstallDirs to allow customisation
 # but set our own default data and bin dir
@@ -280,8 +280,6 @@ if(NOT OPTION_DEDICATED)
     endif()
 endif()
 
-include(CheckAtomic)
-
 if(APPLE)
     link_package(Iconv TARGET Iconv::Iconv)
 

CONTRIBUTING.md

@@ -94,8 +94,8 @@ Although we really appreciate feedback and ideas, we will close feature requests
 
 Many of those ideas etc do have a place on the [forums](https://www.tt-forums.net); and if enough people like it, someone will stand up and make it.
 
-It's usually best to discuss on [Discord](https://discord.gg/openttd) before opening a feature request or working on a large feature in a fork.
-Discussion can take time, but it can be productive and avoid disappointment. :)
+It's usually best discuss in [irc](https://wiki.openttd.org/en/Development/IRC%20channel) before opening a feature request or working on a large feature in a fork.
+Discussion in irc can take time, but it can be productive and avoid disappointment :)
 
 
 ## Pull requests
@@ -212,8 +212,8 @@ When it comes to gameplay features there are at least these groups of interests:
 - *Control freak:* micromanagement like conditional orders, refitting and loading etc.
 - *Casual:* automatisation like cargodist, path based signalling etc.
 
-To please everyone, the official branch tries to stay close to the original gameplay; after all, that is what brought everyone here.
-The preferred method to alter and extend the gameplay is via add-ons like NewGRF and GameScripts.
+To please everyone, the official branch tries to stay close to the original gameplay; after all, that is what everyone brought here.
+The preferred method to alter and extent the gameplay is via add-ons like NewGRF and GameScripts.
 
 For a long time, the official branch was also open to features which could be enabled/disabled, but the corner-cases that came with some configurations have rendered some parts of the code very complicated.
 Today, new features have to work with all the already existing features, which is not only challenging in corner cases, but also requires spending considerable more work than just "making it work in the game mode that I play".

CREDITS.md

@@ -1,32 +1,31 @@
 ### The OpenTTD team (in alphabetical order):
 
+- Grzegorz Duczyński (adf88) - General coding (since 1.7.2)
+- Albert Hofkamp (Alberth) - GUI expert (since 0.7)
 - Matthijs Kooijman (blathijs) - Pathfinder-guru, Debian port (since 0.3)
+- Ulf Hermann (fonsinchen) - Cargo Distribution (since 1.3)
 - Christoph Elsenhans (frosch) - General coding (since 0.6)
-- Loïc Guilloux (glx) - General / Windows Expert (since 0.4.5)
+- Loïc Guilloux (glx) - Windows Expert (since 0.4.5)
 - Charles Pigott (LordAro) - General / Correctness police (since 1.9)
-- Michael Lutz (michi_cc) - General / Path based signals (since 0.7)
+- Michael Lutz (michi_cc) - Path based signals (since 0.7)
 - Niels Martin Hansen (nielsm) - Music system, general coding (since 1.9)
 - Owen Rudge (orudge) - Forum host, OS/2 port (since 0.1)
 - Peter Nelson (peter1138) - Spiritual descendant from newGRF gods (since 0.4.5)
-- Remko Bijker (Rubidium) - Coder and way more (since 0.4.5)
-- Patric Stout (TrueBrain) - NoProgrammer (since 0.3), sys op
-- Tyler Trahan (2TallTyler) - General coding (since 13)
+- Ingo von Borstel (planetmaker) - General coding, Support (since 1.1)
+- Remko Bijker (Rubidium) - Lead coder and way more (since 0.4.5)
+- José Soler (Terkhen) - General coding (since 1.0)
 
 ### Inactive Developers:
 
-- Grzegorz Duczyński (adf88) - General coding (1.7 - 1.8)
-- Albert Hofkamp (Alberth) - GUI expert (0.7 - 1.9)
 - Jean-François Claeys (Belugas) - GUI, newindustries and more (0.4.5 - 1.0)
 - Bjarni Corfitzen (Bjarni) - macOS port, coder and vehicles (0.3 - 0.7)
 - Victor Fischer (Celestar) - Programming everywhere you need him to (0.3 - 0.6)
-- Ulf Hermann (fonsinchen) - Cargo Distribution (1.3 - 1.6)
 - Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;) (0.4.5 - 0.6)
 - Jonathan Coome (Maedhros) - High priest of the NewGRF Temple (0.5 - 0.6)
-- Attila Bán (MiHaMiX) - Developer WebTranslator 1 and 2 (0.3 - 0.5)
-- Ingo von Borstel (planetmaker) - General coding, Support (1.1 - 1.9)
+- Attila Bán (MiHaMiX) - WebTranslator 1 and 2 (0.3 - 0.5)
 - Zdeněk Sojka (SmatZ) - Bug finder and fixer (0.6 - 1.3)
-- José Soler (Terkhen) - General coding (1.0 - 1.4)
 - Christoph Mallon (Tron) - Programmer, code correctness police (0.3 - 0.5)
+- Patric Stout (TrueBrain) - NoProgrammer (0.3 - 1.2), sys op (active)
 - Thijs Marinussen (Yexo) - AI Framework, General (0.6 - 1.3)
 - Leif Linse (Zuu) - AI/Game Script (1.2 - 1.6)
 
@@ -34,11 +33,11 @@
 
 - Tamás Faragó (Darkvater) - Ex-Lead coder (0.3 - 0.5)
 - Dominik Scherer (dominik81) - Lead programmer, GUI expert (0.3 - 0.3)
-- Emil Djupfeld (egladil) - macOS port (0.4.5 - 0.6)
+- Emil Djupfeld (egladil) - macOS port (0.4 - 0.6)
 - Simon Sasburg (HackyKid) - Bug fixer (0.4 - 0.4.5)
 - Ludvig Strigeus (ludde) - Original author of OpenTTD, main coder (0.1 - 0.3)
 - Cian Duffy (MYOB) - BeOS port / manual writing (0.1 - 0.3)
-- Petr Baudiš (pasky) - Many patches, newgrf support (0.3 - 0.3)
+- Petr Baudiš (pasky) - Many patches, newgrf support, etc. (0.3 - 0.3)
 - Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker (0.6 - 0.7)
 - Serge Paquet (vurlix) - 2nd contributor after ludde (0.1 - 0.3)
 
@@ -53,7 +52,7 @@
 - Alberto Demichelis - Squirrel scripting language
 - L. Peter Deutsch - MD5 implementation
 - Michael Blunck - For revolutionizing TTD with awesome graphics
-- George - Canal/Lock graphics
+- George - Canal graphics
 - Andrew Parkhouse (andythenorth) - River graphics
 - David Dallaston (Pikka) - Tram tracks
 - All Translators - For their support to make OpenTTD a truly international game

Doxyfile.in

@@ -41,6 +41,7 @@ INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 2
 ALIASES                =
+TCL_SUBST              =
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
@@ -154,6 +155,7 @@ VERBATIM_HEADERS       = YES
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
 IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
 # Configuration options related to the HTML output
@@ -222,7 +224,7 @@ LATEX_OUTPUT           = latex
 LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
 COMPACT_LATEX          = NO
-PAPER_TYPE             = a4
+PAPER_TYPE             = a4wide
 EXTRA_PACKAGES         =
 LATEX_HEADER           =
 LATEX_FOOTER           =

README.md

@@ -116,6 +116,35 @@ Most types of add-on content can be downloaded within OpenTTD via the 'Check Onl
 
 Add-on content can also be installed manually, but that's more complicated; the [OpenTTD wiki](https://wiki.openttd.org/) may offer help with that, or the [OpenTTD directory structure guide](./docs/directory_structure.md).
 
+### 1.5.1) AI opponents
+
+OpenTTD comes without AI opponents, so if you want to play with AIs you have to download them.
+
+The easiest way is via the 'Check Online Content' button in the main menu.
+
+You can select some AIs that you think are compatible with your playing style.
+
+AI help and discussions may also be found in the [AI section of the forum](https://www.tt-forums.net/viewforum.php?f=65).
+
+### 1.5.2) Scenarios and height maps
+
+Scenarios and heightmaps can be added via the 'Check Online Content' button in the main menu.
+
+### 1.5.3) NewGRFs
+
+A wide range of add-content is available as NewGRFs, including vehicles, industries, stations, landscape objects, town names and more.
+
+NewGRFs can be added via the 'Check Online Content' button in the main menu.
+
+See also the wiki [guide to NewGRFs](https://wiki.openttd.org/en/Manual/NewGRF) and [the forum graphics development section](https://www.tt-forums.net/viewforum.php?f=66).
+
+### 1.5.4) Game scripts
+
+Game scripts can provide additional challenges or changes to the standard OpenTTD gameplay, for example setting transport goals, or changing town growth behaviour.
+
+Game scripts can be added via the 'Check Online Content' button in the main menu.
+
+See also the wiki [guide to game scripts](https://wiki.openttd.org/en/Manual/Game%20script) and [the forum graphics game script section](https://www.tt-forums.net/viewforum.php?f=65).
 
 ### 1.6) OpenTTD directories
 
@@ -133,7 +162,6 @@ If you want to compile OpenTTD from source, instructions can be found in [COMPIL
 'Official' channels
 
 - [OpenTTD website](https://www.openttd.org)
-- [OpenTTD official Discord](https://discord.gg/openttd)
 - IRC chat using #openttd on irc.oftc.net [more info about our irc channel](https://wiki.openttd.org/en/Development/IRC%20channel)
 - [OpenTTD on Github](https://github.com/OpenTTD/) for code repositories and for reporting issues
 - [forum.openttd.org](https://forum.openttd.org/) - the primary community forum site for discussing OpenTTD and related games

bin/ai/CMakeLists.txt

@@ -13,7 +13,6 @@ set(AI_COMPAT_SOURCE_FILES
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.10.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.11.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_12.nut
-	${CMAKE_CURRENT_SOURCE_DIR}/compat_13.nut
 )
 
 foreach(AI_COMPAT_SOURCE_FILE IN LISTS AI_COMPAT_SOURCE_FILES)

bin/ai/compat_0.7.nut

@@ -379,16 +379,3 @@ AIGroup.CreateGroup <- function(vehicle_type)
 {
 	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_1.0.nut

@@ -131,16 +131,3 @@ AIGroup.CreateGroup <- function(vehicle_type)
 {
 	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_1.1.nut

@@ -68,16 +68,3 @@ AIGroup.CreateGroup <- function(vehicle_type)
 {
 	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_1.10.nut

@@ -6,16 +6,3 @@
  */
 
 AILog.Info("1.10 API compatibility in effect.");
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_1.11.nut

@@ -6,16 +6,3 @@
  */
 
 AILog.Info("1.11 API compatibility in effect.");
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_1.2.nut

@@ -20,16 +20,3 @@ AIGroup.CreateGroup <- function(vehicle_type)
 {
 	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_1.3.nut

@@ -20,16 +20,3 @@ AIGroup.CreateGroup <- function(vehicle_type)
 {
 	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_1.4.nut

@@ -20,16 +20,3 @@ AIGroup.CreateGroup <- function(vehicle_type)
 {
 	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_1.5.nut

@@ -20,16 +20,3 @@ AIGroup.CreateGroup <- function(vehicle_type)
 {
 	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_1.6.nut

@@ -20,16 +20,3 @@ AIGroup.CreateGroup <- function(vehicle_type)
 {
 	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_1.7.nut

@@ -20,16 +20,3 @@ AIGroup.CreateGroup <- function(vehicle_type)
 {
 	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_1.8.nut

@@ -20,16 +20,3 @@ AIGroup.CreateGroup <- function(vehicle_type)
 {
 	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_1.9.nut

@@ -6,16 +6,3 @@
  */
 
 AILog.Info("1.9 API compatibility in effect.");
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_12.nut

@@ -4,18 +4,3 @@
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * 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/>.
  */
-
-AILog.Info("12 API compatibility in effect.");
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_13.nut

@@ -1,6 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 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/>.
- */

bin/game/CMakeLists.txt

@@ -10,7 +10,6 @@ set(GS_COMPAT_SOURCE_FILES
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.10.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.11.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_12.nut
-	${CMAKE_CURRENT_SOURCE_DIR}/compat_13.nut
 )
 
 foreach(GS_COMPAT_SOURCE_FILE IN LISTS GS_COMPAT_SOURCE_FILES)

bin/game/compat_1.10.nut

@@ -13,16 +13,3 @@ GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
 {
 	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-GSRoad._HasRoadType <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_1.11.nut

@@ -6,16 +6,3 @@
  */
 
 GSLog.Info("1.11 API compatibility in effect.");
-
-/* 13 really checks RoadType against RoadType */
-GSRoad._HasRoadType <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_1.2.nut

@@ -35,16 +35,3 @@ GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
 {
 	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-GSRoad._HasRoadType <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_1.3.nut

@@ -35,16 +35,3 @@ GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
 {
 	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-GSRoad._HasRoadType <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_1.4.nut

@@ -28,15 +28,3 @@ GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
 	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
 }
 
-/* 13 really checks RoadType against RoadType */
-GSRoad._HasRoadType <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_1.5.nut

@@ -20,16 +20,3 @@ GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
 {
 	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-GSRoad._HasRoadType <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_1.6.nut

@@ -20,16 +20,3 @@ GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
 {
 	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-GSRoad._HasRoadType <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_1.7.nut

@@ -20,16 +20,3 @@ GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
 {
 	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-GSRoad._HasRoadType <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_1.8.nut

@@ -20,16 +20,3 @@ GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
 {
 	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-GSRoad._HasRoadType <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_1.9.nut

@@ -13,16 +13,3 @@ GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
 {
 	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
 }
-
-/* 13 really checks RoadType against RoadType */
-GSRoad._HasRoadType <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_12.nut

@@ -4,18 +4,3 @@
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * 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/>.
  */
-
-GSLog.Info("12 API compatibility in effect.");
-
-/* 13 really checks RoadType against RoadType */
-GSRoad._HasRoadType <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_13.nut

@@ -1,6 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 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/>.
- */

changelog.txt

@@ -1,273 +1,3 @@
-13.4 (2023-07-29)
-------------------------------------------------------------------------
-Fix: Setting tree lines drawn incorrectly for RTL languages (#11070)
-Fix #11043: Don't choose toolbar dropdown option if focus is lost (#11044)
-Fix #10917: Pay loan interest before generating statistics (#11040)
-Fix #11016: Use after free in network invalid packet error path (#11022)
-Fix #10987: Double-close of dropdown stopped land-info tool working as default (#11000)
-
-
-13.3 (2023-06-11)
-------------------------------------------------------------------------
-Fix: [Win32] use full monitor resolution for fullscreen (#10985)
-
-
-13.2 (2023-06-10)
-------------------------------------------------------------------------
-Change: [Win32] position window in center of workspace of primary display (#10942)
-Change: Automatically disable hardware acceleration when GPU driver crashed the game last attempt (#10928)
-Change: [Linux] Default scroll mode to non-mouse-lock (#10920)
-Change: Include font style in font name for Freetype (#10879)
-Fix: Don't restore backed up vehicle name if it's no longer unique (#10979)
-Fix #10975: Train name wrongly marked as unique when joining trains (#10976)
-Fix: Crash when not even a single row fits for dropdowns on low resolution screens (#10934)
-Fix: Crash with tooltip on low resolution screens (#10933)
-Fix: Crash when window can't be placed on low resolution screens (#10932)
-Fix #10502: Apply engine refit before attaching free wagons (#10926)
-Fix: Wayland crash on startup due to Pango also using FontConfig (#10916)
-Fix: When syncing width of GUI items, take padding into account (#10915)
-Fix: Make dropdowns self-close when losing focus (#10912)
-Fix: Land info window maximum width was not scaled (#10894)
-Fix: Check max member count in squirrel classes (#10883)
-Fix: Ask FontConfig for the face index when opening fonts (#10878)
-Fix #10831: Level crossing parts left barred after crossing tile removal (#10874)
-Fix: Rail waypoint selection window not closed when parent windows closed (#10873)
-Fix #10846: [Script] Crash on trying to allocate an excessively large array (#10848)
-Fix: [Win32] Text line breaking did not properly handle punctuation characters (#10775)
-Fix: [Emscripten] Crash when saving games (#10758)
-Fix: [Win32] Wrong multi-line text layout due to incorrect whitespace handling (#10752)
-Fix #10741: Rail platforms left partially reserved after train crash (#10751)
-Fix: Shaded engines in purchase list incorrectly shaded (#10736)
-Fix #10735: [NewGRF] {POP_COLOUR} fails if string is drawn with extra flags (#10736)
-Fix #8177: Ships with max speed overflow to near-zero speed (#10695)
-Fix #10289: Don't silently fail when setting timetable start dates (#10690)
-Fix #8302: Improve "Maintenance intervals are in percents" helptext (#10686)
-Fix #10665: "No vehicles are available yet" message did not appear correctly on non-temperate climates (#10673)
-Fix #10630: Don't allow shifting service date earlier than year 0 (#10643)
-Fix #10637, #10638: Incorrect water infrastructure totals when building certain object types (#10639, #10640)
-Fix: Abort loading savegame if road vehicle is on invalid road type (#10622)
-
-
-13.1 (2023-04-10)
-------------------------------------------------------------------------
-Add: [NewGRF] Engine name callback for nested variants. (#10399)
-Fix: Improve main toolbar tooltips (#10616)
-Fix: [NewGRF] Additional validation for Action3 (+others) (#10601)
-Fix: Clear button for editbox didn't take account of padding (#10583)
-Fix: [Script] Access to enum/consts defined outside of main.nut (#10573)
-Fix #10568: Bogus warning when loading a save with a NewGRFs on dedicated servers (#10572)
-Fix #10554: Crash when scrolling in the autoreplace window with collapsed variants (#10555)
-Fix: Network server highlight invisible with RTL languages. (#10551)
-Fix: Client name was not being used as company manager name (#10535)
-Fix: Prevent road vehicles on crossing from crashing into the side of a train (#10496)
-Fix #10477: [macOS] Calculation for window sizes when using custom fonts was being rounded incorrectly (#10489)
-Fix #10486: Crash in debug window when GS started before AIs (#10487)
-Fix #10469: [Script] Negative numbers in League Table window were sorted incorrectly (#10471)
-Fix #10465: Crash on timeout if user never enters a password for server (#10466)
-Fix #10280, #10461: Crash on opening town windows as a spectator (#10462)
-Fix #10059: Script config values stored in the config file could cause crashes (#10444)
-
-
-13.0 (2023-02-05)
-------------------------------------------------------------------------
-Change #10077: Make maximum loan a positive multiple of the loan interval (#10355)
-Fix #10361: [Script] Don't try to give saved data to a dead script (#10433)
-Fix #10419: Water infrastructure accounting when building ship depots and docks (#10432)
-
-
-13.0-RC2 (2023-01-28)
-------------------------------------------------------------------------
-Feature: Press Ctrl to build a diagonal area of trees (#10342)
-Feature: Set a custom number of industries in map generation window (#10340)
-Change: Display font status as aa/noaa instead of true/false (#10352)
-Fix: [Script] Improved API documentation for scripts (#10413, #10412)
-Fix #10255: Reduce basic thickness of linkgraph GUI lines (#10410)
-Fix #10220: Don't select unselectable engine as default (#10404)
-Fix #10395: When loading old saves, don't forcibly bar level crossings (#10400)
-Fix #10377: Bad sorting of rail vehicles when primary variant is missing (#10378)
-Fix #10368: Server restarting game caused clients to hit assertion (#10369)
-Fix #10362: NewGRF bridges without speed limits (#10365)
-Fix #10363: CargoDist setting helptext shouldn't suggest symmetric distribution for diamonds in subtropic (#10364)
-Fix: [Script] Switch to OWNER_TOWN prevented OWNER_DEITY test during industry prospecting (#10360)
-Fix #10009: Bad overflow protection when taking out loans (#10359)
-Fix #9865: Removing files with the console always failed (#10357)
-Fix #10057: FallbackParagraphLayout fails to properly wrap (#10356)
-Fix #10177: Company list password padlock showed after switching to single player (#10354)
-Fix: Various Wide River issues (#10348)
-Fix: Link variants to parents when finalising engines (#10346)
-Fix #10333: Only show industry prospecting errors to local company (#10338)
-Fix #10335: Set initial scrollbar count for object GUI (#10336)
-Fix #10331: Starting new company during load must happen after AI start (#10332)
-Fix #10309: [SDL] Uninitialized width and height when turning off full screen (#10328)
-Fix #10032: Capacities of articulated vehicles in build window (#10326)
-Fix: Improve handling of corrupt NewGRF or image files (#10321, #10316)
-Fix: [NewGRF] Don't assume engclass 2 should be elrail (#10315)
-Fix: [Script] AIGroup.GetProfitLastYear could get values different than those displayed in GUI (#10227)
-Fix #10304: [Scripts] Don't start GS in intro game (#10305)
-Fix: [Script] Copy compat files for version 13 (#10303)
-
-
-13.0-RC1 (2023-01-01)
-------------------------------------------------------------------------
-Feature: 'font' console command to configure fonts within game (#10278)
-Feature: Ctrl-click to bulk edit timetable speeds/waiting times (#10265)
-Feature: [NewGRF] Vehicle variants in expandable purchase list (#10220)
-Feature: Expand all towns in the scenario editor (#10215)
-Add: [NewGRF] Slope-aware and roadtype-specific one-way sprites (#10282)
-Change: Display text files in black (#10291)
-Change: Make vehicle list dropdown buttons resize to fit strings (#10286)
-Change: [NewGRF] Support flipping shorter engines without explicit support (#10262)
-Change: Separate ground sprite from foundation sprite offsets (#10256)
-Change: Vertically centre sprite font relative to TrueType font (#10254)
-Change: [macOS] Set minimum macOS version to 10.13 (#10253)
-Change: Use lowered not disabled widget for current vehicle details tab (#10252)
-Change: Various improvements to NewGRF sprite aligner (#10249)
-Change: reset_engines console command now rerandomises introduction dates and reliability (#10220)
-Change: Show error message on failed industry prospecting (#10202)
-Fix: Local authority window rating list height ignored icon sizes (#10285)
-Fix #10150: Town signs could be truncated when using custom fonts (#10283)
-Fix #8971: Resize QueryStrings with interface scale change (#10281)
-Fix #10274: Crash when rescanning scripts with GS selected (#10276)
-Fix #10151: Use smaller padding for signs (#10272)
-Fix #10263: [Script] Restore tile validation for commands (#10269)
-Fix: Missing scrollbar for rail/roadtype dropdowns (#10264)
-Fix #10260: Incorrect rect height drawing image in vehicle details (#10261)
-Fix #10257: Incorrect catenary position on sloped bridge heads (#10258)
-Fix: Vertically centre chat prompt (#10250)
-Fix #10214: League and graph buttons in toolbar did not have a default action (#10246)
-Fix #10242: Allow a space for text shadow when clipping text (#10243)
-Fix #10206: Fully disable scripts in intro game (#10241)
-Fix #10218: Don't try to create river tiles along incorrect slopes (#10235)
-Fix #10208: [NewGRF] Allow using a specific underlay for road/tram tunnels (#10233)
-Fix #10224: Don't change fast-forward mode while saving (#10230)
-Fix #10147: Sound effect volume slider no longer set volume (#10228)
-Fix #10223: Crash when vehicle cloning fails on order cloning (#10225)
-Fix: Maximum space for engine preview image was never scaled (#10219)
-Fix #10216: Crash when upgrading savegame with crashed vehicles (#10217)
-Fix #10212: [Script] Nested ScriptAccounting scopes not restored properly (#10213)
-Fix #10114: Incorrect drag-highlight position with non-power-of-2 scaling (#10211)
-Fix #10198: Rearrange Intro GUI to make button rows narrower (#10203)
-Fix: Missing extra padding when drawing tooltip text (#10201)
-Fix: Bad alignment of button icons when using the original baseset (#10200)
-Fix: Signal icons incorrectly positioned in UI (#10199)
-Fix #10021: Object GUI resized when switching between different objects (#10196)
-Fix #9720: Delay start of GS/AI to after loading of savegame (#9745)
-
-
-13.0-beta2 (2022-11-27)
-------------------------------------------------------------------------
-Feature: Allow AI/GS to be fully modified in scenario editor (#10152)
-Feature: Display power-to-weight ratio in ground vehicle details GUI (#10123)
-Feature: Variable interface scaling (with chunky bevels!) (#10114)
-Feature: Hotkey to honk a vehicle's horn (#10110)
-Feature: Split AI/Game Script configuration windows and add them to world gen window (#10058)
-Feature: [GS] Scriptable league tables (#10001)
-Feature: Multi-track level crossings (#9931)
-Feature: Improved local authority action window (#9928)
-Feature: Automatic console command screenshot numbering with a filename ending in '#' (#9781)
-Feature: Add buttons to toggle music in the Game Options menu (#9727)
-Feature: Contextual actions for vehicles grouped by shared orders (#8425)
-Feature: Add cargo filter support to vehicle list (#8308)
-Feature: Show the cargoes the vehicles can carry in the vehicle list window (#8304)
-Change: Allow building canal by area outside editor (#10173)
-Change: Minor improvements to the new Finance GUI (#10168)
-Change: Let AI developers edit non-editable AI/Game Script Parameters (#8895)
-Change: Allow building docks on clearable watered object tiles (#8514)
-Fix #8770: Center vehicle status bar icon (#10178)
-Fix: Crash if error message window is too wide for screen. (#10172)
-Fix #10155: Network games not syncing company settings properly (#10158)
-Fix #10154: Network game desync related to setting a random company face (#10157)
-Fix #10011: Incorrect infrastructure totals when overbuilding bay road stop (#10143)
-Fix #10117: Object burst limit allowed one fewer object than the setting (#10120)
-Fix #10023: Allow negative input in text fields when needed (#10112)
-Fix #9908: Fix crash which could occur when a company was deleted when a depot window was open (#9912)
-
-
-13.0-beta1 (2022-10-31)
-------------------------------------------------------------------------
-Feature: Airport construction GUI displays infrastructure cost (#10094)
-Feature: Purchase land multiple tiles at a time (#10027)
-Feature: Add sticky pin & shade widgets to Object Selection UI panel (#10019, #10020)
-Feature: Improved handling of HiDPI and mixed-DPI screens (#9994, #9996, #9997, #10064)
-Feature: Alternative linkgraph colour schemes (#9866)
-Feature: Allow Shift+Insert as paste in edit box (#9836)
-Feature: Setting to make the local town authority rubber-stamp all actions (#9833)
-Feature: Add/extend console commands to enable screenshot automation (#9771)
-Feature: [Linkgraph] Show a tooltip with statistics when hovering a link (#9760)
-Feature: Build objects by area (#9709)
-Feature: Add setting to hide news about competitors vehicle crash (#9653)
-Feature: Ctrl-click to remove fully autoreplaced vehicles from list (#9639)
-Feature: Wide rivers on map generation (#9628)
-Add: [Script] ScriptCargo::GetWeight to get cargo weights (#9930)
-Add: Command line option to skip NewGRF scanning (#9879)
-Add: Show video driver name in Game Options window (#9872)
-Add: [NewGRF] Map seed as global variable (#9834)
-Add: [Script] IndustryType::ResolveNewGRFID to resolve industry id from grf_local_id and grfid (#9798)
-Add: [Script] ObjectType::ResolveNewGRFID to resolve object id from grfid and grf_local_id (#9795)
-Update: To all the friends we have lost and those we have gained (#10000)
-Change: Use the Simulation subcategory to openttd.desktop (#10015)
-Change: Constantly update destination of 'any depot' orders (#9959)
-Change: Use an indent, not a dash, to list train capacity (#9887)
-Change: [NewGRF] Increase vehicle sprite stack from 4 layers to 8 (#9863)
-Change: Don't pay Property Maintenance on stations when Infrastructure Maintenance is disabled (#9828)
-Change: Improved layout of the finance window (#9827)
-Change: [Admin] Bump admin port protocol due to command changes (#9754)
-Change: Suppress vehicle age warnings for stopped vehicles (#9718)
-Change: Make pf.yapf.rail_firstred_twoway_eol on by default (#9544)
-Change: Deliver cargo to the closest industry first (#9536)
-Fix: Lots of fixes to how windows handle resizing (#10040, #10042, #10046, #10051, #10056, #10068, #10070, #10098)
-Fix: Console commands list_ai output was truncated with a suitably large number of AIs (#10075)
-Fix #9876: MacBook Touch Bar crash / render issues w/ 32bpp graphics (#10060)
-Fix: Reduce framerate overhead in Train::Tick (#10055)
-Fix: Only open scenario editor date query once (#10050)
-Fix #10048: Don't relocate company HQ on the same exact location (#10049)
-Fix #10038: Missing upper bounds check when loading custom playlists (#10039)
-Fix: Wrong string used to determine size of zoomed out station sign (#10036)
-Fix: Disable "turn around" button for other companies' road vehicles (#10033)
-Fix: Online Players list mouse hover behaviour (#10031)
-Fix: [NewGRF] Weirdness of new stations (#10017)
-Fix #9854: DrawStringMultiLine() could draw beyond its bounding box (#10014)
-Fix: Incorrect player name in online players window (#10013)
-Fix #8099: News window zoom level fixes (#10005)
-Fix: [NewGRF] Upper 16 random bits should be the same for all station tiles in callback 140 (#9992)
-Fix #9989: £0 Net Profit is neither negative nor positive (#9991)
-Fix #9804: Only apply sprite_zoom_min setting when sprites available (#9988)
-Fix #9972: Add missing fill/resize flags on Framerate window widgets (#9982)
-Fix #9935: Use more selectivity when building SSE specific code (#9980)
-Fix #9940: Print debuglevel parse errors to console when changed from console (#9979)
-Fix #9977: Clearing the console with a large number of lines could cause a crash (#9978)
-Fix #9974: Console command getsysdate did not work due to off-by-one error (#9975)
-Fix: [NewGRF] Default value of RailVehicleInfo::railveh_type was inconsistent with other default properties (#9967)
-Fix #8584: Vehicles with shared orders getting invalid or unexpected start dates (#9955)
-Fix #9951: [NewGRF] Scenario editor random industries button broke NewGRF persistent storage (#9952)
-Fix: Validation of various internal command parameters that could have allowed a rogue client to crash servers (#9942, #9943, #9944, #9945, #9946, #9947, #9948, #9950)
-Fix #9937: Station industries_near incorrect after removing part moved sign (#9938)
-Fix: [Script] ScriptRoad::HasRoadType really check for RoadType (#9934)
-Fix #9363: Rebuild client list on reinit event (#9929)
-Fix #9925: Industry tile layout validation for layouts of only one tile (#9926)
-Fix #9918: Reset industy last production year on scenario start (#9920)
-Fix #9914: Prevent more useless pathfinder run for blocked vehicles (#9917)
-Fix: List a max of four share owners instead of three (#9905)
-Fix: [NewGRF] Industry layouts with zero regular tiles should be invalid (#9902)
-Fix #9869: Remove docking tile when doing a clear square (#9898)
-Fix: New player companies use favorite manager face, if saved (#9895)
-Fix: Towns don't build parallel, redundant bridges (#9891)
-Fix #9712: Cap town bridge length at original 11-tile limit (#9890)
-Fix #9883: Show cost/income float over end tile of rail or road construction (#9889)
-Fix #9870: Don't update infrastructure totals when overbuilding object on canal (#9888)
-Fix #9877: GS could trigger 'Cost: £0' cost message (#9878)
-Fix 44f2ef1: [strgen] Allow gender for {CARGO_SHORT} (#9873)
-Fix #9867: Industry::stations_near not filled at industry creation (#9868)
-Fix #9853: Incorrect merge of guiflags and flags for osk_activation (#9855)
-Fix #6544: Don't join AI company when loading network game in singleplayer (#9794)
-Fix: Company values do not properly account for shares (#9770)
-Fix #9546: Crash when no industries are present in game (#9726)
-Fix #9708: [Linkgraph] Don't assume vehicles have a non-zero max speed (#9693)
-Fix #9665: [Linkgraph] Fix travel times of non-direct journeys (#9693)
-Fix #8797: Use logical rail length when placing signals (#9652)
-Cleanup: [NewGRF] Remove unused flag sprites (#10052)
-
-
 12.2 (2022-04-02)
 ------------------------------------------------------------------------
 Feature: Remember the last-used signal between games (#9792)

cmake/CheckAtomic.cmake

@@ -1,87 +0,0 @@
-# atomic builtins are required for threading support.
-
-INCLUDE(CheckCXXSourceCompiles)
-INCLUDE(CheckLibraryExists)
-
-# Sometimes linking against libatomic is required for atomic ops, if
-# the platform doesn't support lock-free atomics.
-
-function(check_working_cxx_atomics varname)
-  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++17")
-  check_cxx_source_compiles("
-#include <atomic>
-std::atomic<int> x;
-std::atomic<short> y;
-std::atomic<char> z;
-int main() {
-  ++z;
-  ++y;
-  return ++x;
-}
-" ${varname})
-  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-endfunction(check_working_cxx_atomics)
-
-function(check_working_cxx_atomics64 varname)
-  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS "-std=c++17 ${CMAKE_REQUIRED_FLAGS}")
-  check_cxx_source_compiles("
-#include <atomic>
-#include <cstdint>
-std::atomic<uint64_t> x (0);
-int main() {
-  uint64_t i = x.load(std::memory_order_relaxed);
-  (void)i;
-  return 0;
-}
-" ${varname})
-  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-endfunction(check_working_cxx_atomics64)
-
-
-# Check for (non-64-bit) atomic operations.
-if(MSVC)
-  set(HAVE_CXX_ATOMICS_WITHOUT_LIB True)
-else()
-  # First check if atomics work without the library.
-  check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB)
-  # If not, check if the library exists, and atomics work with it.
-  if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
-    check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC)
-    if(HAVE_LIBATOMIC)
-      list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-      check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB)
-      if (NOT HAVE_CXX_ATOMICS_WITH_LIB)
-        message(FATAL_ERROR "Host compiler must support std::atomic!")
-      endif()
-    else()
-      message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
-    endif()
-  endif()
-endif()
-
-# Check for 64 bit atomic operations.
-if(MSVC)
-  set(HAVE_CXX_ATOMICS64_WITHOUT_LIB True)
-else()
-  # First check if atomics work without the library.
-  check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-  # If not, check if the library exists, and atomics work with it.
-  if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-    check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
-    if(HAVE_CXX_LIBATOMICS64)
-      list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-      check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
-      if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
-        message(FATAL_ERROR "Host compiler must support 64-bit std::atomic!")
-      endif()
-    else()
-      message(FATAL_ERROR "Host compiler appears to require libatomic for 64-bit operations, but cannot find it.")
-    endif()
-  endif()
-endif()
-
-if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
-  target_link_libraries(openttd atomic)
-endif()

cmake/CompileFlags.cmake

@@ -44,8 +44,8 @@ macro(compile_flags)
             "$<$<NOT:$<CONFIG:Debug>>:-fstack-protector>" # Prevent undefined references when _FORTIFY_SOURCE > 0
         )
         if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-            add_compile_options(
-                "$<$<CONFIG:Debug>:-Wa,-mbig-obj>" # Switch to pe-bigobj-x86-64 as x64 Debug builds push pe-x86-64 to the limits (linking errors with ASLR, ...)
+            add_link_options(
+                "$<$<CONFIG:Debug>:-Wl,--disable-dynamicbase,--disable-high-entropy-va,--default-image-base-low>" # ASLR somehow breaks linking for x64 Debug builds
             )
         endif()
     endif()
@@ -56,11 +56,6 @@ macro(compile_flags)
 
     if(MSVC)
         add_compile_options(/W3)
-        if(MSVC_VERSION GREATER 1929 AND CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            # Starting with version 19.30, there is an optimisation bug, see #9966 for details
-            # This flag disables the broken optimisation to work around the bug
-            add_compile_options(/d2ssa-rse-)
-        endif()
     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
         add_compile_options(
             -W
@@ -136,10 +131,6 @@ macro(compile_flags)
                 # -flifetime-dse=2 (default since GCC 6) doesn't play
                 # well with our custom pool item allocator
                 "$<$<BOOL:${LIFETIME_DSE_FOUND}>:-flifetime-dse=1>"
-
-                # We have a fight between clang wanting std::move() and gcc not wanting it
-                # and of course they both warn when the other compiler is happy
-                "-Wno-redundant-move"
             )
         endif()
 

cmake/InstallAndPackage.cmake

@@ -122,8 +122,6 @@ set(CPACK_STRIP_FILES YES)
 set(CPACK_OUTPUT_FILE_PREFIX "bundles")
 
 if(APPLE)
-    # Stripping would produce unreadable stacktraces.
-    set(CPACK_STRIP_FILES NO)
     set(CPACK_GENERATOR "Bundle")
     include(PackageBundle)
 
@@ -131,7 +129,7 @@ if(APPLE)
         set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-universal")
     else()
         set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-${CPACK_SYSTEM_NAME}")
-    endif()
+	endif()
 elseif(WIN32)
     set(CPACK_GENERATOR "ZIP")
     if(OPTION_USE_NSIS)
@@ -183,10 +181,6 @@ elseif(UNIX)
             if(DISTRO_ID STREQUAL "arch")
                 set(PLATFORM "arch")
                 set(CPACK_GENERATOR "TXZ")
-            elseif(DISTRO_ID STREQUAL "fedora" OR DISTRO_ID STREQUAL "rhel")
-                set(PLATFORM "fedora")
-                set(CPACK_GENERATOR "RPM")
-                include(PackageRPM)
             else()
                 set(UNSUPPORTED_PLATFORM_NAME "Linux distribution '${DISTRO_ID}' from /etc/os-release")
             endif()

cmake/LinkPackage.cmake

@@ -18,6 +18,6 @@ function(link_package NAME)
             message(STATUS "${NAME} found -- -DWITH_${UCNAME} -- ${${NAME}_INCLUDE_DIRS} ${${NAME}_INCLUDE_DIR} -- ${${NAME}_LIBRARIES} ${${NAME}_LIBRARY}")
         endif()
     elseif(LP_ENCOURAGED)
-        message(WARNING "${NAME} not found; compiling OpenTTD without ${NAME} is strongly discouraged")
+        message(WARNING "${NAME} not found; compiling OpenTTD without ${NAME} is strongly disencouraged")
     endif()
 endfunction()

cmake/MSVCFilters.cmake

@@ -3,7 +3,6 @@
 source_group("AI Core" REGULAR_EXPRESSION "src/ai/")
 source_group("Blitters" REGULAR_EXPRESSION "src/blitter/")
 source_group("Core Source Code" REGULAR_EXPRESSION "src/core/")
-source_group("Font Cache" REGULAR_EXPRESSION "src/fontcache/")
 source_group("Game Core" REGULAR_EXPRESSION "src/game/")
 source_group("MD5" REGULAR_EXPRESSION "src/3rdparty/md5/")
 source_group("Misc" REGULAR_EXPRESSION "src/misc/")

cmake/PackageRPM.cmake

@@ -1 +0,0 @@
-set(CPACK_RPM_PACKAGE_ARCHITECTURE "${ARCHITECTURE}")

cmake/scripts/GenerateWidget.cmake

@@ -13,7 +13,6 @@ cmake_minimum_required(VERSION 3.5)
 # The parameter "enumname" specifies the enumeration to extract. This can also be a regular expression.
 # The parameter "filename" specifies the relative path to the file, where the enumeration is extracted from. This can also be a glob expression.
 #
-# All files where enumerations are extracted from are automatically added via #include
 #
 
 if(NOT GENERATE_SOURCE_FILE)
@@ -42,7 +41,6 @@ foreach(ENUM IN LISTS ENUM_LINES)
 
         string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" FILE ${FILE})
         string(APPEND ${PLACE_HOLDER} "\n${ADD_INDENT}/* automatically generated from ${FILE} */")
-        list(APPEND INCLUDES "#include \"${FILE}\"")
 
         foreach(LINE IN LISTS SOURCE_LINES)
             string(REPLACE "${RM_INDENT}" "" LINE "${LINE}")
@@ -118,7 +116,4 @@ foreach(ENUM IN LISTS ENUM_LINES)
     endforeach()
  endforeach()
 
- list(REMOVE_DUPLICATES INCLUDES)
- string(REPLACE ";" "\n" INCLUDES "${INCLUDES}")
-
 configure_file(${GENERATE_SOURCE_FILE} ${GENERATE_BINARY_FILE})

cmake/scripts/Regression.cmake

@@ -35,7 +35,6 @@ execute_process(COMMAND ${OPENTTD_EXECUTABLE}
                         -vnull:ticks=30000
                         -d script=2
                         -d misc=9
-                        -Q
                 OUTPUT_VARIABLE REGRESSION_OUTPUT
                 ERROR_VARIABLE REGRESSION_RESULT
                 OUTPUT_STRIP_TRAILING_WHITESPACE

cmake/scripts/SquirrelExport.cmake

@@ -342,7 +342,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
         else()
             string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PreRegister(engine, \"${API_SUPER_CLS}\");")
         endif()
-        if(NOT "${SUPER_CLS}" MATCHES "^ScriptEvent")
+        if(NOT "${SUPER_CLS}" STREQUAL "ScriptEvent")
             if("${CLS_PARAM_2}" STREQUAL "v")
                 string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.AddSQAdvancedConstructor(engine);")
             else()

cmake/scripts/SquirrelIncludes.cmake

@@ -12,11 +12,32 @@ endif()
 if(NOT APIUC)
     message(FATAL_ERROR "Script needs APIUC defined")
 endif()
-if(NOT API_FILES)
-    message(FATAL_ERROR "Script needs API_FILES defined")
-endif()
 
-file(READ "${API_FILES}" SCRIPT_API_BINARY_FILES)
+set(ARGC 1)
+set(ARG_READ NO)
+
+# For MSVC CMake runs this script from a batch file using || to detect errors,
+# depending on source path it may quote args, and cause cmd to not understand ||
+# and pass it as argument to ourself.
+# Read all the arguments given to CMake; we are looking for -- and everything
+# that follows, until ||. Those are our api files.
+while(ARGC LESS CMAKE_ARGC)
+    set(ARG ${CMAKE_ARGV${ARGC}})
+
+    if(ARG STREQUAL "||")
+        set(ARG_READ NO)
+    endif()
+
+    if(ARG_READ)
+        list(APPEND SCRIPT_API_BINARY_FILES "${ARG}")
+    endif()
+
+    if(ARG STREQUAL "--")
+        set(ARG_READ YES)
+    endif()
+
+    math(EXPR ARGC "${ARGC} + 1")
+endwhile()
 
 foreach(FILE IN LISTS SCRIPT_API_BINARY_FILES)
     file(STRINGS "${FILE}" LINES REGEX "^void SQ${APIUC}.*_Register\\(Squirrel \\*engine\\)$")

media/baseset/openttd/flags.nfo

@@ -0,0 +1,43 @@
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// 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 "Flag graphics"
+   -1 * 3	 05 14 24
+   -1 sprites/flags.png 8bpp  34    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  50    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  66    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  82    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  98    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 114    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 130    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 146    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 162    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 178    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 194    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 210    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 226    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 242    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 258    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 274    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 290    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 306    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 322    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 338    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 354    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 370    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 386    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 402    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 418    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 434    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 450    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 466    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 482    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 498    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 514    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 530    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 546    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 562    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 578    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 594    8  11   8   0   0 normal

media/baseset/openttd/oneway.nfo

@@ -4,24 +4,10 @@
 // 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 "One way road graphics"
-   -1 * 3	 05 09 12
-   -1 sprites/oneway.png 8bpp  34    8  24  16 -10   -9 normal
-   -1 sprites/oneway.png 8bpp  66    8  24  16 -13   -7 normal
-   -1 sprites/oneway.png 8bpp  98    8  24  16 -12   -8 normal
-   -1 sprites/oneway.png 8bpp 130    8  24  16 -15  -10 normal
-   -1 sprites/oneway.png 8bpp 162    8  24  16 -12   -9 normal
-   -1 sprites/oneway.png 8bpp 194    8  24  16 -11   -8 normal
-
-   -1 sprites/oneway.png 8bpp  34   40  24  16 -13  -10 normal
-   -1 sprites/oneway.png 8bpp  66   40  24  16 -12   -8 normal
-   -1 sprites/oneway.png 8bpp  98   40  24  16 -12   -9 normal
-   -1 sprites/oneway.png 8bpp 130   40  24  16 -11   -8 normal
-   -1 sprites/oneway.png 8bpp 162   40  24  16  -9  -10 normal
-   -1 sprites/oneway.png 8bpp 194   40  24  16 -10   -9 normal
-
-   -1 sprites/oneway.png 8bpp  34   72  24  16  -8  -11 normal
-   -1 sprites/oneway.png 8bpp  66   72  24  16 -11   -5 normal
-   -1 sprites/oneway.png 8bpp  98   72  24  16 -12   -8 normal
-   -1 sprites/oneway.png 8bpp 130   72  24  16 -12   -5 normal
-   -1 sprites/oneway.png 8bpp 162   72  24  16 -14  -10 normal
-   -1 sprites/oneway.png 8bpp 194   72  24  16 -12   -8 normal
+   -1 * 3	 05 09 06
+   -1 sprites/oneway.png 8bpp  34    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp  66    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp  98    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp 130    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp 162    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp 194    8  24  16 -12  -8 normal

media/baseset/openttd/openttd.nfo

@@ -92,6 +92,7 @@
 #include "roadstops.nfo"
 #include "aqueduct.nfo"
 #include "autorail.nfo"
+#include "flags.nfo"
 #include "openttdgui.nfo"
 #include "airport_preview.nfo"
 #include "chars.nfo"

media/baseset/orig_extra/fix_gui_icons.nfo

@@ -1,12 +0,0 @@
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// 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 "Fix alignment of button icons."
-
-// Fix alignment of button icons.
-   -1 * 11	 0A 03 01 DC 02 01 E2 02 01 E6 02
-   -1 sprites/fix_gui_icons.png 8bpp   8  13  20  20  0  0 normal nocrop
-   -1 sprites/fix_gui_icons.png 8bpp  40  13  20  20  0  0 normal nocrop
-   -1 sprites/fix_gui_icons.png 8bpp  72  13  20  20  0  0 normal nocrop

media/baseset/orig_extra/orig_extra.nfo

@@ -83,4 +83,3 @@
 #include "rivers/arctic.nfo"
 #include "rivers/tropic.nfo"
 #include "rivers/toyland.nfo"
-#include "fix_gui_icons.nfo"

media/openttd.desktop

@@ -6,6 +6,6 @@ Name=OpenTTD
 Icon=${BINARY_NAME}
 Exec=${BINARY_NAME}
 Terminal=false
-Categories=Game;Simulation;
+Categories=Game;
 Keywords=game;simulation;transport;tycoon;deluxe;economics;multiplayer;money;train;ship;bus;truck;aircraft;cargo;
 @Comment_STR_DESKTOP_SHORTCUT_COMMENT@

os/emscripten/Dockerfile

@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:3.1.28
+FROM emscripten/emsdk:2.0.34
 
 COPY emsdk-liblzma.patch /
 RUN cd /emsdk/upstream/emscripten && patch -p1 < /emsdk-liblzma.patch

os/emscripten/README.md

@@ -1,38 +1,40 @@
 ## How to build with Emscripten
 
-Please use docker with the supplied `Dockerfile` to build for emscripten.
-It takes care of a few things:
-- Use a version of emscripten we know works
-- Patch in LibLZMA support (as this is not supported by upstream)
+Building with Emscripten works with emsdk 2.0.31 and above.
 
-First, build the docker image by navigating in the folder this `README.md` is in, and executing:
+Currently there is no LibLZMA support upstream; for this we suggest to apply
+the provided patch in this folder to your emsdk installation.
+
+For convenience, a Dockerfile is supplied that does this patches for you
+against upstream emsdk docker. Best way to use it:
+
+Build the docker image:
 ```
   docker build -t emsdk-lzma .
 ```
 
-Next, navigate back to the root folder of this project.
-
-Now we build the host tools first:
+Build the host tools first:
 ```
   mkdir build-host
   docker run -it --rm -v $(pwd):$(pwd) -u $(id -u):$(id -g) --workdir $(pwd)/build-host emsdk-lzma cmake .. -DOPTION_TOOLS_ONLY=ON
-  docker run -it --rm -v $(pwd):$(pwd) -u $(id -u):$(id -g) --workdir $(pwd)/build-host emsdk-lzma make -j$(nproc) tools
+  docker run -it --rm -v $(pwd):$(pwd) -u $(id -u):$(id -g) --workdir $(pwd)/build-host emsdk-lzma make -j5 tools
 ```
 
-Finally, we build the actual game:
+Next, build the game with emscripten:
+
 ```
   mkdir build
   docker run -it --rm -v $(pwd):$(pwd) -u $(id -u):$(id -g) --workdir $(pwd)/build emsdk-lzma emcmake cmake .. -DHOST_BINARY_DIR=../build-host -DCMAKE_BUILD_TYPE=Release -DOPTION_USE_ASSERTS=OFF
-  docker run -it --rm -v $(pwd):$(pwd) -u $(id -u):$(id -g) --workdir $(pwd)/build emsdk-lzma emmake make -j$(nproc)
+  docker run -it --rm -v $(pwd):$(pwd) -u $(id -u):$(id -g) --workdir $(pwd)/build emsdk-lzma emmake make -j5
 ```
 
-In the `build` folder you will now see `openttd.html`.
+And now you have in your build folder files like "openttd.html".
 
-To run it locally, you would have to start a local webserver; something like:
+To run it locally, you would have to start a local webserver, like:
 
 ```
   cd build
   python3 -m http.server
 ````
 
-You can now play the game via http://127.0.0.1:8000/openttd.html .
+Now you can play the game via http://127.0.0.1:8000/openttd.html .

os/emscripten/emsdk-liblzma.patch

@@ -13,7 +13,7 @@ of emsdk.
 diff --git a/tools/settings.py b/tools/settings.py
 --- a/tools/settings.py
 +++ b/tools/settings.py
-@@ -40,6 +40,7 @@ PORTS_SETTINGS = {
+@@ -38,6 +38,7 @@
      'USE_SDL_NET',
      'USE_SDL_GFX',
      'USE_LIBJPEG',
@@ -24,23 +24,24 @@ diff --git a/tools/settings.py b/tools/settings.py
 diff --git a/src/settings.js b/src/settings.js
 --- a/src/settings.js
 +++ b/src/settings.js
-@@ -1450,6 +1450,10 @@ var USE_GIFLIB = false;
- // [compile+link]
- var USE_LIBJPEG = false;
+@@ -1382,8 +1382,12 @@ var USE_BZIP2 = 0;
+ // 1 = use libjpeg from emscripten-ports
+ // [link]
+ var USE_LIBJPEG = 0;
 
 +// 1 = use liblzma from emscripten-ports
-+// [compile+link]
-+var USE_LIBLZMA = false;
++// [link]
++var USE_LIBLZMA = 0;
 +
  // 1 = use libpng from emscripten-ports
- // [compile+link]
- var USE_LIBPNG = false;
+ // [link]
+ var USE_LIBPNG = 0;
 
 diff --git a/tools/ports/liblzma.py b/tools/ports/liblzma.py
 new file mode 100644
 --- /dev/null
 +++ b/tools/ports/liblzma.py
-@@ -0,0 +1,151 @@
+@@ -0,0 +1,160 @@
 +# Copyright 2020 The Emscripten Authors.  All rights reserved.
 +# Emscripten is available under two separate licenses, the MIT license and the
 +# University of Illinois/NCSA Open Source License.  Both these licenses can be
@@ -51,8 +52,8 @@ new file mode 100644
 +import logging
 +from pathlib import Path
 +
-+VERSION = '5.4.0'
-+HASH = '29b2cd25bb5b234b329ffe9547692d2c29be393db9d8d4ce70a66dfdaebd54433e79a89d80c57e58cd4559c3c68b9845507d5fedf3eec1c528a81e3d9ddbd811'
++VERSION = '5.2.5'
++HASH = '7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce'
 +
 +
 +def needed(settings):
@@ -60,31 +61,40 @@ new file mode 100644
 +
 +
 +def get(ports, settings, shared):
-+  ports.fetch_project('liblzma', f'https://tukaani.org/xz/xz-{VERSION}.tar.gz', sha512hash=HASH)
++  ports.fetch_project('liblzma', 'https://tukaani.org/xz/xz-' + VERSION + '.tar.gz', 'xz-' + VERSION, sha512hash=HASH)
 +
 +  def create(final):
 +    logging.info('building port: liblzma')
 +
 +    ports.clear_project_build('liblzma')
 +
-+    source_path = os.path.join(ports.get_dir(), 'liblzma', f'xz-{VERSION}', 'src', 'liblzma')
-+    ports.write_file(os.path.join(source_path, 'config.h'), config_h)
-+    ports.install_headers(os.path.join(source_path, 'api'), pattern='lzma.h')
-+    ports.install_headers(os.path.join(source_path, 'api', 'lzma'), pattern='*.h', target='lzma')
++    source_path = os.path.join(ports.get_dir(), 'liblzma', 'xz-' + VERSION)
++    dest_path = os.path.join(ports.get_build_dir(), 'liblzma')
++
++    shared.try_delete(dest_path)
++    os.makedirs(dest_path)
++    shutil.rmtree(dest_path, ignore_errors=True)
++    shutil.copytree(source_path, dest_path)
 +
 +    build_flags = ['-DHAVE_CONFIG_H', '-DTUKLIB_SYMBOL_PREFIX=lzma_', '-fvisibility=hidden']
-+    exclude_files = ['crc32_small.c', 'crc64_small.c', 'crc32_tablegen.c', 'crc64_tablegen.c', 'price_tablegen.c', 'fastpos_tablegen.c',
++    exclude_dirs = ['xzdec', 'xz', 'lzmainfo']
++    exclude_files = ['crc32_small.c', 'crc64_small.c', 'crc32_tablegen.c', 'crc64_tablegen.c', 'price_tablegen.c', 'fastpos_tablegen.c'
 +                     'tuklib_exit.c', 'tuklib_mbstr_fw.c', 'tuklib_mbstr_width.c', 'tuklib_open_stdxxx.c', 'tuklib_progname.c']
-+    include_dirs_rel = ['../common', 'api', 'check', 'common', 'delta', 'lz', 'lzma', 'rangecoder', 'simple']
++    include_dirs_rel = ['../common', 'api', 'common', 'check', 'lz', 'rangecoder', 'lzma', 'delta', 'simple']
 +
-+    include_dirs = [os.path.join(source_path, p) for p in include_dirs_rel]
-+    ports.build_port(source_path, final, 'liblzma', flags=build_flags, exclude_files=exclude_files, includes=include_dirs)
++    Path(dest_path, os.path.join('src', 'config.h')).write_text(config_h)
 +
-+  return [shared.cache.get_lib('liblzma.a', create, what='port')]
++    include_dirs = [os.path.join(dest_path, 'src', 'liblzma', p) for p in include_dirs_rel]
++    ports.build_port(os.path.join(dest_path, 'src'), final, flags=build_flags, exclude_dirs=exclude_dirs, exclude_files=exclude_files, includes=include_dirs)
++
++    ports.install_headers(os.path.join(dest_path, 'src', 'liblzma', 'api'), 'lzma.h')
++    ports.install_headers(os.path.join(dest_path, 'src', 'liblzma', 'api', 'lzma'), '*.h', 'lzma')
++
++  return [shared.Cache.get_lib('liblzma.a', create, what='port')]
 +
 +
 +def clear(ports, settings, shared):
-+  shared.cache.erase_lib('liblzma.a')
++  shared.Cache.erase_lib('liblzma.a')
 +
 +
 +def process_args(ports):
@@ -95,7 +105,7 @@ new file mode 100644
 +  return 'liblzma (USE_LIBLZMA=1; public domain)'
 +
 +
-+config_h = '''
++config_h = r'''
 +#define ASSUME_RAM 128
 +#define ENABLE_NLS 1
 +#define HAVE_CHECK_CRC32 1
@@ -167,9 +177,9 @@ new file mode 100644
 +#define PACKAGE "xz"
 +#define PACKAGE_BUGREPORT "lasse.collin@tukaani.org"
 +#define PACKAGE_NAME "XZ Utils"
-+#define PACKAGE_STRING "XZ Utils 5.4.0"
++#define PACKAGE_STRING "XZ Utils 5.2.5"
 +#define PACKAGE_TARNAME "xz"
-+#define PACKAGE_VERSION "5.4.0"
++#define PACKAGE_VERSION "5.2.5"
 +#define SIZEOF_SIZE_T 4
 +#define STDC_HEADERS 1
 +#define TUKLIB_CPUCORES_SYSCONF 1
@@ -190,5 +200,5 @@ new file mode 100644
 +#ifndef __EXTENSIONS__
 +# define __EXTENSIONS__ 1
 +#endif
-+#define VERSION "5.4.0"
++#define VERSION "5.2.5"
 +'''

os/gog/linux.json

@@ -1,64 +0,0 @@
-{
-    "project": {
-        "baseProductId": "1293297882",
-        "clientId": "CLIENT_ID",
-        "clientSecret": "CLIENT_SECRET",
-        "version": "VERSION",
-        "installDirectory": "OpenTTD",
-        "name": "OpenTTD",
-        "platform": "gnu-linux",
-        "tags": [
-            "editor_v_1_4_0"
-        ],
-        "languageMode": "together",
-        "products": [
-            {
-                "name": "OpenTTD",
-                "productId": "1293297882",
-                "depots": [
-                    {
-                        "name": "Linux",
-                        "folder": "linux",
-                        "languages": [
-                            "en-US"
-                        ]
-                    },
-                    {
-                        "name": "OpenGFX",
-                        "folder": "opengfx",
-                        "languages": [
-                            "en-US"
-                        ]
-                    },
-                    {
-                        "name": "OpenMSX",
-                        "folder": "openmsx",
-                        "languages": [
-                            "en-US"
-                        ]
-                    },
-                    {
-                        "name": "OpenSFX",
-                        "folder": "opensfx",
-                        "languages": [
-                            "en-US"
-                        ]
-                    }
-                ],
-                "tasks": [
-                    {
-                        "type": "FileTask",
-                        "name": "OpenTTD",
-                        "languages": [
-                            "en-US"
-                        ],
-                        "category": "game",
-                        "path": "openttd",
-                        "isPrimary": true
-                    }
-                ],
-                "supportDepots": []
-            }
-        ]
-    }
-}

os/gog/macos.json

@@ -1,65 +0,0 @@
-{
-    "project": {
-        "baseProductId": "1293297882",
-        "clientId": "CLIENT_ID",
-        "clientSecret": "CLIENT_SECRET",
-        "version": "VERSION",
-        "installDirectory": "OpenTTD",
-        "name": "OpenTTD",
-        "platform": "osx",
-        "tags": [
-            "editor_v_1_4_0"
-        ],
-        "languageMode": "together",
-        "products": [
-            {
-                "name": "OpenTTD",
-                "productId": "1293297882",
-                "depots": [
-                    {
-                        "name": "MacOS",
-                        "folder": "macos",
-                        "languages": [
-                            "en-US"
-                        ]
-                    },
-                    {
-                        "name": "OpenGFX",
-                        "folder": "opengfx",
-                        "languages": [
-                            "en-US"
-                        ]
-                    },
-                    {
-                        "name": "OpenMSX",
-                        "folder": "openmsx",
-                        "languages": [
-                            "en-US"
-                        ]
-                    },
-                    {
-                        "name": "OpenSFX",
-                        "folder": "opensfx",
-                        "languages": [
-                            "en-US"
-                        ]
-                    }
-                ],
-                "tasks": [
-                    {
-                        "type": "FileTask",
-                        "name": "OpenTTD",
-                        "languages": [
-                            "en-US"
-                        ],
-                        "category": "game",
-                        "path": "OpenTTD.app/Contents/MacOS/openttd",
-                        "isPrimary": true
-                    }
-                ],
-                "supportDepots": []
-            }
-        ]
-    }
-}
-

os/gog/windows.json

@@ -1,94 +0,0 @@
-{
-    "project": {
-        "baseProductId": "1293297882",
-        "clientId": "CLIENT_ID",
-        "clientSecret": "CLIENT_SECRET",
-        "version": "VERSION",
-        "installDirectory": "OpenTTD",
-        "name": "OpenTTD",
-        "platform": "windows",
-        "tags": [
-            "editor_v_1_4_0"
-        ],
-        "languageMode": "together",
-        "products": [
-            {
-                "name": "OpenTTD",
-                "productId": "1293297882",
-                "depots": [
-                    {
-                        "name": "Win32",
-                        "folder": "win32",
-                        "languages": [
-                            "en-US"
-                        ],
-                        "osBitness": [
-                            "32"
-                        ]
-                    },
-                    {
-                        "name": "Win64",
-                        "folder": "win64",
-                        "languages": [
-                            "en-US"
-                        ],
-                        "osBitness": [
-                            "64"
-                        ]
-                    },
-                    {
-                        "name": "OpenGFX",
-                        "folder": "opengfx",
-                        "languages": [
-                            "en-US"
-                        ],
-                        "osBitness": [
-                            "32",
-                            "64"
-                        ]
-                    },
-                    {
-                        "name": "OpenMSX",
-                        "folder": "openmsx",
-                        "languages": [
-                            "en-US"
-                        ],
-                        "osBitness": [
-                            "32",
-                            "64"
-                        ]
-                    },
-                    {
-                        "name": "OpenSFX",
-                        "folder": "opensfx",
-                        "languages": [
-                            "en-US"
-                        ],
-                        "osBitness": [
-                            "32",
-                            "64"
-                        ]
-                    }
-                ],
-                "tasks": [
-                    {
-                        "type": "FileTask",
-                        "name": "OpenTTD",
-                        "languages": [
-                            "en-US"
-                        ],
-                        "category": "game",
-                        "path": "openttd.exe",
-                        "isPrimary": true,
-                        "osBitness": [
-                            "32",
-                            "64"
-                        ]
-                    }
-                ],
-                "supportDepots": []
-            }
-        ],
-        "scriptInterpreter": true
-    }
-}

os/macosx/Info.plist.in

@@ -32,6 +32,6 @@
         <key>NSHighResolutionCapable</key>
         <string>True</string>
         <key>LSMinimumSystemVersion</key>
-        <string>10.13.0</string>
+        <string>10.14.0</string>
 </dict>
 </plist>

os/macosx/notarize.sh

@@ -5,8 +5,11 @@ set -e
 # If you are building an unofficial branch of OpenTTD, please change the bundle
 # ID in Info.plist and below.
 #
-# This uses the Xcode notarytool to perform notarization. You must set up a keychain
-# profile called "openttd" using the "store-credentials" notarytool command beforehand.
+# This uses `gon' to perform notarization:
+#
+#   https://github.com/mitchellh/gon
+#
+# Follow the setup instructions on the gon site to install.
 #
 # Before executing this script, you must first configure CMake with at least the following
 # parameters:
@@ -19,11 +22,19 @@ set -e
 # This will sign the application with your signing certificate, and will enable
 # the hardened runtime.
 #
+# You also need to set your Apple Developer username and password (app-specific password
+# is recommended) in the AC_USERNAME and AC_PASSWORD environment variables.
+#
 # Then, ensuring you're in your build directory and that the "bundles" directory
 # exists with a .dmg in it (clear out any old DMGs first), run:
 #
 # ../os/macosx/notarize.sh
 
+if [ -z "${AC_USERNAME}" ]; then
+    echo AC_USERNAME not set, skipping notarization.
+    exit 0
+fi;
+
 dmg_filename=(bundles/*.dmg)
 
 if [ "${dmg_filename}" = "bundles/*.dmg" ]; then
@@ -32,15 +43,24 @@ if [ "${dmg_filename}" = "bundles/*.dmg" ]; then
     exit 1
 fi;
 
-xcrun notarytool submit ${dmg_filename[0]} --keychain-profile "openttd" --wait
+cat <<EOF > notarize.json
+{
+   "notarize": [
+      {
+         "path": "${dmg_filename[0]}",
+         "bundle_id": "org.openttd.openttd",
+         "staple": true
+      }
+   ]
+}
+EOF
 
-# Staple the ticket to the .dmg
-xcrun stapler staple "${dmg_filename[0]}"
+gon notarize.json
 
 app_filename=(_CPack_Packages/*/Bundle/openttd-*/OpenTTD.app)
 
 if [ "${app_filename}" = "_CPack_Packages/*/Bundle/openttd-*/OpenTTD.app" ]; then
-    echo "No .app found in the _CPack_Packages directory, skipping app stapling."
+    echo "No .app found in the _CPack_Packages directory, skipping stapling."
     exit 0
 fi;
 

os/windows/openttd.manifest

@@ -10,7 +10,6 @@
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
       <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">True/PM</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2,PerMonitor</dpiAwareness>
     </windowsSettings>
   </application>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">

os/windows/winstore/generate-assets.bat

@@ -1,2 +0,0 @@
-@echo off
-powershell -File "%~dp0generate-assets.ps1"

os/windows/winstore/generate-assets.ps1

@@ -1,48 +0,0 @@
-function ResizeImage() {
-    param([String]$sourcePath, [Int]$targetWidth, [Int]$targetHeight, [String]$targetPath)
-
-    Add-Type -AssemblyName "System.Drawing"
-
-    $img = [System.Drawing.Image]::FromFile($sourcePath)
-
-    $ratioX = $targetWidth / $img.Width;
-    $ratioY = $targetHeight / $img.Height;
-
-    $ratio = $ratioY
-
-    if ($ratioX -le $ratioY) {
-        $ratio = $ratioX
-    }
-
-    $newWidth = [int] ($img.Width * $ratio)
-    $newHeight = [int] ($img.Height * $ratio)
-
-    $resizedImage = New-Object System.Drawing.Bitmap($targetWidth, $targetHeight)
-    $graph = [System.Drawing.Graphics]::FromImage($resizedImage)
-    $graph.InterpolationMode = [System.Drawing.Drawing2D.InterpolationMode]::HighQualityBicubic
-
-    $graph.Clear([System.Drawing.Color]::Transparent)
-    $graph.DrawImage($img, $targetWidth / 2 - $newWidth / 2, $targetHeight / 2 - $newHeight / 2, $newWidth, $newHeight)
-
-    $resizedImage.Save($targetPath)
-    $resizedImage.Dispose()
-    $img.Dispose()
-}
-
-$logoPath = "..\..\..\media\openttd.2048.png"
-
-# Create the main image assets required for the Windows Store
-New-Item -Path "." -Name "assets" -ItemType "directory" -Force
-ResizeImage $logoPath 1240 1240 "assets\LargeTile.png"
-ResizeImage $logoPath 284 284 "assets\SmallTile.png"
-ResizeImage $logoPath 2480 1200 "assets\SplashScreen.png"
-ResizeImage $logoPath 176 176 "assets\Square44x44Logo.png"
-Copy-Item "assets\Square44x44Logo.png" -Destination "assets\Square44x44Logo.targetsize-44_altform-unplated.png"
-ResizeImage $logoPath 600 600 "assets\Square150x150Logo.png"
-Copy-Item "assets\Square150x150Logo.png" -Destination "assets\Square150x150Logo.targetsize-150_altform-unplated.png"
-ResizeImage $logoPath 200 200 "assets\StoreLogo.png"
-ResizeImage $logoPath 1240 600 "assets\Wide310x150Logo.png"
-
-# Copy the logo for the store for the common package
-New-Item -Path "." -Name "assets-common" -ItemType "directory" -Force
-Copy-Item "assets\StoreLogo.png" -Destination "assets-common\StoreLogoCommon.png"

os/windows/winstore/generate-key.bat

@@ -1,2 +0,0 @@
-@echo off
-powershell -File "%~dp0generate-key.ps1" %1 %2 %3

os/windows/winstore/generate-key.ps1

@@ -1,21 +0,0 @@
-[CmdletBinding()]
-[Alias()]
-Param
-(
-    # Publisher ("CN=xyz")
-    [Parameter(Mandatory=$true, Position=0)]
-    $Publisher,
-
-    # Password
-    [Parameter(Mandatory=$true, Position=1)]
-    $PasswordParam,
-
-    # Filename
-    [Parameter(Mandatory=$true, Position=2)]
-    $OutputFilename
-)
-
-$cert = New-SelfSignedCertificate -Type Custom -Subject $Publisher -KeyUsage DigitalSignature -FriendlyName "OpenTTD signing certificate" -CertStoreLocation "Cert:\CurrentUser\My" -TextExtension @("2.5.29.37={text}1.3.6.1.5.5.7.3.3", "2.5.29.19={text}")
-
-$password = ConvertTo-SecureString -String $PasswordParam -Force -AsPlainText
-Export-PfxCertificate -cert "Cert:\CurrentUser\My\$($cert.Thumbprint)" -FilePath $OutputFilename -Password $password

os/windows/winstore/manifests/AssetsPackage.appxmanifest

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap6="http://schemas.microsoft.com/appx/manifest/uap/windows10/6" IgnorableNamespaces="uap uap6">
-   <Identity Name="$IDENTITY_NAME$" Publisher="$PUBLISHER$" Version="$VERSION$" ResourceId="OpenTTD-common" />
-   <Properties>
-      <uap6:AllowExecution>false</uap6:AllowExecution>
-      <DisplayName>OpenTTD (official)</DisplayName>
-      <PublisherDisplayName>OpenTTD Developers</PublisherDisplayName>
-      <Logo>Assets\StoreLogoCommon.png</Logo>
-   </Properties>
-   <Resources>
-      <Resource Language="en-gb" />
-      <Resource Language="en-us" />
-      <Resource Language="en-au" />
-      <Resource Language="af-za" />
-      <Resource Language="ar-eg" />
-      <Resource Language="eu-es" />
-      <Resource Language="be-by" />
-      <Resource Language="pt-br" />
-      <Resource Language="bg-bg" />
-      <Resource Language="ca-es" />
-      <Resource Language="hr-hr" />
-      <Resource Language="cs-cz" />
-      <Resource Language="da-dk" />
-      <Resource Language="nl-nl" />
-      <Resource Language="et-ee" />
-      <Resource Language="fo-fo" />
-      <Resource Language="fr-fr" />
-      <Resource Language="gd-gb" />
-      <Resource Language="gl-es" />
-      <Resource Language="de-de" />
-      <Resource Language="el-gr" />
-      <Resource Language="he-il" />
-      <Resource Language="hu-hu" />
-      <Resource Language="is-is" />
-      <Resource Language="id-id" />
-      <Resource Language="ga-ie" />
-      <Resource Language="it-it" />
-      <Resource Language="ja-jp" />
-      <Resource Language="ko-kr" />
-      <Resource Language="lv-lv" />
-      <Resource Language="lt-lt" />
-      <Resource Language="lb-lu" />
-      <Resource Language="ms-my" />
-      <Resource Language="nb-no" />
-      <Resource Language="no-no" />
-      <Resource Language="pl-pl" />
-      <Resource Language="pt-pt" />
-      <Resource Language="ro-ro" />
-      <Resource Language="ru-ru" />
-      <Resource Language="sr-latn-rs" />
-      <Resource Language="zh-cn" />
-      <Resource Language="sk-sk" />
-      <Resource Language="sl-si" />
-      <Resource Language="es-es" />
-      <Resource Language="es-mx" />
-      <Resource Language="sv-se" />
-      <Resource Language="ta-in" />
-      <Resource Language="th-th" />
-      <Resource Language="zh-tw" />
-      <Resource Language="tr-tr" />
-      <Resource Language="uk-ua" />
-      <Resource Language="vi-vn" />
-      <Resource Language="cy-gb" />
-   </Resources>
-   <Dependencies>
-      <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17134.0" MaxVersionTested="10.0.18363.0" />
-   </Dependencies>
-</Package>

os/windows/winstore/manifests/Package.appxmanifest

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp rescap">
-  <Identity Name="$IDENTITY_NAME$" Publisher="$PUBLISHER$" Version="$VERSION$" ProcessorArchitecture="$ARCHITECTURE$" />
-  <Properties>
-    <DisplayName>OpenTTD (official)</DisplayName>
-    <PublisherDisplayName>OpenTTD Developers</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17134.0" MaxVersionTested="10.0.18363.0" />
-  </Dependencies>
-  <Resources>
-    <Resource Language="en-gb" />
-    <Resource Language="en-us" />
-    <Resource Language="en-au" />
-    <Resource Language="af-za" />
-    <Resource Language="ar-eg" />
-    <Resource Language="eu-es" />
-    <Resource Language="be-by" />
-    <Resource Language="pt-br" />
-    <Resource Language="bg-bg" />
-    <Resource Language="ca-es" />
-    <Resource Language="hr-hr" />
-    <Resource Language="cs-cz" />
-    <Resource Language="da-dk" />
-    <Resource Language="nl-nl" />
-<!--    <Resource Language="eo-eo" />-->
-    <Resource Language="et-ee" />
-    <Resource Language="fo-fo" />
-<!--    <Resource Language="fi-fi" />-->
-    <Resource Language="fr-fr" />
-    <Resource Language="gd-gb" />
-    <Resource Language="gl-es" />
-    <Resource Language="de-de" />
-    <Resource Language="el-gr" />
-    <Resource Language="he-il" />
-    <Resource Language="hu-hu" />
-    <Resource Language="is-is" />
-    <Resource Language="id-id" />
-    <Resource Language="ga-ie" />
-    <Resource Language="it-it" />
-    <Resource Language="ja-jp" />
-    <Resource Language="ko-kr" />
-<!--	<Resource Language="la-va" />-->
-    <Resource Language="lv-lv" />
-    <Resource Language="lt-lt" />
-    <Resource Language="lb-lu" />
-    <Resource Language="ms-my" />
-    <Resource Language="nb-no" />
-    <Resource Language="no-no" />
-    <Resource Language="pl-pl" />
-    <Resource Language="pt-pt" />
-    <Resource Language="ro-ro" />
-    <Resource Language="ru-ru" />
-    <Resource Language="sr-latn-rs" />
-    <Resource Language="zh-cn" />
-    <Resource Language="sk-sk" />
-    <Resource Language="sl-si" />
-    <Resource Language="es-es" />
-    <Resource Language="es-mx" />
-    <Resource Language="sv-se" />
-    <Resource Language="ta-in" />
-    <Resource Language="th-th" />
-    <Resource Language="zh-tw" />
-    <Resource Language="tr-tr" />
-    <Resource Language="uk-ua" />
-    <Resource Language="vi-vn" />
-    <Resource Language="cy-gb" />
-  </Resources>
-  <Applications>
-    <Application Id="OpenTTD" Executable="openttd.exe" EntryPoint="Windows.FullTrustApplication">
-      <uap:VisualElements DisplayName="OpenTTD (official)" Description="OpenTTD is an open source simulation game based upon Transport Tycoon Deluxe." BackgroundColor="transparent" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
-        </uap:DefaultTile>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-  <Capabilities>
-    <Capability Name="internetClientServer" />
-    <rescap:Capability Name="runFullTrust" />
-  </Capabilities>
-</Package>

os/windows/winstore/manifests/PackagingLayout.xml

@@ -1,35 +0,0 @@
-<PackagingLayout xmlns="http://schemas.microsoft.com/appx/makeappx/2017">
-    <!-- Main game -->
-    <PackageFamily ID="OpenTTD" FlatBundle="false" ManifestPath="manifests\Package.appxmanifest" ResourceManager="false">
-        <!-- x86 code package-->
-        <Package ID="OpenTTD-x86" ProcessorArchitecture="x86" ManifestPath="manifests\Package-x86.appxmanifest">
-            <Files>
-                <File DestinationPath="**" SourcePath="x86-binaries\**"/>
-                <File DestinationPath="Assets\**" SourcePath="Assets\**"/>
-            </Files>
-        </Package>
-
-        <!-- x64 code package-->
-        <Package ID="OpenTTD-x64" ProcessorArchitecture="x64" ManifestPath="manifests\Package-x64.appxmanifest">
-            <Files>
-                <File DestinationPath="**" SourcePath="x64-binaries\**"/>
-                <File DestinationPath="Assets\**" SourcePath="Assets\**"/>
-            </Files>
-        </Package>
-
-        <!-- ARM64 code package-->
-        <Package ID="OpenTTD-ARM64" ProcessorArchitecture="arm64" ManifestPath="manifests\Package-ARM64.appxmanifest">
-            <Files>
-                <File DestinationPath="**" SourcePath="ARM64-binaries\**"/>
-                <File DestinationPath="Assets\**" SourcePath="Assets\**"/>
-            </Files>
-        </Package>
-
-        <!-- Common asset package-->
-        <AssetPackage ID="OpenTTD-common" AllowExecution="false" ManifestPath="manifests\AssetsPackage.appxmanifest">
-            <Files>
-                <File DestinationPath="**" SourcePath="common-binaries\**"/>
-            </Files>
-        </AssetPackage>
-    </PackageFamily>
-</PackagingLayout>

os/windows/winstore/prepare-manifests.bat

@@ -1,2 +0,0 @@
-@echo off
-powershell -File "%~dp0prepare-manifests.ps1" %1 %2 %3 %OTTD_VERSION%

os/windows/winstore/prepare-manifests.ps1

@@ -1,42 +0,0 @@
-[CmdletBinding()]
-[Alias()]
-Param
-(
-    # Output folder
-    [Parameter(Mandatory=$true, Position=0)]
-    $OutputFolder,
-
-    # Publisher ("CN=xyz")
-    [Parameter(Mandatory=$true, Position=1)]
-    $Publisher,
-
-    # IdentityName
-    [Parameter(Mandatory=$true, Position=2)]
-    $IdentityName,
-
-    # Version
-    [Parameter(Mandatory=$true, Position=3)]
-    $AppVersion
-)
-
-function Prepare-Manifest {
-    param (
-        $Architecture
-    )
-
-    (Get-Content "$($PSScriptRoot)\manifests\Package.appxmanifest").replace('$PUBLISHER$', $Publisher).replace('$IDENTITY_NAME$', $IdentityName).replace('$VERSION$', $AppVersion).replace('$ARCHITECTURE$', $Architecture) | Set-Content "$($OutputFolder)\Package-$($Architecture).appxmanifest"
-}
-
-# Prepare the application binary manifests
-Prepare-Manifest x86
-Prepare-Manifest x64
-Prepare-Manifest arm64
-
-# Prepare the assets package manifest
-(Get-Content "$($PSScriptRoot)\manifests\AssetsPackage.appxmanifest").replace('$PUBLISHER$', $Publisher).replace('$IDENTITY_NAME$', $IdentityName).replace('$VERSION$', $AppVersion) | Set-Content "$($OutputFolder)\AssetsPackage.appxmanifest"
-
-# Prepare the overall package manifest
-(Get-Content "$($PSScriptRoot)\manifests\Package.appxmanifest").replace('$PUBLISHER$', $Publisher).replace('$IDENTITY_NAME$', $IdentityName).replace('$VERSION$', $AppVersion).replace(' ProcessorArchitecture="$ARCHITECTURE$"', '') | Set-Content "$($OutputFolder)\Package.appxmanifest"
-
-# Copy the PackagingLayout XML file
-(Get-Content "$($PSScriptRoot)\manifests\PackagingLayout.xml") | Set-Content "$($OutputFolder)\PackagingLayout.xml"

os/windows/winstore/set-version.bat

@@ -1,14 +0,0 @@
-@echo off
-if [%1]==[] goto err
-
-powershell -File "%~dp0set-version.ps1" %1 > "%temp%\ottd-set-version.bat"
-if not errorlevel 0 goto err
-call "%temp%\ottd-set-version.bat"
-del /q "%temp%\ottd-set-version.bat"
-
-@rem Version number will now be in %OTTD_VERSION%
-
-goto :eof
-
-:err
-echo Please supply the path of openttd.exe as the argument to this batch file.

os/windows/winstore/set-version.ps1

@@ -1,23 +0,0 @@
-[CmdletBinding()]
-[Alias()]
-Param
-(
-    # EXE path
-    [Parameter(Mandatory=$true, Position=0)]
-    $ExePath
-)
-
-try
-{
-    $versionInfo = (Get-Item "$ExePath").VersionInfo
-
-    # Generate the app version - the build number (MS calls it revision) is always 0 because the Windows Store requires that
-    $AppVersion = "$($versionInfo.FileMajorPart).$($versionInfo.FileMinorPart).$($versionInfo.FileBuildPart).0"
-
-    Write-Output "SET OTTD_VERSION=$($AppVersion)"
-}
-catch
-{
-    Write-Output "@ECHO Error retrieving EXE version - did you provide a path?"
-    exit 1
-}

regression/regression/info.nut

@@ -4,7 +4,7 @@ class Regression extends AIInfo {
 	function GetShortName()   { return "REGR"; }
 	function GetDescription() { return "This runs regression-tests on some commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "13"; }
+	function GetAPIVersion()  { return "12"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 	function UseAsRandomAI()  { return false; }

regression/regression/main.nut

@@ -341,7 +341,6 @@ function Regression::Cargo()
 		print("    GetCargoIncome(10, 10):  " + AICargo.GetCargoIncome(i, 10, 10));
 		print("    GetCargoIncome(100, 10): " + AICargo.GetCargoIncome(i, 100, 10));
 		print("    GetCargoIncome(10, 100): " + AICargo.GetCargoIncome(i, 10, 100));
-		print("    GetWeight(100):          " + AICargo.GetWeight(i, 100));
 		print("    GetRoadVehicleTypeForCargo(): " + AIRoad.GetRoadVehicleTypeForCargo(i));
 	}
 }
@@ -562,25 +561,6 @@ function Regression::Prices()
 	print("  BT_CLEAR_WATER:  " + AITile.GetBuildCost(AITile.BT_CLEAR_WATER));
 }
 
-function Regression::Commands()
-{
-	print("");
-	print("--Commands--");
-
-	print(" -Command accounting-");
-	local test = AITestMode();
-	local costs = AIAccounting();
-	AITile.DemolishTile(2834);
-	print("  Command cost:              " + costs.GetCosts());
-	{
-		local inner = AIAccounting();
-		print("  New inner cost scope:      " + costs.GetCosts());
-		AITile.DemolishTile(2835);
-		print("  Further command cost:      " + costs.GetCosts());
-	}
-	print("  Saved cost of outer scope: " + costs.GetCosts());
-}
-
 function cost_callback(old_path, new_tile, new_direction, self) { if (old_path == null) return 0; return old_path.GetCost() + 1; }
 function estimate_callback(tile, direction, goals, self) { return goals[0] - tile; }
 function neighbours_callback(path, cur_tile, self) { return [[cur_tile + 1, 1]]; }
@@ -1043,30 +1023,6 @@ function Regression::Rail()
 	print("    IsRailTile():                  " + AIRail.IsRailTile(10002));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(10002, AIRail.RAILTRACK_NW_SE));
 	print("    BuildSignal():                 " + AIRail.BuildSignal(10002, 10258, AIRail.SIGNALTYPE_PBS));
-	print("    GetSignalType():               " + AIRail.GetSignalType(10002, 10258));
-	print("    GetSignalType():               " + AIRail.GetSignalType(10002, 9746));
-	print("    RemoveSignal():                " + AIRail.RemoveSignal(10002, 10258));
-	print("    BuildSignal():                 " + AIRail.BuildSignal(10002, 9746, AIRail.SIGNALTYPE_ENTRY));
-	print("    GetSignalType():               " + AIRail.GetSignalType(10002, 10258));
-	print("    GetSignalType():               " + AIRail.GetSignalType(10002, 9746));
-	print("    RemoveSignal():                " + AIRail.RemoveSignal(10002, 9746));
-	print("    BuildSignal():                 " + AIRail.BuildSignal(10002, 9746, AIRail.SIGNALTYPE_EXIT_TWOWAY));
-	print("    GetSignalType():               " + AIRail.GetSignalType(10002, 10258));
-	print("    GetSignalType():               " + AIRail.GetSignalType(10002, 9746));
-	print("    RemoveRailTrack():             " + AIRail.RemoveRailTrack(10002, AIRail.RAILTRACK_NW_NE));
-	print("    RemoveRailTrack():             " + AIRail.RemoveRailTrack(10002, AIRail.RAILTRACK_NW_SE));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(10002, AIRail.RAILTRACK_NW_NE));
-	print("    BuildSignal():                 " + AIRail.BuildSignal(10002, 10003, AIRail.SIGNALTYPE_PBS));
-	print("    GetSignalType():               " + AIRail.GetSignalType(10002, 10003));
-	print("    GetSignalType():               " + AIRail.GetSignalType(10002, 10001));
-	print("    RemoveSignal():                " + AIRail.RemoveSignal(10002, 10003));
-	print("    BuildSignal():                 " + AIRail.BuildSignal(10002, 10001, AIRail.SIGNALTYPE_ENTRY));
-	print("    GetSignalType():               " + AIRail.GetSignalType(10002, 10003));
-	print("    GetSignalType():               " + AIRail.GetSignalType(10002, 10001));
-	print("    RemoveSignal():                " + AIRail.RemoveSignal(10002, 10001));
-	print("    BuildSignal():                 " + AIRail.BuildSignal(10002, 10001, AIRail.SIGNALTYPE_EXIT_TWOWAY));
-	print("    GetSignalType():               " + AIRail.GetSignalType(10002, 10003));
-	print("    GetSignalType():               " + AIRail.GetSignalType(10002, 10001));
 	print("    RemoveRailTrack():             " + AIRail.RemoveRailTrack(10002, AIRail.RAILTRACK_NW_NE));
 	print("    RemoveRailTrack():             " + AIRail.RemoveRailTrack(10002, AIRail.RAILTRACK_NW_SE));
 	print("    BuildRail():                   " + AIRail.BuildRail(10002, 10003, 10006));
@@ -1703,7 +1659,6 @@ function Regression::Vehicle()
 	print("  BuildVehicle():       " + AIVehicle.BuildVehicle(33417, 153));
 	print("  IsValidVehicle(12):   " + AIVehicle.IsValidVehicle(12));
 	print("  CloneVehicle():       " + AIVehicle.CloneVehicle(33417, 12, true));
-	print("  BuildVehicle():       " + AIVehicle.BuildVehicle(-1, 153));
 
 	local bank_after = AICompany.GetBankBalance(AICompany.COMPANY_SELF);
 
@@ -1960,7 +1915,6 @@ function Regression::Start()
 	/* Do this first as it gains maximum loan (which is faked to quite a lot). */
 	this.Company();
 
-	this.Commands();
 	this.Airport();
 	this.Bridge();
 	this.BridgeList();

regression/regression/result.txt

@@ -788,13 +788,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetQuarterlyPerformanceRating(): 0
     GetQuarterlyCompanyValue():      0
 
---Commands--
- -Command accounting-
-  Command cost:              7500
-  New inner cost scope:      0
-  Further command cost:      30
-  Saved cost of outer scope: 7500
-
 --AIAirport--
   IsHangarTile():       false
   IsAirportTile():      false
@@ -1125,7 +1118,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  -1
     GetCargoIncome(100, 10): -1
     GetCargoIncome(10, 100): -1
-    GetWeight(100):          -1
     GetRoadVehicleTypeForCargo(): 1
   Cargo 0
     IsValidCargo():          true
@@ -1138,7 +1130,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  3
     GetCargoIncome(100, 10): 38
     GetCargoIncome(10, 100): 3
-    GetWeight(100):          6
     GetRoadVehicleTypeForCargo(): 0
   Cargo 1
     IsValidCargo():          true
@@ -1151,7 +1142,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  7
     GetCargoIncome(100, 10): 71
     GetCargoIncome(10, 100): 6
-    GetWeight(100):          100
     GetRoadVehicleTypeForCargo(): 1
   Cargo 2
     IsValidCargo():          true
@@ -1164,7 +1154,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  5
     GetCargoIncome(100, 10): 55
     GetCargoIncome(10, 100): 5
-    GetWeight(100):          25
     GetRoadVehicleTypeForCargo(): 1
   Cargo 3
     IsValidCargo():          true
@@ -1177,7 +1166,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  5
     GetCargoIncome(100, 10): 53
     GetCargoIncome(10, 100): 5
-    GetWeight(100):          100
     GetRoadVehicleTypeForCargo(): 1
   Cargo 4
     IsValidCargo():          true
@@ -1190,7 +1178,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  5
     GetCargoIncome(100, 10): 52
     GetCargoIncome(10, 100): 4
-    GetWeight(100):          18
     GetRoadVehicleTypeForCargo(): 1
   Cargo 5
     IsValidCargo():          true
@@ -1203,7 +1190,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  7
     GetCargoIncome(100, 10): 74
     GetCargoIncome(10, 100): 6
-    GetWeight(100):          50
     GetRoadVehicleTypeForCargo(): 1
   Cargo 6
     IsValidCargo():          true
@@ -1216,7 +1202,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  5
     GetCargoIncome(100, 10): 58
     GetCargoIncome(10, 100): 4
-    GetWeight(100):          100
     GetRoadVehicleTypeForCargo(): 1
   Cargo 7
     IsValidCargo():          true
@@ -1229,7 +1214,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  6
     GetCargoIncome(100, 10): 60
     GetCargoIncome(10, 100): 5
-    GetWeight(100):          100
     GetRoadVehicleTypeForCargo(): 1
   Cargo 8
     IsValidCargo():          true
@@ -1242,7 +1226,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  6
     GetCargoIncome(100, 10): 62
     GetCargoIncome(10, 100): 5
-    GetWeight(100):          100
     GetRoadVehicleTypeForCargo(): 1
   Cargo 9
     IsValidCargo():          true
@@ -1255,7 +1238,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  6
     GetCargoIncome(100, 10): 69
     GetCargoIncome(10, 100): 6
-    GetWeight(100):          100
     GetRoadVehicleTypeForCargo(): 1
   Cargo 10
     IsValidCargo():          true
@@ -1268,7 +1250,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  9
     GetCargoIncome(100, 10): 90
     GetCargoIncome(10, 100): 7
-    GetWeight(100):          12
     GetRoadVehicleTypeForCargo(): 1
   Cargo 11
     IsValidCargo():          false
@@ -1281,7 +1262,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  -1
     GetCargoIncome(100, 10): -1
     GetCargoIncome(10, 100): -1
-    GetWeight(100):          -1
     GetRoadVehicleTypeForCargo(): 1
   Cargo 12
     IsValidCargo():          false
@@ -1294,7 +1274,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  -1
     GetCargoIncome(100, 10): -1
     GetCargoIncome(10, 100): -1
-    GetWeight(100):          -1
     GetRoadVehicleTypeForCargo(): 1
   Cargo 13
     IsValidCargo():          false
@@ -1307,7 +1286,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  -1
     GetCargoIncome(100, 10): -1
     GetCargoIncome(10, 100): -1
-    GetWeight(100):          -1
     GetRoadVehicleTypeForCargo(): 1
   Cargo 14
     IsValidCargo():          false
@@ -1320,7 +1298,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetCargoIncome(10, 10):  -1
     GetCargoIncome(100, 10): -1
     GetCargoIncome(10, 100): -1
-    GetWeight(100):          -1
     GetRoadVehicleTypeForCargo(): 1
 
 --CargoList--
@@ -7434,32 +7411,8 @@ ERROR: IsEnd() is invalid as Begin() is never called
     IsRailTile():                  false
     BuildRailTrack():              true
     BuildSignal():                 true
-    GetSignalType():               4
-    GetSignalType():               255
-    RemoveSignal():                true
-    BuildSignal():                 true
-    GetSignalType():               255
-    GetSignalType():               1
-    RemoveSignal():                true
-    BuildSignal():                 true
-    GetSignalType():               10
-    GetSignalType():               10
     RemoveRailTrack():             false
     RemoveRailTrack():             true
-    BuildRailTrack():              true
-    BuildSignal():                 false
-    GetSignalType():               255
-    GetSignalType():               255
-    RemoveSignal():                false
-    BuildSignal():                 true
-    GetSignalType():               255
-    GetSignalType():               1
-    RemoveSignal():                true
-    BuildSignal():                 true
-    GetSignalType():               255
-    GetSignalType():               10
-    RemoveRailTrack():             true
-    RemoveRailTrack():             false
     BuildRail():                   true
     HasTransportType():            true
     HasTransportType():            false
@@ -9295,7 +9248,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
   BuildVehicle():       12
   IsValidVehicle(12):   true
   CloneVehicle():       13
-  BuildVehicle():       1048575
   --Accounting--
     GetCosts():         11894
     Should be:          11894
@@ -9320,12 +9272,12 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetLocation():       33417
     GetEngineType():     153
     GetUnitNumber():     1
-    GetAge():            0
+    GetAge():            1
     GetMaxAge():         5490
-    GetAgeLeft():        5490
+    GetAgeLeft():        5489
     GetCurrentSpeed():   7
     GetRunningCost():    421
-    GetProfitThisYear(): 0
+    GetProfitThisYear(): -1
     GetProfitLastYear(): 0
     GetCurrentValue():   5947
     GetVehicleType():    1
@@ -9335,7 +9287,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
     IsInDepot():         false
     GetNumWagons():      1
     GetWagonEngineType(): 153
-    GetWagonAge():       0
+    GetWagonAge():       1
     GetLength():         8
   GetOwner():           1
   BuildVehicle():       14
@@ -9408,11 +9360,11 @@ ERROR: IsEnd() is invalid as Begin() is never called
     14 => 1
     12 => 1
   Age ListDump:
-    17 => 1
-    16 => 1
-    14 => 1
     13 => 1
     12 => 1
+    17 => 0
+    16 => 0
+    14 => 0
   MaxAge ListDump:
     16 => 10980
     14 => 10980
@@ -9420,9 +9372,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
     13 => 5490
     12 => 5490
   AgeLeft ListDump:
-    16 => 10979
-    14 => 10979
-    17 => 7319
+    16 => 10980
+    14 => 10980
+    17 => 7320
     13 => 5489
     12 => 5489
   CurrentSpeed ListDump:

regression/stationlist/info.nut

@@ -4,7 +4,7 @@ class StationList extends AIInfo {
 	function GetShortName()   { return "REGS"; }
 	function GetDescription() { return "This runs stationlist-tests on some commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "13"; }
+	function GetAPIVersion()  { return "12"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "StationList"; }
 	function UseAsRandomAI()  { return false; }

src/3rdparty/squirrel/squirrel/sqclass.cpp

@@ -65,9 +65,6 @@ bool SQClass::NewSlot(SQSharedState *ss,const SQObjectPtr &key,const SQObjectPtr
 		_defaultvalues[_member_idx(temp)].val = val;
 		return true;
 	}
-	if (_members->CountUsed() >= MEMBER_MAX_COUNT) {
-		return false;
-	}
 	if(type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE || bstatic) {
 		SQInteger mmidx;
 		if((type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE) &&

src/3rdparty/squirrel/squirrel/sqclass.h

@@ -18,7 +18,6 @@ typedef sqvector<SQClassMember> SQClassMemberVec;
 
 #define MEMBER_TYPE_METHOD 0x01000000
 #define MEMBER_TYPE_FIELD 0x02000000
-#define MEMBER_MAX_COUNT 0x00FFFFFF
 
 #define _ismethod(o) (_integer(o)&MEMBER_TYPE_METHOD)
 #define _isfield(o) (_integer(o)&MEMBER_TYPE_FIELD)