Doc: Prepare for 14.0-RC3 release

The tile patch array is 256 bytes and is not needed for the majority
of water regions, change it to be optional via std::unique_ptr

.dorpsgek.yml

@@ -14,7 +14,3 @@ notifications:
   pull-request:
   issue:
   tag-created:
-  workflow-run:
-    only:
-    - .github/workflows/release.yml
-    - .github/workflows/ci-nightly.yml

.github/changelog.sh

@@ -5,8 +5,8 @@ tag=$(git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null | sed 's@\
 # If we are a tag, show the part of the changelog till (but excluding) the last stable
 if [ -n "$tag" ]; then
     grep='^[0-9]\+\.[0-9]\+[^-]'
-    next=$(cat changelog.md | grep '^[0-9]' | awk 'BEGIN { show="false" } // { if (show=="true") print $0; if ($1=="'$tag'") show="true"} ' | grep "$grep" | head -n1 | sed 's/ .*//')
-    cat changelog.md | awk 'BEGIN { show="false" } /^[0-9]+.[0-9]+/ { if ($1=="'$next'") show="false"; if ($1=="'$tag'") show="true";} // { if (show=="true") print $0 }'
+    next=$(cat changelog.txt | grep '^[0-9]' | awk 'BEGIN { show="false" } // { if (show=="true") print $0; if ($1=="'$tag'") show="true"} ' | grep "$grep" | head -n1 | sed 's/ .*//')
+    cat changelog.txt | awk 'BEGIN { show="false" } /^[0-9]+.[0-9]+/ { if ($1=="'$next'") show="false"; if ($1=="'$tag'") show="true";} // { if (show=="true") print $0 }'
     exit 0
 fi
 

.github/unused-strings.py

@@ -39,6 +39,7 @@ def read_language_file(filename, strings_found, errors):
     skip = SkipType.NONE
     length = 0
     common_prefix = ""
+    last_tiny_string = ""
 
     with open(filename) as fp:
         for line in fp.readlines():
@@ -113,6 +114,17 @@ def read_language_file(filename, strings_found, errors):
             name = line.split(":")[0].strip()
             strings_defined.append(name)
 
+            # If a string ends on _TINY or _SMALL, it can be the {TINY} variant.
+            # Check for this by some fuzzy matching.
+            if name.endswith(("_SMALL", "_TINY")):
+                last_tiny_string = name
+            elif last_tiny_string:
+                matching_name = "_".join(last_tiny_string.split("_")[:-1])
+                if name == matching_name:
+                    strings_found.add(last_tiny_string)
+            else:
+                last_tiny_string = ""
+
             if skip == SkipType.EXTERNAL:
                 strings_found.add(name)
                 skip = SkipType.LENGTH

.github/workflows/ci-build.yml

@@ -1,4 +1,4 @@
-name: CI - Build
+name: CI
 
 on:
   pull_request:
@@ -17,22 +17,79 @@ jobs:
   emscripten:
     name: Emscripten
 
-    uses: ./.github/workflows/ci-emscripten.yml
-    secrets: inherit
+    runs-on: ubuntu-20.04
+    container:
+      # If you change this version, change the number in the cache step too.
+      image: emscripten/emsdk:3.1.42
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Setup cache
+      uses: actions/cache@v4
+      with:
+        path: /emsdk/upstream/emscripten/cache
+        key: 3.1.42-${{ runner.os }}
+
+    - name: Patch Emscripten to support LZMA
+      run: |
+        cd /emsdk/upstream/emscripten
+        patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch
+
+    - name: Build (host tools)
+      run: |
+        mkdir build-host
+        cd build-host
+
+        echo "::group::CMake"
+        cmake .. -DOPTION_TOOLS_ONLY=ON
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(nproc) cores"
+        cmake --build . -j $(nproc) --target tools
+        echo "::endgroup::"
+
+    - name: Install GCC problem matcher
+      uses: ammaraskar/gcc-problem-matcher@master
+
+    - name: Build
+      run: |
+        mkdir build
+        cd build
+
+        echo "::group::CMake"
+        emcmake cmake .. -DHOST_BINARY_DIR=../build-host
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(nproc) cores"
+        cmake --build . -j $(nproc) --target openttd
+        echo "::endgroup::"
 
   linux:
     strategy:
       fail-fast: false
       matrix:
         include:
-        - name: Clang
-          compiler: clang
-          cxxcompiler: clang++
+        - name: Clang - Debug
+          compiler: clang-15
+          cxxcompiler: clang++-15
           libraries: libsdl2-dev
+        - name: Clang - Release
+          compiler: clang-15
+          cxxcompiler: clang++-15
+          libraries: libsdl2-dev
+          extra-cmake-parameters: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPTION_USE_ASSERTS=OFF
         - name: GCC - SDL2
           compiler: gcc
           cxxcompiler: g++
           libraries: libsdl2-dev
+        - name: GCC - SDL1.2
+          compiler: gcc
+          cxxcompiler: g++
+          libraries: libsdl1.2-dev
         - name: GCC - Dedicated
           compiler: gcc
           cxxcompiler: g++
@@ -42,54 +99,332 @@ jobs:
 
     name: Linux (${{ matrix.name }})
 
-    uses: ./.github/workflows/ci-linux.yml
-    secrets: inherit
+    runs-on: ubuntu-latest
+    env:
+      CC: ${{ matrix.compiler }}
+      CXX: ${{ matrix.cxxcompiler }}
 
-    with:
-      compiler: ${{ matrix.compiler }}
-      cxxcompiler: ${{ matrix.cxxcompiler }}
-      libraries: ${{ matrix.libraries }}
-      extra-cmake-parameters: ${{ matrix.extra-cmake-parameters }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Setup vcpkg caching
+      uses: actions/github-script@v7
+      with:
+        script: |
+          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
+
+    - name: Install vcpkg
+      run: |
+        git clone https://github.com/microsoft/vcpkg
+        ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
+
+    - 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 \
+          liballegro4-dev \
+          libcurl4-openssl-dev \
+          libfontconfig-dev \
+          libharfbuzz-dev \
+          libicu-dev \
+          liblzma-dev \
+          liblzo2-dev \
+          ${{ matrix.libraries }} \
+          zlib1g-dev \
+          # EOF
+
+        echo "::group::Install vcpkg dependencies"
+
+        # Disable vcpkg integration, as we mostly use system libraries.
+        mv vcpkg.json vcpkg-disabled.json
+
+        # We only use breakpad from vcpkg, as its CMake files
+        # are a bit special. So the Ubuntu's variant doesn't work.
+        ./vcpkg/vcpkg install breakpad
+
+        echo "::endgroup::"
+      env:
+        DEBIAN_FRONTEND: noninteractive
+
+    - name: Get OpenGFX
+      run: |
+        mkdir -p ~/.local/share/openttd/baseset
+        cd ~/.local/share/openttd/baseset
+
+        echo "::group::Download OpenGFX"
+        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-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 GCC problem matcher
+      uses: ammaraskar/gcc-problem-matcher@master
+
+    - name: Build
+      run: |
+        mkdir build
+        cd build
+
+        echo "::group::CMake"
+        cmake .. -DCMAKE_TOOLCHAIN_FILE=${GITHUB_WORKSPACE}/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ matrix.extra-cmake-parameters }}
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(nproc) cores"
+        cmake --build . -j $(nproc)
+        echo "::endgroup::"
+
+    - name: Test
+      run: |
+        (
+          cd build
+          ctest -j $(nproc) --timeout 120
+        )
+
+        # Re-enable vcpkg.
+        mv vcpkg-disabled.json vcpkg.json
+
+        # Check no tracked files have been modified.
+        git diff --exit-code
 
   macos:
     strategy:
       fail-fast: false
       matrix:
         include:
-        - name: arm64 - Debug
-          arch: arm64
+        - arch: arm64
           full_arch: arm64
-          extra-cmake-parameters: -DCMAKE_BUILD_TYPE=Debug
-        - name: arm64 - Release
-          arch: arm64
-          full_arch: arm64
-          extra-cmake-parameters: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPTION_USE_ASSERTS=OFF
 
-    name: Mac OS (${{ matrix.name }})
+    name: Mac OS (${{ matrix.arch }})
 
-    uses: ./.github/workflows/ci-macos.yml
-    secrets: inherit
+    runs-on: macos-14
+    env:
+      MACOSX_DEPLOYMENT_TARGET: 10.13
 
-    with:
-      arch: ${{ matrix.arch }}
-      full_arch: ${{ matrix.full_arch }}
-      extra-cmake-parameters: ${{ matrix.extra-cmake-parameters }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Setup vcpkg caching
+      uses: actions/github-script@v7
+      with:
+        script: |
+          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
+
+    - name: Install vcpkg
+      run: |
+        git clone https://github.com/microsoft/vcpkg
+        ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
+
+    - name: Install OpenGFX
+      run: |
+        mkdir -p ~/Documents/OpenTTD/baseset
+        cd ~/Documents/OpenTTD/baseset
+
+        echo "::group::Download OpenGFX"
+        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-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 GCC problem matcher
+      uses: ammaraskar/gcc-problem-matcher@master
+
+    - name: Build
+      run: |
+        mkdir build
+        cd build
+
+        echo "::group::CMake"
+        cmake .. \
+          -DCMAKE_OSX_ARCHITECTURES=${{ matrix.full_arch }} \
+          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-osx \
+          -DCMAKE_TOOLCHAIN_FILE=${GITHUB_WORKSPACE}/vcpkg/scripts/buildsystems/vcpkg.cmake \
+          # EOF
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(sysctl -n hw.logicalcpu) cores"
+        cmake --build . -j $(sysctl -n hw.logicalcpu)
+        echo "::endgroup::"
+
+    - name: Test
+      run: |
+        cd build
+        ctest -j $(sysctl -n hw.logicalcpu) --timeout 120
 
   windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, windows-2019]
+        arch: [x86, x64]
+
+    name: Windows (${{ matrix.os }} / ${{ matrix.arch }})
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Setup vcpkg caching
+      uses: actions/github-script@v7
+      with:
+        script: |
+          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
+
+    - name: Install vcpkg
+      run: |
+        git clone https://github.com/microsoft/vcpkg
+        .\vcpkg\bootstrap-vcpkg.bat -disableMetrics
+
+    - name: Install OpenGFX
+      shell: bash
+      run: |
+        mkdir -p "C:/Users/Public/Documents/OpenTTD/baseset"
+        cd "C:/Users/Public/Documents/OpenTTD/baseset"
+
+        echo "::group::Download OpenGFX"
+        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-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 MSVC problem matcher
+      uses: ammaraskar/msvc-problem-matcher@master
+
+    - name: Configure developer command prompt for ${{ matrix.arch }}
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: ${{ matrix.arch }}
+
+    - name: Build
+      shell: bash
+      env:
+        NINJA_STATUS: "[%f/%t -- %e] " # [finished_edges/total_edges -- elapsed_time], default value is "[%f/%t] "
+      run: |
+        mkdir build
+        cd build
+
+        echo "::group::CMake"
+        cmake .. \
+          -GNinja \
+          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
+          -DCMAKE_TOOLCHAIN_FILE="${GITHUB_WORKSPACE}\vcpkg\scripts\buildsystems\vcpkg.cmake" \
+          # EOF
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        cmake --build .
+        echo "::endgroup::"
+
+    - name: Test
+      shell: bash
+      run: |
+        cd build
+        ctest --timeout 120
+
+
+  msys2:
     strategy:
       fail-fast: false
       matrix:
         include:
-        - arch: x86
-        - arch: x64
+          - msystem: MINGW64
+            arch: x86_64
+          - msystem: MINGW32
+            arch: i686
 
-    name: Windows (${{ matrix.arch }})
+    name: MinGW (${{ matrix.arch }})
 
-    uses: ./.github/workflows/ci-windows.yml
-    secrets: inherit
+    runs-on: windows-latest
 
-    with:
-      arch: ${{ matrix.arch }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Setup MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        release: false
+        install: >-
+          git
+          make
+          mingw-w64-${{ matrix.arch }}-cmake
+          mingw-w64-${{ matrix.arch }}-gcc
+          mingw-w64-${{ matrix.arch }}-lzo2
+          mingw-w64-${{ matrix.arch }}-libpng
+          mingw-w64-${{ matrix.arch }}-lld
+          mingw-w64-${{ matrix.arch }}-ninja
+
+    - name: Install OpenGFX
+      shell: bash
+      run: |
+        mkdir -p "C:/Users/Public/Documents/OpenTTD/baseset"
+        cd "C:/Users/Public/Documents/OpenTTD/baseset"
+
+        echo "::group::Download OpenGFX"
+        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-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 GCC problem matcher
+      uses: ammaraskar/gcc-problem-matcher@master
+
+    - name: Build
+      shell: msys2 {0}
+      env:
+        NINJA_STATUS: "[%f/%t -- %e] " # [finished_edges/total_edges -- elapsed_time], default value is "[%f/%t] "
+      run: |
+        mkdir build
+        cd build
+
+        echo "::group::CMake"
+        cmake .. \
+          -GNinja \
+          -DCMAKE_CXX_FLAGS="-fuse-ld=lld" \
+          # EOF
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        cmake --build .
+        echo "::endgroup::"
+
+    - name: Test
+      shell: msys2 {0}
+      run: |
+        cd build
+        ctest --timeout 120
 
   check_annotations:
     name: Check Annotations
@@ -98,6 +433,7 @@ jobs:
     - linux
     - macos
     - windows
+    - msys2
 
     if: always() && github.event_name == 'pull_request'
 

.github/workflows/ci-emscripten.yml

@@ -1,65 +0,0 @@
-name: CI (Emscripten)
-
-on:
-  workflow_call:
-
-env:
-  CTEST_OUTPUT_ON_FAILURE: 1
-
-jobs:
-  emscripten:
-    name: CI
-
-    runs-on: ubuntu-latest
-    container:
-      # If you change this version, change the number in the cache step too.
-      image: emscripten/emsdk:3.1.57
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Fix dubious ownership
-      run: |
-        git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-    - name: Setup cache
-      uses: actions/cache@v4
-      with:
-        path: /emsdk/upstream/emscripten/cache
-        key: 3.1.57-${{ runner.os }}
-
-    - name: Add liblzma support
-      run: |
-        cp ${GITHUB_WORKSPACE}/os/emscripten/ports/liblzma.py /emsdk/upstream/emscripten/tools/ports/contrib/
-
-    - name: Build (host tools)
-      run: |
-        mkdir build-host
-        cd build-host
-
-        echo "::group::CMake"
-        cmake .. -DOPTION_TOOLS_ONLY=ON
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        cmake --build . -j $(nproc) --target tools
-        echo "::endgroup::"
-
-    - name: Install GCC problem matcher
-      uses: ammaraskar/gcc-problem-matcher@master
-
-    - name: Build
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        emcmake cmake .. -DHOST_BINARY_DIR=../build-host
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        cmake --build . -j $(nproc) --target openttd
-        echo "::endgroup::"

.github/workflows/ci-linux.yml

@@ -1,126 +0,0 @@
-name: CI (Linux)
-
-on:
-  workflow_call:
-    inputs:
-      compiler:
-        required: true
-        type: string
-      cxxcompiler:
-        required: true
-        type: string
-      libraries:
-        required: true
-        type: string
-      extra-cmake-parameters:
-        required: true
-        type: string
-
-env:
-  CTEST_OUTPUT_ON_FAILURE: 1
-
-jobs:
-  linux:
-    name: CI
-
-    runs-on: ubuntu-24.04
-    env:
-      CC: ${{ inputs.compiler }}
-      CXX: ${{ inputs.cxxcompiler }}
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Setup vcpkg caching
-      uses: actions/github-script@v7
-      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
-
-    - name: Install vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg
-        ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
-
-    - 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 \
-          liballegro4-dev \
-          libcurl4-openssl-dev \
-          libfontconfig-dev \
-          libharfbuzz-dev \
-          libicu-dev \
-          liblzma-dev \
-          liblzo2-dev \
-          libogg-dev \
-          libopus-dev \
-          libopusfile-dev \
-          ${{ inputs.libraries }} \
-          zlib1g-dev \
-          # EOF
-
-        echo "::group::Install vcpkg dependencies"
-
-        # Disable vcpkg integration, as we mostly use system libraries.
-        mv vcpkg.json vcpkg-disabled.json
-
-        # We only use breakpad from vcpkg, as its CMake files
-        # are a bit special. So the Ubuntu's variant doesn't work.
-        ${{ runner.temp }}/vcpkg/vcpkg install breakpad
-
-        echo "::endgroup::"
-      env:
-        DEBIAN_FRONTEND: noninteractive
-
-    - name: Get OpenGFX
-      run: |
-        mkdir -p ~/.local/share/openttd/baseset
-        cd ~/.local/share/openttd/baseset
-
-        echo "::group::Download OpenGFX"
-        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-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 GCC problem matcher
-      uses: ammaraskar/gcc-problem-matcher@master
-
-    - name: Build
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ inputs.extra-cmake-parameters }}
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        cmake --build . -j $(nproc)
-        echo "::endgroup::"
-
-    - name: Test
-      run: |
-        (
-          cd build
-          ctest -j $(nproc) --timeout 120
-        )
-
-        # Re-enable vcpkg.
-        mv vcpkg-disabled.json vcpkg.json
-
-        # Check no tracked files have been modified.
-        git diff --exit-code

.github/workflows/ci-macos.yml

@@ -1,90 +0,0 @@
-name: CI (MacOS)
-
-on:
-  workflow_call:
-    inputs:
-      arch:
-        required: true
-        type: string
-      full_arch:
-        required: true
-        type: string
-      extra-cmake-parameters:
-        required: false
-        type: string
-        default: ""
-
-env:
-  CTEST_OUTPUT_ON_FAILURE: 1
-
-jobs:
-  macos:
-    name: CI
-
-    runs-on: macos-latest
-    env:
-      MACOSX_DEPLOYMENT_TARGET: 10.13
-
-    steps:
-    - name: Setup Xcode version
-      uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: latest-stable
-
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Setup vcpkg caching
-      uses: actions/github-script@v7
-      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
-
-    - name: Install vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg
-        ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
-
-    - name: Install OpenGFX
-      run: |
-        mkdir -p ~/Documents/OpenTTD/baseset
-        cd ~/Documents/OpenTTD/baseset
-
-        echo "::group::Download OpenGFX"
-        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-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 GCC problem matcher
-      uses: ammaraskar/gcc-problem-matcher@master
-
-    - name: Build
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake .. \
-          -DCMAKE_OSX_ARCHITECTURES=${{ inputs.full_arch }} \
-          -DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-osx \
-          -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
-          ${{ inputs.extra-cmake-parameters }} \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(sysctl -n hw.logicalcpu) cores"
-        cmake --build . -j $(sysctl -n hw.logicalcpu)
-        echo "::endgroup::"
-
-    - name: Test
-      run: |
-        cd build
-        ctest -j $(sysctl -n hw.logicalcpu) --timeout 120

.github/workflows/ci-mingw.yml

@@ -1,86 +0,0 @@
-name: CI (MinGW)
-
-on:
-  workflow_call:
-    inputs:
-      arch:
-        required: true
-        type: string
-      msystem:
-        required: true
-        type: string
-
-env:
-  CTEST_OUTPUT_ON_FAILURE: 1
-
-jobs:
-  mingw:
-    name: CI
-
-    runs-on: windows-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Setup MSYS2
-      uses: msys2/setup-msys2@v2
-      with:
-        msystem: ${{ inputs.msystem }}
-        release: false
-        install: >-
-          git
-          make
-          mingw-w64-${{ inputs.arch }}-cmake
-          mingw-w64-${{ inputs.arch }}-gcc
-          mingw-w64-${{ inputs.arch }}-lzo2
-          mingw-w64-${{ inputs.arch }}-libpng
-          mingw-w64-${{ inputs.arch }}-lld
-          mingw-w64-${{ inputs.arch }}-ninja
-          mingw-w64-${{ inputs.arch }}-libogg
-          mingw-w64-${{ inputs.arch }}-opus
-          mingw-w64-${{ inputs.arch }}-opusfile
-
-    - name: Install OpenGFX
-      shell: bash
-      run: |
-        mkdir -p "C:/Users/Public/Documents/OpenTTD/baseset"
-        cd "C:/Users/Public/Documents/OpenTTD/baseset"
-
-        echo "::group::Download OpenGFX"
-        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-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 GCC problem matcher
-      uses: ammaraskar/gcc-problem-matcher@master
-
-    - name: Build
-      shell: msys2 {0}
-      env:
-        NINJA_STATUS: "[%f/%t -- %e] " # [finished_edges/total_edges -- elapsed_time], default value is "[%f/%t] "
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake .. \
-          -GNinja \
-          -DCMAKE_CXX_FLAGS="-fuse-ld=lld" \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        cmake --build .
-        echo "::endgroup::"
-
-    - name: Test
-      shell: msys2 {0}
-      run: |
-        cd build
-        ctest --timeout 120

.github/workflows/ci-nightly.yml

@@ -1,82 +0,0 @@
-name: CI - Nightly
-
-on:
-  schedule:
-  - cron: '0 3 * * *'
-  workflow_dispatch:
-
-env:
-  CTEST_OUTPUT_ON_FAILURE: 1
-
-jobs:
-  linux:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - name: GCC - SDL1.2
-          compiler: gcc
-          cxxcompiler: g++
-          libraries: libsdl1.2-dev
-
-    name: Linux (${{ matrix.name }})
-
-    uses: ./.github/workflows/ci-linux.yml
-    secrets: inherit
-
-    with:
-      compiler: ${{ matrix.compiler }}
-      cxxcompiler: ${{ matrix.cxxcompiler }}
-      libraries: ${{ matrix.libraries }}
-      extra-cmake-parameters:
-
-  macos:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - arch: x64
-          full_arch: x86_64
-
-    name: Mac OS (${{ matrix.arch }})
-
-    uses: ./.github/workflows/ci-macos.yml
-    secrets: inherit
-
-    with:
-      arch: ${{ matrix.arch }}
-      full_arch: ${{ matrix.full_arch }}
-
-  mingw:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - msystem: MINGW64
-          arch: x86_64
-        - msystem: MINGW32
-          arch: i686
-
-    name: MinGW (${{ matrix.arch }})
-
-    uses: ./.github/workflows/ci-mingw.yml
-    secrets: inherit
-
-    with:
-      msystem: ${{ matrix.msystem }}
-      arch: ${{ matrix.arch }}
-
-  check_annotations:
-    name: Check Annotations
-    needs:
-    - linux
-    - macos
-    - mingw
-
-    if: always()
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Check annotations
-      uses: OpenTTD/actions/annotation-check@v5

.github/workflows/ci-windows.yml

@@ -1,84 +0,0 @@
-name: CI (Windows)
-
-on:
-  workflow_call:
-    inputs:
-      arch:
-        required: true
-        type: string
-
-env:
-  CTEST_OUTPUT_ON_FAILURE: 1
-
-jobs:
-  windows:
-    name: CI
-
-    runs-on: windows-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Setup vcpkg caching
-      uses: actions/github-script@v7
-      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
-
-    - name: Install vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}\vcpkg
-        ${{ runner.temp }}\vcpkg\bootstrap-vcpkg.bat -disableMetrics
-
-    - name: Install OpenGFX
-      shell: bash
-      run: |
-        mkdir -p "C:/Users/Public/Documents/OpenTTD/baseset"
-        cd "C:/Users/Public/Documents/OpenTTD/baseset"
-
-        echo "::group::Download OpenGFX"
-        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-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 MSVC problem matcher
-      uses: ammaraskar/msvc-problem-matcher@master
-
-    - name: Configure developer command prompt for ${{ inputs.arch }}
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: ${{ inputs.arch }}
-
-    - name: Build
-      shell: bash
-      env:
-        NINJA_STATUS: "[%f/%t -- %e] " # [finished_edges/total_edges -- elapsed_time], default value is "[%f/%t] "
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake .. \
-          -GNinja \
-          -DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-windows-static \
-          -DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        cmake --build .
-        echo "::endgroup::"
-
-    - name: Test
-      shell: bash
-      run: |
-        cd build
-        ctest --timeout 120

.github/workflows/codeql.yml

@@ -26,19 +26,6 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Setup vcpkg caching
-      uses: actions/github-script@v7
-      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
-
-    - name: Install vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg
-        ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
-
     - name: Install dependencies
       run: |
         echo "::group::Update apt"
@@ -54,33 +41,16 @@ jobs:
           libicu-dev \
           liblzma-dev \
           liblzo2-dev \
-          libopus-dev \
-          libopusfile-dev \
           libsdl2-dev \
           zlib1g-dev \
           # EOF
-
-        echo "::group::Install vcpkg dependencies"
-
-        # Disable vcpkg integration, as we mostly use system libraries.
-        mv vcpkg.json vcpkg-disabled.json
-
-        # We only use breakpad from vcpkg, as its CMake files
-        # are a bit special. So the Ubuntu's variant doesn't work.
-        ${{ runner.temp }}/vcpkg/vcpkg install breakpad
-
         echo "::endgroup::"
       env:
         DEBIAN_FRONTEND: noninteractive
 
-    - name: Prepare build
+    - name: Set number of make jobs
       run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake
-        echo "::endgroup::"
+        echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
@@ -88,14 +58,8 @@ jobs:
         languages: cpp
         config-file: ./.github/codeql/codeql-config.yml
 
-    - name: Build
-      run: |
-        cd build
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        cmake --build . -j $(nproc)
-        echo "::endgroup::"
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3

.github/workflows/preview-build.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       # If you change this version, change the number in the cache step too.
-      image: emscripten/emsdk:3.1.57
+      image: emscripten/emsdk:3.1.42
 
     steps:
     - name: Checkout
@@ -38,11 +38,12 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /emsdk/upstream/emscripten/cache
-        key: 3.1.57-${{ runner.os }}
+        key: 3.1.42-${{ runner.os }}
 
-    - name: Add liblzma support
+    - name: Patch Emscripten to support LZMA
       run: |
-        cp ${GITHUB_WORKSPACE}/os/emscripten/ports/liblzma.py /emsdk/upstream/emscripten/tools/ports/contrib/
+        cd /emsdk/upstream/emscripten
+        patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch
 
     - name: Build (host tools)
       run: |

.github/workflows/release-docs.yml

@@ -11,7 +11,7 @@ jobs:
   docs:
     name: Docs
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     - name: Download source

.github/workflows/release-macos.yml

@@ -12,16 +12,11 @@ jobs:
   macos:
     name: MacOS
 
-    runs-on: macos-latest
+    runs-on: macos-14
     env:
       MACOSX_DEPLOYMENT_TARGET: 10.13
 
     steps:
-    - name: Setup Xcode version
-      uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: latest-stable
-
     - name: Download source
       uses: actions/download-artifact@v4
       with:
@@ -86,7 +81,7 @@ jobs:
         echo "::endgroup::"
 
     - name: Import code signing certificates
-      uses: Apple-Actions/import-codesign-certs@v3
+      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 }}

.github/workflows/release-source.yml

@@ -18,7 +18,7 @@ jobs:
   source:
     name: Source
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     outputs:
       version: ${{ steps.metadata.outputs.version }}
@@ -127,7 +127,7 @@ jobs:
         fi
 
         mkdir -p build/bundles
-        cp .changelog build/bundles/changelog.md
+        cp .changelog build/bundles/changelog.txt
         cp .release_date build/bundles/released.txt
         cp README.md build/bundles/README.md
         echo "::endgroup::"

.github/workflows/upload-gog.yml

@@ -11,7 +11,7 @@ jobs:
   upload:
     name: Upload (GOG)
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     - name: Download source

.github/workflows/upload-steam.yml

@@ -14,7 +14,7 @@ jobs:
   upload:
     name: Upload (Steam)
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     - name: Download source

CMakeLists.txt

@@ -5,7 +5,7 @@ if(NOT BINARY_NAME)
 endif()
 
 project(${BINARY_NAME}
-    VERSION 15.0
+    VERSION 14.0
     LANGUAGES CXX
 )
 
@@ -152,10 +152,9 @@ if(NOT OPTION_DEDICATED)
                 find_package(Fontconfig)
             endif()
             find_package(Harfbuzz)
-            find_package(ICU OPTIONAL_COMPONENTS i18n uc)
+            find_package(ICU OPTIONAL_COMPONENTS i18n)
         endif()
     endif()
-    find_package(OpusFile)
 endif()
 if(APPLE)
     enable_language(OBJCXX)
@@ -332,8 +331,6 @@ if(NOT OPTION_DEDICATED)
     link_package(Fontconfig TARGET Fontconfig::Fontconfig)
     link_package(Harfbuzz TARGET harfbuzz::harfbuzz)
     link_package(ICU_i18n)
-    link_package(ICU_uc)
-    link_package(OpusFile TARGET OpusFile::opusfile)
 
     if(SDL2_FOUND AND OPENGL_FOUND AND UNIX)
         # SDL2 dynamically loads OpenGL if needed, so do not link to OpenGL when
@@ -346,7 +343,7 @@ if(NOT OPTION_DEDICATED)
     endif()
 endif()
 
-include(3rdparty/llvm/CheckAtomic)
+include(CheckAtomic)
 
 if(APPLE)
     link_package(Iconv TARGET Iconv::Iconv)
@@ -391,8 +388,8 @@ if(EMSCRIPTEN)
     target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/CREDITS.md@/CREDITS.md")
     target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/CONTRIBUTING.md@/CONTRIBUTING.md")
     target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/COPYING.md@/COPYING.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/known-bugs.md@/known-bugs.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/changelog.md@/changelog.md")
+    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/known-bugs.txt@/known-bugs.txt")
+    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/changelog.txt@/changelog.txt")
     target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/admin_network.md@/docs/admin_network.md")
     target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/debugging_desyncs.md@/docs/debugging_desyncs.md")
     target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/desync.md@/docs/desync.md")

CODINGSTYLE.md

@@ -157,7 +157,7 @@ enum SomeEnumeration {
 * Use curly braces and put the contained statements on their own lines (e.g., don't put them directly after the **if**).
 * Opening curly bracket **{** stays on the first line, closing curly bracket **}** gets a line to itself (except for the **}** preceding an **else**, which should be on the same line as the **else**).
 * When only a single statement is contained, the brackets can be omitted. In this case, put the single statement on the same line as the preceding keyword (**if**, **while**, etc.). Note that this is only allowed for if statements without an **else** clause.
-* Non-trivial fall throughs must be documented, using a `[[fallthrough]]` attribute.
+* All fall throughs must be documented, using a **FALLTHROUGH** define/macro.
 * The NOT_REACHED() macro can be used in default constructs that should never be reached.
 * Unconditional loops are written with **`for (;;) {`**
 
@@ -180,7 +180,7 @@ switch (a) {
 
 	case 1:
 		DoSomething();
-		[[fallthrough]];
+		FALLTHROUGH;
 
 	case 2:
 		DoMore();
@@ -191,7 +191,7 @@ switch (a) {
 		int r = 2;
 
 		DoEvenMore(a);
-		[[fallthrough]];
+		FALLTHROUGH;
 	}
 
 	case 4: {
@@ -248,46 +248,12 @@ Templates are a very powerful C++ tool, but they can easily confuse beginners. T
 * Templates are to be documented in a very clear and verbose manner. Never assume anything in the documentation.
 * the template keyword and the template layout get a separate line. typenames are either "T" or preceded by a "T", integers get a single capital letter or a descriptive name preceded by "T".
 ```c++
-template <typename T, typename Tsomething, int N, uint8_t Tnumber_of_something>
+template <typename T, typename Tsomething, int N, byte Tnumber_of_something>
 int Func();
 ```
 
 * If you are writing one or more template class in the dedicated header file, use file.hpp for its name instead of file.h. This will let others know that it is template library (includes also implementation), not just header with declarations.
 
-### Code Comment Vertical Alignment
-
-When adding code or comments to an existing formatted section, follow the existing style if possible without editing the preexisting lines.
-
-If your addition cannot be aligned with existing code, do not align the comments with anything and use only a single space between the code and the comment.
-
-Good:
-
-```c++
-enum Vehicle {
-	BUS,  ///< Take the bus.
-+	CAR,  ///< Drive your car.
-	BIKE, ///< Ride your bike
-+	TRAIN, ///< Catch the train.
-}
-```
-
-"Car" is shorter than Bike which allows you to easily align the new comment. "Train" is longer.  It is *NOT* desirable to change the vertical comment alignment of this enum.
-
-Bad:
-
-```c++
-enum Vehicle {
--	BUS,  ///< Take the bus.
--	BIKE, ///< Ride your bike
-+	BUS,   ///< Take the bus.
-+	CAR,   ///< Drive your car.
-+	BIKE,  ///< Ride your bike
-+	TRAIN, ///< Catch the train.
-}
-```
-
-OpenTTD used to vertically-align inline Doxygen comments as shown above. OpenTTD has since stopped strictly following this rule to keep diffs smaller and reduce pollution to the git blame history for non-functional changes.
-
 ### Other important rules
 * Put a space before and after binary operators: "a + b", "a == b", "a & b", "a <<= b", etc.. Exceptions are ".", "->" and "[]" (no spaces) and "," (just space after it).
 * Put parenthesis where it improves readability: "*(b++)" instead of "*b++", and "if ((a & b) && c == 2)" instead of "if (a & b && c == 2)".
@@ -482,7 +448,7 @@ Do not mention two keywords; if two apply, pick one that best represents the com
 
 The `<details>` part starts with a capital and does not end with a dot.
 Try to be descriptive to what the player will notice, not to what is actually being changed in the code.
-See `changelog.md` for inspiration.
+See `changelog.txt` for inspiration.
 
 To further structure the changelog, you can add components. Example are:
 * "Network" for network specific changes.

COMPILING.md

@@ -29,7 +29,7 @@ open most older savegames or use the content downloading system.
 
 ## Windows
 
-You need Microsoft Visual Studio 2022 or more recent.
+You need Microsoft Visual Studio 2017 or more recent.
 
 You can download the free Visual Studio Community Edition from Microsoft at
 https://visualstudio.microsoft.com/vs/community/.
@@ -65,7 +65,7 @@ To install both the x64 (64bit) and x86 (32bit) variants (though only one is nec
 
 You can open the folder (as a CMake project). CMake will be detected, and you can compile from there.
 If libraries are installed but not found, you need to set VCPKG_TARGET_TRIPLET in CMake parameters.
-For Visual Studio 2022 you also need to set CMAKE_TOOLCHAIN_FILE.
+For Visual Studio 2017 you also need to set CMAKE_TOOLCHAIN_FILE.
 (Typical values are shown in the MSVC project file command line example)
 
 Alternatively, you can create a MSVC project file via CMake. For this
@@ -75,7 +75,7 @@ that comes with vcpkg. After that, you can run something similar to this:
 ```powershell
 mkdir build
 cd build
-cmake.exe .. -G"Visual Studio 17 2022" -DCMAKE_TOOLCHAIN_FILE="<location of vcpkg>\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="x64-windows-static"
+cmake.exe .. -G"Visual Studio 16 2019" -DCMAKE_TOOLCHAIN_FILE="<location of vcpkg>\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="x64-windows-static"
 ```
 
 Change `<location of vcpkg>` to where you have installed vcpkg. After this
@@ -83,7 +83,7 @@ in the build folder are MSVC project files. MSVC can rebuild the project
 files himself via the `ZERO_CHECK` project.
 
 ## All other platforms
-Minimum required version of CMake is 3.16.
+Minimum required version of CMake is 3.9.
 By default this produces a Debug build with assertations enabled.
 This is a far slower build than release builds.
 
@@ -110,14 +110,17 @@ builds.
 - `-DOPTION_USE_ASSERTS=OFF`: disable asserts. Use with care, as assert
    statements capture early signs of trouble. Release builds have them
    disabled by default.
+- `-DOPTION_USE_THREADS=OFF`: disable the use of threads. This will block
+   the interface in many places, and in general gives a worse experience of
+   the game. Use with care.
 - `-DOPTION_TOOLS_ONLY=ON`: only build tools like `strgen`. Does not build
    the game itself. Useful for cross-compiling.
 
 ## Supported compilers
 
-Every compiler that is supported by CMake and supports C++20, should be
+Every compiler that is supported by CMake and supports C++17, should be
 able to compile OpenTTD. As the exact list of compilers changes constantly,
-we refer to the compiler manual to see if it supports C++20, and to CMake
+we refer to the compiler manual to see if it supports C++17, and to CMake
 to see if it supports your compiler.
 
 ## Compilation of base sets

Doxyfile.in

@@ -3,8 +3,6 @@
 # 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/>.
 
-# Doxyfile 1.9.4
-
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
@@ -15,7 +13,6 @@ PROJECT_BRIEF          =
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = ${CPACK_BINARY_DIR}/docs/source/
 CREATE_SUBDIRS         = YES
-CREATE_SUBDIRS_LEVEL   = 8
 ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
@@ -38,10 +35,8 @@ STRIP_FROM_PATH        = ./
 STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
-JAVADOC_BANNER         = NO
 QT_AUTOBRIEF           = NO
 MULTILINE_CPP_IS_BRIEF = NO
-PYTHON_DOCSTRING       = YES
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 2
@@ -50,7 +45,6 @@ OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
-OPTIMIZE_OUTPUT_SLICE  = NO
 EXTENSION_MAPPING      =
 MARKDOWN_SUPPORT       = YES
 TOC_INCLUDE_HEADINGS   = 0
@@ -66,19 +60,16 @@ INLINE_GROUPED_CLASSES = NO
 INLINE_SIMPLE_STRUCTS  = NO
 TYPEDEF_HIDES_STRUCT   = NO
 LOOKUP_CACHE_SIZE      = 0
-NUM_PROC_THREADS       = 1
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 EXTRACT_ALL            = NO
 EXTRACT_PRIVATE        = YES
-EXTRACT_PRIV_VIRTUAL   = NO
 EXTRACT_PACKAGE        = NO
 EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
 EXTRACT_LOCAL_METHODS  = YES
 EXTRACT_ANON_NSPACES   = YES
-RESOLVE_UNNAMED_PARAMS = YES
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -87,7 +78,6 @@ INTERNAL_DOCS          = NO
 CASE_SENSE_NAMES       = YES
 HIDE_SCOPE_NAMES       = NO
 HIDE_COMPOUND_REFERENCE= NO
-SHOW_HEADERFILE        = YES
 SHOW_INCLUDE_FILES     = YES
 SHOW_GROUPED_MEMB_INC  = NO
 FORCE_LOCAL_INCLUDES   = NO
@@ -117,11 +107,9 @@ QUIET                  = NO
 WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
-WARN_IF_INCOMPLETE_DOC = YES
 WARN_NO_PARAMDOC       = NO
 WARN_AS_ERROR          = NO
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LINE_FORMAT       = "at line $line of file $file"
 WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
@@ -162,10 +150,6 @@ REFERENCES_LINK_SOURCE = YES
 SOURCE_TOOLTIPS        = YES
 USE_HTAGS              = NO
 VERBATIM_HEADERS       = YES
-CLANG_ASSISTED_PARSING = NO
-CLANG_ADD_INC_PATHS    = YES
-CLANG_OPTIONS          =
-CLANG_DATABASE_PATH    =
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -191,7 +175,6 @@ HTML_DYNAMIC_SECTIONS  = NO
 HTML_INDEX_NUM_ENTRIES = 100
 GENERATE_DOCSET        = NO
 DOCSET_FEEDNAME        = "Doxygen generated docs"
-DOCSET_FEEDURL         =
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 DOCSET_PUBLISHER_NAME  = Publisher
@@ -214,17 +197,12 @@ GENERATE_ECLIPSEHELP   = NO
 ECLIPSE_DOC_ID         = org.doxygen.Project
 DISABLE_INDEX          = NO
 GENERATE_TREEVIEW      = YES
-FULL_SIDEBAR           = NO
 ENUM_VALUES_PER_LINE   = 4
 TREEVIEW_WIDTH         = 250
 EXT_LINKS_IN_WINDOW    = NO
-OBFUSCATE_EMAILS       = YES
-HTML_FORMULA_FORMAT    = png
 FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
-FORMULA_MACROFILE      =
 USE_MATHJAX            = NO
-MATHJAX_VERSION        = MathJax_2
 MATHJAX_FORMAT         = HTML-CSS
 MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/
 MATHJAX_EXTENSIONS     =
@@ -243,7 +221,6 @@ GENERATE_LATEX         = NO
 LATEX_OUTPUT           = latex
 LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
-LATEX_MAKEINDEX_CMD    = makeindex
 COMPACT_LATEX          = NO
 PAPER_TYPE             = a4
 EXTRA_PACKAGES         =
@@ -255,9 +232,9 @@ PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
 LATEX_HIDE_INDICES     = NO
+LATEX_SOURCE_CODE      = NO
 LATEX_BIB_STYLE        = plain
 LATEX_TIMESTAMP        = NO
-LATEX_EMOJI_DIRECTORY  =
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -267,6 +244,7 @@ COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 RTF_EXTENSIONS_FILE    =
+RTF_SOURCE_CODE        = NO
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -281,12 +259,12 @@ MAN_LINKS              = NO
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
 XML_PROGRAMLISTING     = YES
-XML_NS_MEMB_FILE_SCOPE = NO
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
 GENERATE_DOCBOOK       = NO
 DOCBOOK_OUTPUT         = docbook
+DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -333,6 +311,7 @@ EXTERNAL_PAGES         = YES
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
 DIA_PATH               =
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = NO
@@ -345,8 +324,6 @@ COLLABORATION_GRAPH    = YES
 GROUP_GRAPHS           = YES
 UML_LOOK               = NO
 UML_LIMIT_NUM_FIELDS   = 10
-DOT_UML_DETAILS        = NO
-DOT_WRAP_THRESHOLD     = 17
 TEMPLATE_RELATIONS     = NO
 INCLUDE_GRAPH          = YES
 INCLUDED_BY_GRAPH      = YES
@@ -354,7 +331,6 @@ CALL_GRAPH             = NO
 CALLER_GRAPH           = NO
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
-DIR_GRAPH_MAX_DEPTH    = 1
 DOT_IMAGE_FORMAT       = png
 INTERACTIVE_SVG        = NO
 DOT_PATH               =

README.md

@@ -212,9 +212,6 @@ See `src/3rdparty/monocypher/LICENSE.md` for the complete license text.
 The OpenTTD Social Integration API in `src/3rdparty/openttd_social_integration_api` is licensed under the MIT license.
 See `src/3rdparty/openttd_social_integration_api/LICENSE` for the complete license text.
 
-The atomic datatype support detection in `cmake/3rdparty/llvm/CheckAtomic.cmake` is licensed under the Apache 2.0 license.
-See `cmake/3rdparty/llvm/LICENSE.txt` for the complete license text.
-
 ## 4.0 Credits
 
 See [CREDITS.md](./CREDITS.md)

bin/ai/CMakeLists.txt

@@ -15,7 +15,6 @@ set(AI_COMPAT_SOURCE_FILES
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_12.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_13.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_14.nut
-	${CMAKE_CURRENT_SOURCE_DIR}/compat_15.nut
 )
 
 foreach(AI_COMPAT_SOURCE_FILE IN LISTS AI_COMPAT_SOURCE_FILES)

bin/ai/compat_14.nut

@@ -4,5 +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("14 API compatibility in effect.");

bin/game/CMakeLists.txt

@@ -12,7 +12,6 @@ set(GS_COMPAT_SOURCE_FILES
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_12.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_13.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_14.nut
-	${CMAKE_CURRENT_SOURCE_DIR}/compat_15.nut
 )
 
 foreach(GS_COMPAT_SOURCE_FILE IN LISTS GS_COMPAT_SOURCE_FILES)

bin/game/compat_14.nut

@@ -4,5 +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("14 API compatibility in effect.");

bin/game/compat_15.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/>.
- */

cmake/3rdparty/llvm/LICENSE.txt

@@ -1,279 +0,0 @@
-==============================================================================
-The LLVM Project is under the Apache License v2.0 with LLVM Exceptions:
-==============================================================================
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-    1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-    2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-    3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-    4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-    5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-    6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-    7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-    8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-    9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-    END OF TERMS AND CONDITIONS
-
-    APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-    Copyright [yyyy] [name of copyright owner]
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-
----- LLVM Exceptions to the Apache 2.0 License ----
-
-As an exception, if, as a result of your compiling your source code, portions
-of this Software are embedded into an Object form of such source code, you
-may redistribute such embedded portions in such Object form without complying
-with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
-
-In addition, if you combine or link compiled forms of this Software with
-software that is licensed under the GPLv2 ("Combined Software") and if a
-court of competent jurisdiction determines that the patent provision (Section
-3), the indemnity provision (Section 9) or other Section of the License
-conflicts with the conditions of the GPLv2, you may retroactively and
-prospectively choose to deem waived or otherwise exclude such Section(s) of
-the License, but only in their entirety and only with respect to the Combined
-Software.
-
-==============================================================================
-Software from third parties included in the LLVM Project:
-==============================================================================
-The LLVM Project contains third party software which is under different license
-terms. All such code will be identified clearly using at least one of two
-mechanisms:
-1) It will be in a separate directory tree with its own `LICENSE.txt` or
-   `LICENSE` file at the top containing the specific license and restrictions
-   which apply to that software, or
-2) It will contain specific license and restriction terms at the top of every
-   file.
-
-==============================================================================
-Legacy LLVM License (https://llvm.org/docs/DeveloperPolicy.html#legacy):
-==============================================================================
-University of Illinois/NCSA
-Open Source License
-
-Copyright (c) 2003-2019 University of Illinois at Urbana-Champaign.
-All rights reserved.
-
-Developed by:
-
-    LLVM Team
-
-    University of Illinois at Urbana-Champaign
-
-    http://llvm.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal with
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimers.
-
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimers in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the names of the LLVM Team, University of Illinois at
-      Urbana-Champaign, nor the names of its contributors may be used to
-      endorse or promote products derived from this Software without specific
-      prior written permission.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-SOFTWARE.
-

cmake/CheckAtomic.cmake

@@ -1,11 +1,3 @@
-#
-# This was originally part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See (https://llvm.org/)LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#
-# Modifications have been made to suit building OpenTTD.
-#
-
 # atomic builtins are required for threading support.
 
 INCLUDE(CheckCXXSourceCompiles)
@@ -56,8 +48,6 @@ else()
   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 requires the C-compiler as the atomic functions are built-in declared.
-    enable_language(C)
     check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC)
     if(HAVE_LIBATOMIC)
       list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
@@ -79,8 +69,6 @@ else()
   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 requires the C-compiler as the atomic functions are built-in declared.
-    enable_language(C)
     check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
     if(HAVE_CXX_LIBATOMICS64)
       list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")

cmake/CompileFlags.cmake

@@ -10,7 +10,6 @@ macro(compile_flags)
 
         if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
             add_compile_options(
-                /Zc:preprocessor # Needed for __VA_OPT__() in macros.
                 /MP # Enable multi-threaded compilation.
                 /FC # Display the full path of source code files passed to the compiler in diagnostics.
             )
@@ -56,11 +55,6 @@ macro(compile_flags)
             # This flag disables the broken optimisation to work around the bug
             add_compile_options(/d2ssa-rse-)
         endif()
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-            add_compile_options(
-                -Wno-multichar
-            )
-        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
@@ -80,6 +74,12 @@ macro(compile_flags)
 
             # We use 'ABCD' multichar for SaveLoad chunks identifiers
             -Wno-multichar
+
+            # Compilers complains about that we break strict-aliasing.
+            #  On most places we don't see how to fix it, and it doesn't
+            #  break anything. So disable strict-aliasing to make the
+            #  compiler all happy.
+            -fno-strict-aliasing
         )
 
         # Ninja processes the output so the output from the compiler

cmake/FindOgg.cmake

@@ -1,37 +0,0 @@
-include(FindPackageHandleStandardArgs)
-
-find_library(Ogg_LIBRARY
-    NAMES ogg
-)
-
-set(Ogg_COMPILE_OPTIONS "" CACHE STRING "Extra compile options of ogg")
-
-set(Ogg_LINK_LIBRARIES "" CACHE STRING "Extra link libraries of ogg")
-
-set(Ogg_LINK_FLAGS "" CACHE STRING "Extra link flags of ogg")
-
-find_path(Ogg_INCLUDE_PATH
-    NAMES ogg.h
-    PATH_SUFFIXES ogg
-)
-
-find_package_handle_standard_args(Ogg
-    REQUIRED_VARS Ogg_LIBRARY Ogg_INCLUDE_PATH
-)
-
-if (Ogg_FOUND)
-    set(Ogg_dirs ${Ogg_INCLUDE_PATH})
-    if(EXISTS "${Ogg_INCLUDE_PATH}/ogg")
-        list(APPEND Ogg_dirs "${Ogg_INCLUDE_PATH}/ogg")
-    endif()
-    if (NOT TARGET Ogg::ogg)
-        add_library(Ogg::ogg UNKNOWN IMPORTED)
-        set_target_properties(Ogg::ogg PROPERTIES
-            IMPORTED_LOCATION "${Ogg_LIBRARY}"
-            INTERFACE_INCLUDE_DIRECTORIES "${Ogg_dirs}"
-            INTERFACE_COMPILE_OPTIONS "${Ogg_COMPILE_OPTIONS}"
-            INTERFACE_LINK_LIBRARIES "${Ogg_LINK_LIBRARIES}"
-            INTERFACE_LINK_FLAGS "${Ogg_LINK_FLAGS}"
-        )
-    endif()
-endif()

cmake/FindOpus.cmake

@@ -1,37 +0,0 @@
-include(FindPackageHandleStandardArgs)
-
-find_library(Opus_LIBRARY
-    NAMES opus
-)
-
-set(Opus_COMPILE_OPTIONS "" CACHE STRING "Extra compile options of opus")
-
-set(Opus_LINK_LIBRARIES "" CACHE STRING "Extra link libraries of opus")
-
-set(Opus_LINK_FLAGS "" CACHE STRING "Extra link flags of opus")
-
-find_path(Opus_INCLUDE_PATH
-    NAMES opus.h
-    PATH_SUFFIXES opus
-)
-
-find_package_handle_standard_args(Opus
-    REQUIRED_VARS Opus_LIBRARY Opus_INCLUDE_PATH
-)
-
-if (Opus_FOUND)
-    set(Opus_dirs ${Opus_INCLUDE_PATH})
-    if(EXISTS "${Opus_INCLUDE_PATH}/opus")
-        list(APPEND Opus_dirs "${Opus_INCLUDE_PATH}/opus")
-    endif()
-    if (NOT TARGET Opus::opus)
-        add_library(Opus::opus UNKNOWN IMPORTED)
-        set_target_properties(Opus::opus PROPERTIES
-            IMPORTED_LOCATION "${Opus_LIBRARY}"
-            INTERFACE_INCLUDE_DIRECTORIES "${Opus_dirs}"
-            INTERFACE_COMPILE_OPTIONS "${Opus_COMPILE_OPTIONS}"
-            INTERFACE_LINK_LIBRARIES "${Opus_LINK_LIBRARIES}"
-            INTERFACE_LINK_FLAGS "${Opus_LINK_FLAGS}"
-        )
-    endif()
-endif()

cmake/FindOpusFile.cmake

@@ -1,40 +0,0 @@
-include(FindPackageHandleStandardArgs)
-
-find_library(OpusFile_LIBRARY
-    NAMES opusfile
-)
-
-set(OpusFile_COMPILE_OPTIONS "" CACHE STRING "Extra compile options of opusfile")
-
-set(OpusFile_LINK_LIBRARIES "" CACHE STRING "Extra link libraries of opusfile")
-
-set(OpusFile_LINK_FLAGS "" CACHE STRING "Extra link flags of opusfile")
-
-find_path(OpusFile_INCLUDE_PATH
-    NAMES opusfile.h
-    PATH_SUFFIXES opus
-)
-
-find_package_handle_standard_args(OpusFile
-    REQUIRED_VARS OpusFile_LIBRARY OpusFile_INCLUDE_PATH
-)
-
-find_package(Ogg)
-find_package(Opus)
-
-if (OpusFile_FOUND)
-    set(OpusFile_dirs ${OpusFile_INCLUDE_PATH})
-    if(EXISTS "${OpusFile_INCLUDE_PATH}/opus")
-        list(APPEND OpusFile_dirs "${OpusFile_INCLUDE_PATH}/opus")
-    endif()
-    if (NOT TARGET OpusFile::opusfile)
-        add_library(OpusFile::opusfile UNKNOWN IMPORTED)
-        set_target_properties(OpusFile::opusfile PROPERTIES
-            IMPORTED_LOCATION "${OpusFile_LIBRARY}"
-            INTERFACE_INCLUDE_DIRECTORIES "${OpusFile_dirs}"
-            INTERFACE_COMPILE_OPTIONS "${OpusFile_COMPILE_OPTIONS}"
-            INTERFACE_LINK_LIBRARIES "Ogg::ogg;Opus::opus;${OpusFile_LINK_LIBRARIES}"
-            INTERFACE_LINK_FLAGS "${OpusFile_LINK_FLAGS}"
-        )
-    endif()
-endif()

cmake/InstallAndPackage.cmake

@@ -51,8 +51,8 @@ install(FILES
                 ${CMAKE_SOURCE_DIR}/README.md
                 ${CMAKE_SOURCE_DIR}/CREDITS.md
                 ${CMAKE_SOURCE_DIR}/CONTRIBUTING.md
-                ${CMAKE_SOURCE_DIR}/changelog.md
-                ${CMAKE_SOURCE_DIR}/known-bugs.md
+                ${CMAKE_SOURCE_DIR}/changelog.txt
+                ${CMAKE_SOURCE_DIR}/known-bugs.txt
         DESTINATION ${DOCS_DESTINATION_DIR}
         COMPONENT docs)
 

cmake/Options.cmake

@@ -57,6 +57,13 @@ function(set_options)
     option(OPTION_DEDICATED "Build dedicated server only (no GUI)" OFF)
     option(OPTION_INSTALL_FHS "Install with Filesystem Hierarchy Standard folders" ${DEFAULT_OPTION_INSTALL_FHS})
     option(OPTION_USE_ASSERTS "Use assertions; leave enabled for nightlies, betas, and RCs" ON)
+    if(EMSCRIPTEN)
+        # Although pthreads is supported, it is not in a way yet that is
+        # useful for us.
+        option(OPTION_USE_THREADS "Use threads" OFF)
+    else()
+        option(OPTION_USE_THREADS "Use threads" ON)
+    endif()
     option(OPTION_USE_NSIS "Use NSIS to create windows installer; enable only for stable releases" OFF)
     option(OPTION_TOOLS_ONLY "Build only tools target" OFF)
     option(OPTION_DOCS_ONLY "Build only docs target" OFF)
@@ -78,6 +85,7 @@ function(show_options)
     message(STATUS "Option Dedicated - ${OPTION_DEDICATED}")
     message(STATUS "Option Install FHS - ${OPTION_INSTALL_FHS}")
     message(STATUS "Option Use assert - ${OPTION_USE_ASSERTS}")
+    message(STATUS "Option Use threads - ${OPTION_USE_THREADS}")
     message(STATUS "Option Use NSIS - ${OPTION_USE_NSIS}")
 
     if(OPTION_SURVEY_KEY)
@@ -101,6 +109,10 @@ function(add_definitions_based_on_options)
         add_definitions(-DDEDICATED)
     endif()
 
+    if(NOT OPTION_USE_THREADS)
+        add_definitions(-DNO_THREADS)
+    endif()
+
     if(OPTION_USE_ASSERTS)
         add_definitions(-DWITH_ASSERT)
     else()

cmake/PackageBundle.cmake

@@ -4,7 +4,6 @@ set(CPACK_BUNDLE_NAME "OpenTTD")
 set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/os/macosx/openttd.icns")
 set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
 set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/os/macosx/splash.png")
-set(CPACK_BUNDLE_APPLE_ENTITLEMENTS "${CMAKE_SOURCE_DIR}/os/macosx/openttd.entitlements")
 set(CPACK_DMG_FORMAT "UDBZ")
 
 # Create a temporary Info.plist.in, where we will fill in the version via

cmake/scripts/Baseset.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.5)
 
 #
 # Create a single baseset meta file with the correct translations.

cmake/scripts/CreateGRF.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.5)
 
 #
 # Create a single GRF file based on sprites/<grfname>.nfo and sprites/*.png

cmake/scripts/Desktop.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.5)
 
 #
 # Create a desktop file with the correct translations.

cmake/scripts/FindVersion.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.5)
 
 if(NOT REV_MAJOR)
     set(REV_MAJOR 0)
@@ -49,14 +49,14 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
     string(SUBSTRING "${FULLHASH}" 0 10 SHORTHASH)
 
     # Get the last commit date
-    set(ENV{TZ} "UTC0")
-    execute_process(COMMAND ${GIT_EXECUTABLE} show -s --date=iso-local --pretty=format:%cd HEAD
+    execute_process(COMMAND ${GIT_EXECUTABLE} show -s --pretty=format:%ci HEAD
                     OUTPUT_VARIABLE COMMITDATE
                     OUTPUT_STRIP_TRAILING_WHITESPACE
                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     )
     string(REGEX REPLACE "([0-9]+)-([0-9]+)-([0-9]+).*" "\\1\\2\\3" COMMITDATE "${COMMITDATE}")
     set(REV_ISODATE "${COMMITDATE}")
+    string(SUBSTRING "${REV_ISODATE}" 0 4 REV_YEAR)
 
     # Get the branch
     execute_process(COMMAND ${GIT_EXECUTABLE} symbolic-ref -q HEAD
@@ -113,6 +113,7 @@ elseif(EXISTS "${CMAKE_SOURCE_DIR}/.ottdrev")
     list(GET OTTDREV 3 REV_HASH)
     list(GET OTTDREV 4 REV_ISTAG)
     list(GET OTTDREV 5 REV_ISSTABLETAG)
+    list(GET OTTDREV 6 REV_YEAR)
 else()
     message(WARNING "No version detected; this build will NOT be network compatible")
     set(REV_VERSION "norev0000")
@@ -121,19 +122,14 @@ else()
     set(REV_HASH "unknown")
     set(REV_ISTAG 0)
     set(REV_ISSTABLETAG 0)
+    set(REV_YEAR "1970")
 endif()
 
-# Extract REV_YEAR and REV_DATE from REV_ISODATE
-string(SUBSTRING "${REV_ISODATE}" 0 4 REV_YEAR)
-string(SUBSTRING "${REV_ISODATE}" 4 4 REV_DATE)
-# Drop leading 0 in REV_DATE if any
-string(REGEX REPLACE "^0?([0-9]+)" "\\1" REV_DATE "${REV_DATE}")
-
 message(STATUS "Version string: ${REV_VERSION}")
 
 if(GENERATE_OTTDREV)
     message(STATUS "Generating .ottdrev")
-    file(WRITE ${CMAKE_SOURCE_DIR}/.ottdrev "${REV_VERSION}\t${REV_ISODATE}\t${REV_MODIFIED}\t${REV_HASH}\t${REV_ISTAG}\t${REV_ISSTABLETAG}\n")
+    file(WRITE ${CMAKE_SOURCE_DIR}/.ottdrev "${REV_VERSION}\t${REV_ISODATE}\t${REV_MODIFIED}\t${REV_HASH}\t${REV_ISTAG}\t${REV_ISSTABLETAG}\t${REV_YEAR}\n")
 else()
     message(STATUS "Generating rev.cpp")
     configure_file("${CMAKE_SOURCE_DIR}/src/rev.cpp.in"

cmake/scripts/GenerateWidget.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.5)
 
 #
 # CMake script to automatically generate the enums in script_window.hpp

cmake/scripts/Regression.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.5)
 
 #
 # Runs a single regressoion test

cmake/scripts/SquirrelExport.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.5)
 
 if(NOT SCRIPT_API_SOURCE_FILE)
     message(FATAL_ERROR "Script needs SCRIPT_API_SOURCE_FILE defined")

cmake/scripts/SquirrelIncludes.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.5)
 
 if(NOT INCLUDES_SOURCE_FILE)
     message(FATAL_ERROR "Script needs INCLUDES_SOURCE_FILE defined")

docs/admin_network.md

@@ -1,6 +1,6 @@
 # OpenTTD's admin network
 
-Last updated:    2024-03-26
+Last updated:    2011-01-20
 
 
 ## Table of contents
@@ -49,29 +49,10 @@ Last updated:    2024-03-26
   Create a TCP connection to the server on port 3977. The application is
   expected to authenticate within 10 seconds.
 
-  To authenticate send either an `ADMIN_PACKET_ADMIN_JOIN` or an
-  `ADMIN_PACKET_ADMIN_JOIN_SECURE` packet.
+  To authenticate send a `ADMIN_PACKET_ADMIN_JOIN` packet.
 
-  The `ADMIN_PACKET_ADMIN_JOIN` packet sends the password without any
-  encryption or safeguards over the connection, and as such has been disabled
-  by default.
-
-  The `ADMIN_PACKET_ADMIN_JOIN_SECURE` packet initiates a key exchange
-  authentication schema which tells te server which methods the client
-  supports and the server makes a choice. The server will then send an
-  `ADMIN_PACKET_SERVER_AUTH_REQUEST` packet to which the client has to respond
-  with an `ADMIN_PACKET_ADMIN_AUTH_RESPONSE` packet.
-
-  The current choices for secure authentication are authorized keys, where
-  the client has a private key and the server a list of authorized public
-  keys, and a so-called password-authenticated key exchange which allows to
-  authenticate using a password without actually sending the password.
-  The server falls back to password authentication when the client's key is
-  not in the list of authorized keys.
-
-  When authentication has succeeded for either of the `JOIN` schemas, the
-  server will reply with `ADMIN_PACKET_SERVER_PROTOCOL` followed directly
-  by `ADMIN_PACKET_SERVER_WELCOME`.
+  The server will reply with `ADMIN_PACKET_SERVER_PROTOCOL` followed directly by
+  `ADMIN_PACKET_SERVER_WELCOME`.
 
   `ADMIN_PACKET_SERVER_PROTOCOL` contains details about the protocol version.
   It is the job of your application to check this number and decide whether

docs/desync.md

@@ -195,11 +195,10 @@ Last updated: 2014-02-23
      'src/network/network_func.h'.
      (DEBUG_FAILED_DUMP_COMMANDS is explained later)
    - Put the 'commands-out.log' into the root save folder, and rename
-      it to 'commands.log'. Strip everything and including the "newgame"
-      entry from the log.
-   - Run 'openttd -D -d desync=0 -g startsavegame.sav'.
-     This replays the server log. Use "-d desync=3" to also create a
-     new 'commands-out.log' and 'dmp_cmds_*.sav' in your autosave folder.
+      it to 'commands.log'.
+   - Run 'openttd -D -d desync=3 -g startsavegame.sav'.
+     This replays the server log and creates new 'commands-out.log'
+     and 'dmp_cmds_*.sav' in your autosave folder.
 
 ## 3.2) Evaluation of the replay
 
@@ -227,7 +226,7 @@ Last updated: 2014-02-23
   savegames with your own ones from the replay. You can also comment/disable
   the 'NOT_REACHED' mentioned above, to get another 'dmp_cmds_*.sav' from
   the replay after the mismatch has already been detected.
-  See Section 3.3 on how to compare savegames.
+  See Section 3.2 on how to compare savegames.
   If the saves differ you have located the Desync between the last dmp_cmds
   that match and the first one that does not. The difference of the saves
   may point you in the direction of what causes it.
@@ -253,14 +252,16 @@ Last updated: 2014-02-23
      are replayed. Their internal state will thus not change in the
      replay and will differ.
 
-  To compare savegame more semantically, easiest is to first export them
-  to a JSON format with for example:
+  To compare savegame more semantically, there exist some ugly hackish
+  tools at:
+     http://devs.openttd.org/~frosch/texts/zpipe.c
+     http://devs.openttd.org/~frosch/texts/printhunk.c
 
-  https://github.com/TrueBrain/OpenTTD-savegame-reader
+  The first one decompresses OpenTTD savegames. The second one creates
+  a textual representation of an uncompressed savegame, by parsing hunks
+  and arrays and such. With both tools you need to be a bit careful
+  since they work on stdin and stdout, which may not deal well with
+  binary data.
 
-  By running:
-
-  python -m savegame_reader --export-json dmp_cmds_NNN.sav | jq . > NNN.json
-
-  Now you can use any (JSON) diff tool to compare the two savegames in a
-  somewhat human readable way.
+  If you have the textual representation of the savegames, you can
+  compare them with regular diff tools.

docs/importing_town_data.md

@@ -1,97 +0,0 @@
-# Importing Town Data into OpenTTD
-
-To aid players in scenario creation, OpenTTD's Scenario Editor can import town data from external JSON files. This enables players to use an image editing program to align town coordinates with a real-world heightmap using a map underlay, instead of guessing at the correct locations in Scenario Editor itself.
-
-This town data consists of a JSON file storing an array of town data objects, each containing a name, location, target OpenTTD population, and whether it is marked as a city in the game.
-
-This document describes the standard format for this JSON file and outlines a workflow for creating this data effectively.
-
-## Table of contents
-
-- Why load external data?
-- How to use this feature
-  - Creating geodata
-    - Town data format standards
-    - Town data values
-  - Loading geodata into OpenTTD
-- Tutorial: Creating town data
-
-## Why load external data?
-
-There are three benefits to using an image editing program to create towns instead of the OpenTTD Scenario Editor.
-
-1. Placing towns accurately is much easier using a map underlay such as OpenStreetMap to match town locations with the corresponding heightmap.
-2. Storing town data in a JSON file instead of as an OpenTTD Scenario (.scn) doesn't require choosing your NewGRF house set before placing towns.
-3. Town coordinates are scaled by the map size, so you can load the data onto whatever size map you like.
-
-## How to use this feature
-
-### Creating geodata
-
-Town data is a text file in the JSON format, with a list of towns, each containing a coordinate location and properties: name, population, and whether or not it should be a city in OpenTTD.
-
-The format of this file is standardized for importing into OpenTTD and must be followed for OpenTTD to properly parse the data.
-
-For use in OpenTTD, you will also need a matching heightmap of the terrain features, as a PNG.
-
-#### Town data format standards
-
-The following code sample is complete and can be used in OpenTTD.
-- The list of towns is enclosed in an array marked with square brackets `[]`
-- Each town is enclosed in curly braces `{}`, with a comma after each town except for the last in the list.
-- The properties separated by commas except for the last.
-- Property names are enclosed in double quotes `""` with a colon `:` separating it from the property value.
-- The name property value is enclosed in double quotes `"London"`, while all other property values `44910`, `true`, etc., are not.
-
-```
-[
-    {
-        "name": "London",
-        "population": 44910,
-        "city": true,
-        "x": 0.7998046875,
-        "y": 0.708984375
-    },
-    {
-        "name": "Canterbury",
-        "population": 217.16,
-        "city": false,
-        "x": 0.83251953125,
-        "y": 0.828125
-    }
-]
-```
-
-#### Town data values
-
-- Population is scaled down for use in OpenTTD. It is possible to generate huge cities by using a large number, but there is a practical limit to town size. The larger the town, the longer it will take to import town data, since towns are placed at a relatively small size and then expanded until the population is greater than the player-defined target.
-- X and Y coordinates are a proportion of the total map dimension, between 0 and 1. Just take the pixel coordinates of the town's location in the corresponding heightmap (more detail in the tutorial below) and divide each by the maximum value.
-  - For example, London is at `726, 1638` in a 1024 px by 2048 px heightmap, so `726 / 1024 = 0.7998046875` and `1638 / 2048 = 0.708984375` gives the correct coordinates for OpenTTD.
-  - The reason for these proportional coordinates is so the data can be used for any map size.
-- 0,0 is (approximately) the very top tile in OpenTTD. You can see tile coordinates in-game with the Land Info Tool.
-- In most image editing programs, 0,0 is the top-left corner of the image. You can rotate the image however you want relative to compass north to orient the map to your liking. Make sure you crop and resize the image before recording town locations.
-- In OpenTTD, X and Y axis are swapped compared to most image editing programs and the standard Cartesian coordinate system. From the 0,0 origin at top left, X is the axis along the left side and Y is the axis along the right side. You can still measure X and Y coordinates in your image editing program, just swap them before importing into OpenTTD or towns won't line up with your heightmap.
-
-### Loading geodata into OpenTTD
-Using geodata to create a real-world location in OpenTTD is done in the Scenario Editor.
-
-1. Choose the NewGRFs you want to use in the game.
-2. Load the heightmap which you created in the geodata workflow. Either rotation will work, but the clockwise rotation is considered "correct" and the coordinates in the Land Info Tool will match your data; counter clockwise maps will align properly but the coordinates won't match your data.
-3. In the Town Generation window, click `Load from file` and choose the .json file containing town data. The default directory to search for town data is `OpenTTD\scenario\heightmap`.
-4. (Optional) Manually add industries, rivers, trees, and objects.
-5. Save the game as a Scenario and exit to the main menu.
-6. Load the game with Play Scenario and enjoy.
-
-Sometimes it's not possible to place a town, such as when the heightmap is very rough and a flat tile can't be found with a 16-tile radius of the target tile. In such cases, a sign will be placed on the target tile with the name of the town. The player can then place the town manually or change the heightmap settings and try again. This fallback also helps debug errors with data creation, such as if towns end up in the ocean.
-
-## Tutorial: Creating town data
-
-1. Load both your heightmap and a labeled map like OpenStreetMap as layers in an image editing program. You can use a free/open-source program like QGIS to acquire, align, and export these map images, if you like.
-2. Crop the image to your desired bounds, ensuring the aspect ratio is supported in OpenTTD (1:1, 1:2, 1:4, etc.).
-3. Resize the image to one of OpenTTD's supported map sizes, such as 512 px by 1024 px. Some image editors let you do this part of step 2. You can always load heightmaps and town data at a reduced size, so you may want to make this larger than your intended use in case you want it later.
-4. Use the labeled map layer to find the pixel coordinates of each town you'd like to include in your map. In GIMP this is displayed in the bottom left corner of the image window, and in Photoshop you need to enable the Info panel (F8) and switch to pixel units of measurement if not already.
-5. Some spreadsheets including Google Sheets can export data as JSON, so you may want to record it there, to export after step 8. Or you can build the JSON file manually.
-6. Adjust population numbers for OpenTTD.
-7. Change coordinates from pixels to proportion (0-1) of the total dimension: `x / maximum_x` and `y / maximum_y`, as described in "Town data values" above.
-8. Swap X and Y coordinates before importing to OpenTTD, since OpenTTD uses a reverse X and Y system than most image editors.
-9. Save the heightmap and town data files in your `OpenTTD\scenario\heightmap` folder.

docs/landscape.html

@@ -721,9 +721,10 @@
         </ul>
        </li>
       </ul>
-     <li>m3 bits 6..5 : free</li>
+     <li>m3 bit 6 : bit 8 of house type (m4), allowing 512 different types.</li>
+     <li>m3 bit 5 : free</li>
      <li>m3 bits 4..0 : triggers activated <a href="#newhouses">(newhouses)</a></li>
-     <li>m4 : free</li>
+     <li>m4 : <a href="landscape_externals.html">town building type</a> (with m3[6] bit)</li>
      <li>m5 : see m3 bit 7</li>
      <li>m6 :
       <ul>
@@ -739,7 +740,6 @@
        </li>
       </ul>
      </li>
-     <li>m6: bits 1..0: animated tile state</li>
      <li>m7 :
       <ul>
        <li>If <a href="#newhouses">newhouses</a> is activated
@@ -759,12 +759,10 @@
        </li>
       </ul>
      </li>
-     <li>m8 bits 15..12 : free</li>
-     <li>m8 bits 11..0 : <a href="landscape_externals.html">town building type</a></li>
     </ul>
     <small><a name="newhouses"></a>Newhouses is the name englobing a newGRF feature developed by TTDPatch devs (mainly Csaboka).<br>
     It allows the replacement of the properties as well as the graphics of houses in the game.<br>
-    To distinguish between the standard behaviour and the newGRF one, HouseID is tested for anything above 110.<br>
+    To distinguish between the standard behaviour and the newGRF one, HouseID (m4 + m3[6]) is tested for anything above 110.<br>
     110 is the count of standard houses. So above 110 means there is a new definition of at least one house</small>
    </td>
   </tr>
@@ -878,25 +876,6 @@
      <li>m2: index into the array of stations</li>
      <li>m3 bits 7..4: persistent random data for railway stations/waypoints and airports)</li>
      <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram tracks (road stop)</li>
-     <li>m3 bits 3..2: ground type (road waypoints)
-      <table>
-       <tr>
-        <td><tt>0</tt>&nbsp; </td>
-        <td>on bare land</td>
-       </tr>
-       <tr>
-        <td><tt>1</tt>&nbsp; </td>
-        <td>on grass</td>
-       </tr>
-       <tr>
-        <td><tt>2</tt>&nbsp; </td>
-        <td>paved</td>
-       </tr>
-      </table>
-     </li>
-     <li>m3 bit 2: rail station / waypoint may have catenary pylons</li>
-     <li>m3 bit 1: rail station / waypoint may have catenary wires</li>
-     <li>m3 bit 0: rail station / waypoint is blocked</li>
      <li>m4: custom station id; 0 means standard graphics</li>
      <li>m4: <a href="#RoadType">Roadtype</a> for road stops</li>
      <li>m5: graphics index (range from 0..255 for each station type):
@@ -977,22 +956,6 @@
         </td>
        </tr>
 
-       <tr>
-        <td nowrap valign=top><tt>04</tt>..<tt>05</tt>&nbsp; </td>
-        <td align=left>road waypoints
-         <table>
-          <tr>
-           <td><tt>04</tt>&nbsp; </td>
-           <td align=left>drive through X</td>
-          </tr>
-          <tr>
-           <td><tt>05</tt>&nbsp; </td>
-           <td align=left>drive through Y</td>
-          </tr>
-         </table>
-        </td>
-       </tr>
-
        <tr>
         <td nowrap valign=top><tt>00</tt>..<tt>05</tt>&nbsp; </td>
         <td align=left>ship dock
@@ -1026,16 +989,17 @@
        </tr>
       </table>
      </li>
-     <li>m6 bits 6..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy, waypoint, road waypoint)</li>
+     <li>m6 bit 7: rail station / waypoint may have catenary pylons</li>
+     <li>m6 bit 6: rail station / waypoint may have catenary wires</li>
+     <li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy, waypoint)</li>
      <li>m6 bit 2: pbs reservation state for railway stations/waypoints</li>
-     <li>m6 bits 1..0: animated tile state</li>
+     <li>m6 bit 0: rail station / waypoint is blocked</li>
 
      <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road (road stops)</li>
      <li>m7: animation frame (railway stations/waypoints, airports)</li>
-     <li>m8 bit 15: Snow or desert present (road waypoints)</li>
      <li>m8 bits 11..6: <a href="#TramType">Tramtype</a></li>
      <li>m8 bits 5..0: <a href="#TrackType">track type</a> for railway stations/waypoints</li>
-     <li>m8 bits 5..0: custom road stop/waypoint id; 0 means standard graphics</li>
+     <li>m8 bits 5..0: custom road stop id; 0 means standard graphics</li>
     </ul>
    </td>
   </tr>
@@ -1052,94 +1016,99 @@
      <li>m1 bits 6..5 : Water class (sea, canal or river)
      <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> (for sea, rivers, and coasts normally <tt>11</tt>)</li>
      <li>m2: Depot index (for depots only)</li>
-     <li>m3 bit 0: Non-flooding state</li>
      <li>m4: Random data for canal or river tiles</li>
-     <li>m5 bits 7..4: Water tile type:
+     <li>m5: tile type:
       <table>
-        <tr>
-         <td><tt>0</tt>&nbsp; </td>
-         <td>water, canal or river</td>
-        </tr>
-        <tr>
-         <td><tt>1</tt>&nbsp; </td>
-         <td>coast or riverbank</td>
-        </tr>
-        <tr>
-         <td nowrap valign=top><tt>2</tt>&nbsp; </td>
-         <td>canal lock<br>
-          <ul>
-           <li>m5 bits 3..2: Lock part
-            <table>
-             <tr>
-              <td><tt>0</tt>&nbsp; </td>
-              <td>Middle part</td>
-             </tr>
-             <tr>
-              <td><tt>1</tt>&nbsp; </td>
-              <td>Lower part</td>
-             </tr>
-             <tr>
-              <td><tt>2</tt>&nbsp; </td>
-              <td>Upper part</td>
-             </tr>
-            </table>
-           </li>
-           <li>m5 bits 1..0: Lock direction
-            <table>
-             <tr>
-              <td><tt>0</tt>&nbsp; </td>
-              <td>NE raised</td>
-             </tr>
-             <tr>
-              <td><tt>1</tt>&nbsp; </td>
-              <td>SE raised</td>
-             </tr>
-             <tr>
-              <td><tt>2</tt>&nbsp; </td>
-              <td>SW raised</td>
-             </tr>
-             <tr>
-              <td><tt>3</tt>&nbsp; </td>
-              <td>NW raised</td>
-             </tr>
-            </table>
-           </li>
-          </ul>
-         </td>
-        </tr>
-        <tr>
-         <td nowrap valign=top><tt>3</tt>&nbsp; </td>
-         <td>depot<br>
-          <ul>
-           <li>m5 bit 1: Depot axis
-            <table>
-             <tr>
-              <td><tt>0</tt>&nbsp; </td>
-              <td>X direction (NE-SW)</td>
-             </tr>
-             <tr>
-              <td><tt>1</tt>&nbsp; </td>
-              <td>Y direction (NW-SE)</td>
-             </tr>
-            </table>
-           </li>
-           <li>m5 bit 0: Depot part
-            <table>
-             <tr>
-              <td><tt>0</tt>&nbsp; </td>
-              <td>North part</td>
-             </tr>
-             <tr>
-              <td><tt>1</tt>&nbsp; </td>
-              <td>South part</td>
-             </tr>
-            </table>
-           </li>
-          </ul>
-         </td>
-        </tr>
-       </table>
-      </li>
+       <tr>
+        <td nowrap valign=top><tt>00</tt>&nbsp; </td>
+        <td align=left>water, canal or river</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>01</tt>&nbsp; </td>
+        <td align=left>coast or riverbank</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>10</tt>..<tt>1B</tt>&nbsp; </td>
+        <td align=left>canal locks
+         <table>
+          <tr>
+           <td nowrap valign=top><tt>10</tt>&nbsp; </td>
+           <td align=left>middle part, (SW-NE direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>11</tt>&nbsp; </td>
+           <td align=left>middle part, (NW-SE direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>12</tt>&nbsp; </td>
+           <td align=left>middle part, (NE-SW direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>13</tt>&nbsp; </td>
+           <td align=left>middle part, (SE-NW direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>14</tt>&nbsp; </td>
+           <td align=left>lower part, (SW-NE direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>15</tt>&nbsp; </td>
+           <td align=left>lower part, (NW-SE direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>16</tt>&nbsp; </td>
+           <td align=left>lower part, (NE-SW direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>17</tt>&nbsp; </td>
+           <td align=left>lower part, (SE-NW direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>18</tt>&nbsp; </td>
+           <td align=left>upper part, (SW-NE direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>19</tt>&nbsp; </td>
+           <td align=left>upper part, (NW-SE direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>1A</tt>&nbsp; </td>
+           <td align=left>upper part, (NE-SW direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>1B</tt>&nbsp; </td>
+           <td align=left>upper part, (SE-NW direction)</td>
+          </tr>
+         </table>
+        </td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>80</tt>..<tt>83</tt>&nbsp; </td>
+        <td align=left>ship depots
+         <table>
+          <tr>
+           <td nowrap valign=top><tt>80</tt>&nbsp; </td>
+           <td align=left>ship depot, NE part (X direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>81</tt>&nbsp; </td>
+           <td align=left>ship depot, SW part (X direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>82</tt>&nbsp; </td>
+           <td align=left>ship depot, NW part (Y direction)</td>
+          </tr>
+          <tr>
+           <td nowrap valign=top><tt>83</tt>&nbsp; </td>
+           <td align=left>ship depot, SE part (Y direction)</td>
+          </tr>
+         </table>
+        </td>
+       </tr>
+      </table>
      </li>
     </ul>
    </td>
@@ -1482,7 +1451,6 @@
      </li>
      <li>m6 bits 5..3: random triggers (NewGRF)</li>
      <li>m6 bit 2: bit 8 of type (see m5)</li>
-     <li>m6 bits 1..0: animated tile state</li>
      <li>m7: animation frame</li>
     </ul>
    </td>
@@ -1655,7 +1623,6 @@
      <li>m2: index into the array of objects, bits 0 to 15 (upper bits in m5)</li>
      <li>m3: random bits</li>
      <li>m5: index into the array of objects, bits 16 to 23 (lower bits in m2)</li>
-     <li>m6 bits 1..0: animated tile state</li>
      <li>m7: animation counter</li>
     </ul>
    </td>

docs/landscape_grid.html

@@ -79,8 +79,8 @@ the array so you can quickly see what is used and what is not.
     <tr>
       <td rowspan="2">0</td>
       <td class="caption">ground</td>
-      <td class="bits" rowspan=29><span class="used" title="Tile type">XXXX</span> <span class="used" title="Presence and direction of bridge above">XX</span> <span class="used" title="Tropic Zone: only meaningful in tropic climate. It contains the definition of the available zones">XX</span></td>
-      <td class="bits" rowspan=29><span class="used" title="Tile height">XXXX XXXX</span></td>
+      <td class="bits" rowspan=27><span class="used" title="Tile type">XXXX</span> <span class="used" title="Presence and direction of bridge above">XX</span> <span class="used" title="Tropic Zone: only meaningful in tropic climate. It contains the definition of the available zones">XX</span></td>
+      <td class="bits" rowspan=27><span class="used" title="Tile height">XXXX XXXX</span></td>
       <td class="bits" rowspan=2><span class="free">OOO</span><span class="usable" title="Owner (always OWNER_NONE)">1 OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits"><span class="used" title="Type of hedge on NE border">XXX</span> <span class="used" title="Snow presence">X</span><span class="free">OOOO</span></td>
@@ -130,7 +130,7 @@ the array so you can quickly see what is used and what is not.
       <td class="bits"><span class="used" title="Tile type: simple road (00), level crossing (01), road depot (10)">OO</span> <span class="used" title="Disallow vehicles to go a specific direction">XX</span> <span class="used" title="Road pieces">XXXX</span></td>
       <td class="bits"><span class="free">OO</span> <span class="used" title="Pavement type">XXX</span><span class="free">OOO</span></td>
       <td class="bits"><span class="free">OO</span><span class="used" title="Snow/desert present">X</span> <span class="free">O</span><span class="used" title="Roadworks counter">XXXX</span></td>
-      <td class="bits" rowspan=1><span class="free">OOOO</span> <span class="used" title="Tram type">XXXX XX</span><span class="free">OO OOOO</span></td>
+      <td class="bits" rowspan=1><span class="free">OOOO</span> <span class="used" title="Tram type">XXXX XX<span class="free">OO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">level crossing</td>
@@ -156,17 +156,17 @@ the array so you can quickly see what is used and what is not.
       <td class="caption">finished house</td>
       <td class="bits" rowspan=2><span class="used" title="House random bits">XXXX XXXX</span></td>
       <td class="bits" rowspan=2><span class="pool" title="Town index on pool">XXXX XXXX XXXX XXXX</span></td>
-      <td class="bits"><span class="used" title="House is complete/in construction (see m5)">1</span><span class="free">OO</span><span class="usable" title="Activated triggers (bits 2..4 don't have a meaning)">X XX</span><span class="used" title="Activated triggers (bits 2..4 don't have a meaning)">XX</span></td>
-      <td class="bits" rowspan=2><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="used" title="House is complete/in construction (see m5)">1</span> <span class="used" title="House type (m4 + m3[6])">X</span><span class="free">O</span><span class="usable" title="Activated triggers (bits 2..4 don't have a meaning)">XXX</span><span class="used" title="Activated triggers (bits 2..4 don't have a meaning)">XX</span></td>
+      <td class="bits" rowspan=2><span class="used" title="House type (m4 + m3[6])">XXXX XXXX</span></td>
       <td class="bits"><span class="used" title="Age in years, clamped at 255">XXXX XXXX</span></td>
-      <td class="bits" rowspan=2><span class="abuse" title="Newhouses activated: periodic processing time remaining; if not, lift position for houses 04 and 05">XXXX XX</span><span class="used" title="Animated tile state">XX</span></td>
+      <td class="bits" rowspan=2><span class="abuse" title="Newhouses activated: periodic processing time remaining; if not, lift position for houses 04 and 05">XXXX XX</span><span class="free">OO</span></td>
       <td class="bits" rowspan=2><span class="abuse" title="If newhouses active, m7 is the current animation frame">XXXX</span> <span class="abuse" title="If newhouses active, m7 is the current animantion frame; if not, lift behaviour for houses 04 and 05">XXXX</span></td>
-      <td class="bits" rowspan=2><span class="free">OOOO</span> <span class="used" title="House type">XXXX XXXX XXXX</span></td>
+      <td class="bits" rowspan=2><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">house under construction</td>
-      <td class="bits"><span class="used" title="House is complete/in construction (see m5)">O</span><span class="used" title="House type (m4 + m3[6])">X</span><span class="free">O</span><span class="usable" title="Activated triggers (bits 2..4 don't have a meaning)">X XX</span><span class="used" title="Activated triggers (bits 2..4 don't have a meaning)">XX</span></td>
-      <td class="bits"><span class="free">OOO</span><span class="used" title="Construction stage">X X</span><span class="used" title="Construction counter">XXX</span></td>
+      <td class="bits"><span class="used" title="House is complete/in construction (see m5)">O</span> <span class="used" title="House type (m4 + m3[6])">X</span><span class="free">O</span><span class="usable" title="Activated triggers (bits 2..4 don't have a meaning)">XXX</span><span class="used" title="Activated triggers (bits 2..4 don't have a meaning)">XX</span></td>
+      <td class="bits"><span class="free">OOO</span><span class="used" title="Construction stage">XX</span> <span class="used" title="Construction counter">XXX</span></td>
     </tr>
     <tr>
       <td>4</td>
@@ -181,14 +181,14 @@ the array so you can quickly see what is used and what is not.
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
-      <td rowspan=8>5</td>
+      <td rowspan=7>5</td>
       <td class="caption">rail station</td>
-      <td class="bits" rowspan=8><span class="free">O</span><span class="used" title="Water class">XX</span> <span class="used" title="Owner">XXXXX</span></td>
-      <td class="bits" rowspan=8><span class="pool" title="Station index on pool">XXXX XXXX XXXX XXXX</span></td>
-      <td class="bits" rowspan=2><span class="used" title="Random bits">XXXX</span> <span class="free">O</span><span class="used" title="May have pylons">X</span><span class="used" title="May have wires">X</span><span class="used" title="Tile is blocked">X</span></td>
+      <td class="bits" rowspan=7><span class="free">O</span><span class="used" title="Water class">XX</span> <span class="used" title="Owner">XXXXX</span></td>
+      <td class="bits" rowspan=7><span class="pool" title="Station index on pool">XXXX XXXX XXXX XXXX</span></td>
+      <td class="bits" rowspan=2><span class="used" title="Random bits">XXXX</span> <span class="free">OOOO</span></td>
       <td class="bits" rowspan=2><span class="used" title="Custom station specifications ID">XXXX XXXX</span></td>
       <td class="bits"><span class="used" title="Graphics index">XXXX XXXX</span></td>
-      <td class="bits" rowspan=2><span class="free">O</span><span class="used" title="Station type">XXX X</span><span class="used" title="Reserved track">X</span><span class="used" title="Animated tile state">XX</span></td>
+      <td class="bits" rowspan=2><span class="used" title="May have pylons">X</span><span class="used" title="May have wires">X</span><span class="used" title="Station type">XXX</span> <span class="used" title="Reserved track">X</span><span class="free">O</span><span class="used" title="Tile is blocked">X</span></td>
       <td class="bits" rowspan=2><span class="used" title="Animation frame">XXXX XXXX</span></td>
       <td class="bits" rowspan=2><span class="free">OOOO OOOO OO</span><span class="used" title="Railway type">XX XXXX</span></td>
     </tr>
@@ -199,17 +199,12 @@ the array so you can quickly see what is used and what is not.
     <tr>
       <td class="caption">road stop</td>
       <td class="bits"><span class="used" title="Owner of tram">XXXX</span> <span class="free">OOOO</span></td>
-      <td class="bits" rowspan=2><span class="free">OO</span><span class="used" title="Roadtype for road stop">XX XXXX</span></td>
-      <td class="bits" rowspan=2><span class="usable" title="Graphics index">OOOO O</span><span class="used" title="Graphics index: 00 (exit towards NE), 01 (exit towards SE), 02 (exit towards SW), 03 (exit towards NW), 04 (drive through X), 05 (drive through Y)">XXX</span></td>
-      <td class="bits" rowspan=6><span class="free">O</span><span class="used" title="Station type">XXX X</span><span class="free">O</span><span class="used" title="Animated tile state">XX</span></td>
-      <td class="bits" rowspan=2><span class="free">OOO</span><span class="used" title="Owner of road">X XXXX</span></td>
+      <td class="bits"><span class="free">OO</span><span class="used" title="Roadtype for road stop">XX XXXX</span></td>
+      <td class="bits"><span class="usable" title="Graphics index">OOOO O</span><span class="used" title="Graphics index: 00 (exit towards NE), 01 (exit towards SE), 02 (exit towards SW), 03 (exit towards NW), 04 (drive through X), 05 (drive through Y)">XXX</span></td>
+      <td class="bits" rowspan=5><span class="free">OO</span><span class="used" title="Station type">XX X</span><span class="free">OOO</span></td>
+      <td class="bits"><span class="free">OOO</span><span class="used" title="Owner of road">X XXXX</span></td>
       <td class="bits"><span class="free">OOOO</span> <span class="used" title="Tram type">XXXX XX</span> <span class="used" title="Custom road stops specifications ID">XXXXXX</span></td>
     </tr>
-    <tr>
-      <td class="caption">road waypoint</td>
-      <td class="bits"><span class="used" title="Owner of tram">XXXX</span> <span class="used" title="Pavement type">XX</span><span class="free">OO</span></td>
-      <td class="bits"><span class="used" title="Snow/desert present">X</span><span class="free">OOO</span> <span class="used" title="Tram type">XXXX XX</span> <span class="used" title="Custom road stops specifications ID">XXXXXX</span></td>
-    </tr>
     <tr>
       <td class="caption">airport</td>
       <td class="bits"><span class="used" title="Random bits">XXXX</span> <span class="free">OOOO</span></td>
@@ -240,37 +235,32 @@ the array so you can quickly see what is used and what is not.
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
-      <td rowspan=5>6</td>
-      <td class="caption">sea</td>
-      <td class="bits" rowspan=5><span class="used" title="Ship docking tile status">X</span> <span class="used" title="Water class">XX</span> <span class="used" title="Owner">XXXXX</span></td>
-      <td class="bits" rowspan=4><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits" rowspan=5><span class="free">OOOO OOO</span><span class="used" title="Non-flooding state">X</span></td>
+      <td rowspan=4>6</td>
+      <td class="caption">sea, shore</td>
+      <td class="bits" rowspan=4><span class="used" title="Ship docking tile status">X</span> <span class="used" title="Water class">XX</span> <span class="used" title="Owner">XXXXX</span></td>
+      <td class="bits" rowspan=3><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits" rowspan=4><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="used" title="Water tile type: coast, clear, lock, depot">0000</span> <span class="free">OOO0</span></td>
-      <td class="bits" rowspan=5><span class="free">OOOO OOOO</span></td>
-      <td class="bits" rowspan=5><span class="free">OOOO OOOO</span></td>
-      <td class="bits" rowspan=5><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits"><span class="used" title="Water tile type: coast, clear, lock, depot">O<span class="usable">OO</span>O</span> <span class="free">OOO</span><span class="used" title="Sea shore flag">X</span></td>
+      <td class="bits" rowspan=4><span class="free">OOOO OOOO</span></td>
+      <td class="bits" rowspan=4><span class="free">OOOO OOOO</td>
+      <td class="bits" rowspan=4><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">canal, river</td>
       <td class="bits"><span class="used" title="Canal/river random bits">XXXX XXXX</span></td>
-      <td class="bits"><span class="used" title="Water tile type: coast, clear, lock, depot">0000</span> <span class="free">OOOO</span></td>
-    </tr>
-    <tr>
-      <td class="caption">shore</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="used" title="Water tile type: coast, clear, lock, depot">0001</span> <span class="free">OOOO</span></td>
+      <td class="bits"><span class="used" title="Water tile type: coast, clear, lock, depot">O<span class="usable">OO</span>O</span> <span class="free">OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">lock</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="used" title="Water tile type: coast, clear, lock, depot">0010</span> <span class="used" title="Lock part">XX</span><span class="used" title="Lock orientation m5[1..0]">XX</span></td>
+      <td class="bits"><span class="used" title="Water tile type: coast, clear, lock, depot">O<span class="usable">OO</span>1</span> <span class="used" title="Lock part">XX</span> <span class="used" title="Lock orientation m5[1..0]">XX</span></td>
     </tr>
     <tr>
       <td class="caption">shipdepot</td>
       <td class="bits"><span class="pool" title="Depot index on pool">XXXX XXXX XXXX XXXX</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="used" title="Water tile type: coast, clear, lock, depot">0011</span> <span class="free">OO</span><span class="used" title="Depot axis">X</span><span class="used" title="Depot part">X</span></td>
+      <td class="bits"><span class="used" title="Water tile type: coast, clear, lock, depot">1<span class="usable">OOO</span></span> <span class="free">OO</span><span class="used" title="Depot axis">X</span> <span class="used" title="Depot part">X</span></td>
     </tr>
     <tr>
       <td rowspan=2>8</td>
@@ -280,7 +270,7 @@ the array so you can quickly see what is used and what is not.
       <td class="bits" rowspan=2><span class="used" title="Random bits">XXXX XXXX</span></td>
       <td class="bits" rowspan=2><span class="used" title="Animation loop">XXXX XXXX</span></td>
       <td class="bits" rowspan=2><span class="used" title="Industry graphics ID (m5 + m6[2])">XXXX XXXX</span></td>
-      <td class="bits" rowspan=2><span class="free">OO</span><span class="used" title="Random triggers (NewGRF)">XXX</span> <span class="used" title="Industry graphics ID (m5 + m6[2])">X</span><span class="used" title="Animated tile state">XX</span></td>
+      <td class="bits" rowspan=2><span class="free">OO</span><span class="used" title="Random triggers (NewGRF)">XXX</span> <span class="used" title="Industry graphics ID (m5 + m6[2])">X</span><span class="free">OO</span></td>
       <td class="bits" rowspan=2><span class="used" title="Animation frame">XXXX XXXX</span></td>
       <td class="bits" rowspan=2><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
@@ -313,7 +303,7 @@ the array so you can quickly see what is used and what is not.
       <td class="bits"><span class="used" title="Random bits">XXXX XXXX</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="pool" title="Object index on pool (m2 + m5)">XXXX XXXX</span></td>
-      <td class="bits"><span class="free">OOOO OO</span><span class="used" title="Animated tile state">XX</span></td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="used" title="Animation counter">XXXX XXXX</span></td>
       <td class="bits" rowspan=1><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>

docs/openttd.6

@@ -20,6 +20,7 @@
 .Op Fl M Ar musicset
 .Op Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar company
 .Op Fl p Ar password
+.Op Fl P Ar password
 .Op Fl q Ar savegame
 .Op Fl r Ar width Ns x Ns Ar height
 .Op Fl s Ar driver
@@ -99,6 +100,10 @@ play as.
 Password used to join server.
 Only useful with
 .Fl n .
+.It Fl P Ar password
+Password used to join company.
+Only useful with
+.Fl n .
 .It Fl q Ar savegame
 Write some information about the specified savegame and exit.
 .It Fl Q

docs/releasing_openttd.md

@@ -7,20 +7,18 @@ This guide is for OpenTTD developers/maintainers, to release a new version of Op
 * If this is a beta version release, skip this step.
 
 * If this is an RC1 (first Release Candidate) build, create a new branch `release/nn` where `nn` is the major version number, then apply changes similar to [PR#9573](https://github.com/OpenTTD/OpenTTD/pull/9573). You also need to forwardport the changelog, as in [PR#10113](https://github.com/OpenTTD/OpenTTD/pull/10113).
-  * Update the version in `CMakeLists.txt` in the master branch, heading for the next major release, e.g. from 14.0 to 15.0.
-  * Add a new (empty) AI compatibility script in `bin/ai/`
-  * Add the new version to CheckAPIVersion in `src/ai/ai_info.cpp` and `src/game/game_info.cpp`
-  * Add the new version to `src/script/api/ai_changelog.hpp` and `src/script/api/game_changelog.hpp`
-  * Update the version of regression in `bin/ai/regression/regression_info.nut`
-  * Add a note to `src/saveload/saveload.h` about which savegame version is used in the branch.
+  * Update CMakeLists.txt
+  * Add a new (empty) AI compatibility script in bin/ai/
+  * Add the new version to CheckAPIVersion in src/ai/ai_info.cpp + src/game/game_info.cpp
+  * Add the new version to src/script/api/ai_changelog.hpp + src/script/api/game_changelog.hpp
+  * Update the version of regression in bin/ai/regression/regression_info.nut
+  * Add a note to src/saveload/saveload.h about which savegame version is used in the branch.
 
 * If this is a later RC or release build and the release branch already exists, you'll need to backport fixes and language from master to this branch, which were merged after the branch diverged from master. You can use these two helper scripts: https://github.com/OpenTTD/scripts/tree/main/backport
 
-* If this is a maintenance release, update the version in `CMakeLists.txt` in the release branch, e.g. from 14.0 to 14.1.
-
 ## Step 1: Prepare changelog documentation
 
-1. Update the [changelog](../changelog.md) with new changes since the last release.
+1. Update the [changelog](../changelog.txt) with new changes since the last release.
    * Changelog entries are typically PR titles, but can be edited to be more helpful without context.
    * Don't include fixes to things which haven't previously been released (like fixes to features which are in the same changelog).
    * Order the entries by importance: `Feature > Add > Change > Fix`, then numerically by PR number.
@@ -31,26 +29,20 @@ This guide is for OpenTTD developers/maintainers, to release a new version of Op
 
 1. Go to https://github.com/OpenTTD/website/new/main/_posts and write a new announcement post. See a [previous example](https://github.com/OpenTTD/website/pull/238) for a template.
 2. Create a new branch for this post and open a PR for it.
-3. Write announcement text for the store pages and socials like TT-Forums / Discord / Twitter / Reddit / Fosstodon / etc., and include it in the PR.
+3. Write announcement text for socials like Forum/Discord/Twitter/Reddit and include it in the PR.
 4. Create a Steam news image for that post and include it in the PR.
-5. Check the website post ("View Deployment" link) and make corrections. We usually just use the GitHub web interface for this and squash the result later.
+5. Check the website post (preview link via checks page) and make corrections. We usually just use the GitHub web interface for this and squash the result later.
 6. Get this PR approved, but do not merge yet.
 
 ## Step 3: Make the actual OpenTTD release
 
-1. Confirm that the version in `CMakeLists.txt` matches the intended release version.
-2. Go to https://github.com/OpenTTD/OpenTTD/releases/new and create a new tag matching the release number. For the body of the release, copy in the changelog. "Set as a pre-release" for a beta or RC.
-3. Wait for the OpenTTD release workflow to be complete.
-4. If this is a full release:
-   * for `Steam`: under Steamworks -> SteamPipe -> Builds, set the "testing" branch live on the "default" branch. This will request 2FA validation.
-   * for `GOG`: under Builds, "Publish" the freshly uploaded builds to `Master`, `GOG-use only` and `Testing`.
-   * for `Microsoft Store`: ask orudge to publish the new release.
-
-Access to `Steam`, `GOG` and/or `Microsoft Store` requires a developer account on that platform.
-You will need access to the shared keystore in order to create such an account.
-For help and/or access to either or both, please contact TrueBrain.
+1. Go to https://github.com/OpenTTD/OpenTTD/releases/new and create a new tag matching the release number. For the body of the release, see any older release. "Set as a pre-release" for a beta or RC, set as latest for a real release.
+2. Merge website PR.
+3. Wait for the OpenTTD release checks to be complete.
+4. Check that website links to the new release are working and correct, using the [staging website](https://www-staging.openttd.org/).
+5. If this is a full release, ask orudge to update the Microsoft Store and TrueBrain to move the release from the "testing" to "default" branch on Steam.
 
 ## Step 4: Tell the world
 
-1. Merge the website PR. This will publish the release post.
-2. Make announcements on social media and store pages. You may need to coordinate with other developers who can make posts on TT-Forums, Twitter, Reddit, Fosstodon, Discord, Steam, GOG, Microsoft Store, etc.
+1. Tag and create a website release to trigger the actions that update the website.
+2. After the website is live, make announcements on social media. You may need to coordinate with other developers who can make posts on Twitter, Reddit, Steam, and GOG.

known-bugs.md

@@ -1,426 +0,0 @@
-# OpenTTD's known bugs
-
-## Table of contents
-
-- 1.0) About
-- 2.0) Known bugs
-
-## 1.0) About
-
-All bugs listed below are marked as known. Please do not submit any bugs
-that are the same as these. If you do, do not act surprised, because
-we WILL flame you!
-
-The current list of known bugs that we intend to fix can be found in our
-bug tracking system at https://github.com/OpenTTD/OpenTTD/issues
-Also check the closed bugs when searching for your bug in this system as we
-might have fixed the bug in the mean time.
-
-## 2.0) Known bugs
-
-This section lists all known bugs that we do not intend to fix and the
-reasons why we think that fixing them is infeasible. We might make some
-minor improvements that reduce the scope of these bugs, but we will not
-be able to completely fix them.
-
-### No suitable AI can be found:
-
-If you have no AIs and an AI is started the so-called 'dummy' AI will
-be loaded. This AI does nothing but writing a message on the AI debug
-window and showing a red warning. There are basically two solutions
-for this problem: Either you set the number of AI players to 0 so that
-no AI is started. You find that setting at the top of the window in the
-"AI / Game Scripts Settings" window.
-
-The other solution is acquiring (downloading) some AI. The easiest way
-to do this is via the "Check Online Content" button in the main (intro)
-menu or directly in the "AI / Game Scripts Settings" dialogue via the
-"Check Online Content" button.
-
-### After a while of playing, colours get corrupted:
-
-In Windows 7 the background slideshow corrupts the colour mapping
-of OpenTTD's 8bpp screen modes. Workarounds for this are:
-
-* Switching to windowed mode, instead of fullscreen
-* Switching off background slideshow
-* Setting up the `32bpp-anim` or `32bpp-optimized` blitter
-
-### Custom vehicle type name is incorrectly aligned:
-
-Some NewGRFs use sprites that are bigger than normal in the "buy
-vehicle" window. Due to this they have to encode an offset for
-the vehicle type name. Upon renaming the vehicle type this encoded
-offset is stripped from the name because the "edit box" cannot show
-this encoding. As a result the custom vehicle type names will get
-the default alignment. The only way to (partially) fix this is by
-adding spaces to the custom name.
-
-### Clipping problems [#119]:
-
-In some cases sprites are not drawn as one would expect. Examples of
-this are aircraft that might be hidden below the runway or trees that
-in some cases are rendered over vehicles.
-
-The primary cause of this problem is that OpenTTD does not have enough
-data (like a 3D model) to properly determine what needs to be drawn in
-front of what. OpenTTD has bounding boxes but in lots of cases they
-are either too big or too small and then cause problems with what
-needs to be drawn in front of what. Also some visual tricks are used.
-
-For example trains at 8 pixels high, the catenary needs to be drawn
-above that. When you want to draw bridges on top of that, which are
-only one height level (= 8 pixels) higher, you are getting into some
-big problems.
-
-We can not change the height levels; it would require us to either
-redraw all vehicle or all landscape graphics. Doing so would mean we
-leave the Transport Tycoon graphics, which in effect means OpenTTD
-will not be a Transport Tycoon clone anymore.
-
-### Mouse scrolling not possible at the edges of the screen [#383] [#3966]:
-
-Scrolling the viewport with the mouse cursor at the edges of the screen
-in the same direction of the edge will fail. If the cursor is near the
-edge the scrolling will be very slow.
-
-OpenTTD only receives cursor position updates when the cursor is inside
-OpenTTD's window. It is not told how far you have moved the cursor
-outside of OpenTTD's window.
-
-### Lost trains ignore (block) exit signals [#1473]:
-
-If trains are lost they ignore block exit signals, blocking junctions
-with presignals. This is caused because the path finders cannot tell
-where the train needs to go. As such a random direction is chosen at
-each junction. This causes the trains to occasionally to make choices
-that are unwanted from a player's point of view.
-
-This will not be fixed because lost trains are in almost all cases a
-network problem, e.g. a train can never reach a specific place. This
-makes the impact of fixing the bug enormously small against the amount
-of work needed to write a system that prevents the lost trains from
-taking the wrong direction.
-
-### Vehicle owner of last transfer leg gets paid for all [#2427]:
-
-When you make a transfer system that switches vehicle owners. This
-is only possible with 'industry stations', e.g. the oil rig station
-the owner of the vehicle that does the final delivery gets paid for
-the whole trip. It is not shared amongst the different vehicle
-owners that have participated in transporting the cargo.
-
-This sharing is not done because it would enormously increase the
-memory and CPU usage in big games for something that is happening
-in only one corner case. We think it is not worth the effort until
-sharing of stations is an official feature.
-
-### Forbid 90 degree turns does not work for crossing PBS paths [#2737]:
-
-When you run a train through itself on a X junction with PBS turned on
-the train will not obey the 'forbid 90 degree turns' setting. This is
-due to the fact that we can not be sure that the setting was turned
-off when the track was reserved, which means that we assume it was
-turned on and that the setting does not hold at the time. We made it
-this way to allow one to change the setting in-game, but it breaks
-slightly when you are running your train through itself. Running a
-train through means that your network is broken and is thus a user
-error which OpenTTD tries to graciously handle.
-
-Fixing this bug means that we need to record whether this particular
-setting was turned on or off at the time the reservation was made. This
-means adding quite a bit of data to the savegame for solving an issue
-that is basically an user error. We think it is not worth the effort.
-
-### Duplicate (station) names after renaming [#3204]:
-
-After renaming stations one can create duplicate station names. This
-is done giving a station the same custom name as another station with
-an automatically generated name.
-
-The major part of this problem is that station names are translatable.
-Meaning that a station is called e.g. '<TOWN> Central' in English and
-'<TOWN> Centraal' in Dutch. This means that in network games the
-renaming of a town could cause the rename to succeed on some clients
-and fail at others. This creates an inconsistent game state that will
-be seen as a 'desync'. Secondly the custom names are intended to fall
-completely outside of the '<TOWN> <name>' naming of stations, so when
-you rename a town all station names are updated accordingly.
-
-As a result the decision has been made that all custom names are only
-compared to the other custom names in the same class and not compared
-to the automatically generated names.
-
-### Extreme CPU usage/hangs when using SDL and PulseAudio [#3294], OpenTTD hangs/freezes when closing, OpenTTD is slow, OpenTTD uses a lot of CPU:
-
-OpenTTD can be extremely slow/use a lot of CPU when the sound is
-played via SDL and then through PulseAudio's ALSA wrapper. Under the
-same configuration OpenTTD, or rather SDL, might hang when exiting
-the game. This problem is seen most in Ubuntu 9.04 and higher.
-
-This is because recent versions of the PulseAudio sound server
-are configured to use timer-based audio scheduling rather than
-interrupt-based audio scheduling. Configuring PulseAudio to force
-use of interrupt-based scheduling may resolve sound problems for
-some users. Under recent versions of Ubuntu Linux (9.04 and higher)
-this can be accomplished by changing the following line in the
-`/etc/pulse/default.pa` file:
-        `load-module module-udev-detect`
-to
-        `load-module module-udev-detect tsched=0`
-
-Note that PulseAudio must be restarted for changes to take effect. Older
-versions of PulseAudio may use the module-hal-detect module instead.
-Adding tsched=0 to the end of that line will have a similar effect.
-
-Another possible solution is selecting the "pulse" backend of SDL
-by either using `SDL_AUDIODRIVER=pulse openttd` at the command
-prompt or installing the `libsdl1.2debian-pulseaudio` package from
-Ubuntu's Universe repository. For other distributions a similar
-package needs to be installed.
-
-### OpenTTD not properly resizing with SDL on X [#3305]:
-
-Under some X window managers OpenTTD's window does not properly
-resize. You will either end up with a black bar at the right/bottom
-side of the window or you cannot see the right/bottom of the window,
-e.g. you cannot see the status bar. The problem is that OpenTTD does
-not always receive a resize event from SDL making it impossible for
-OpenTTD to know that the window was resized; sometimes moving the
-window will solve the problem.
-
-Window managers that are known to exhibit this behaviour are GNOME's
-and KDE's. With the XFCE's and LXDE's window managers the resize
-event is sent when the user releases the mouse.
-
-### Incorrect colours, crashes upon exit, debug warnings and smears upon window resizing with SDL on macOS [#3447]:
-
-Video handling with (lib)SDL under macOS is known to fail on some
-versions of macOS with some hardware configurations. Some of
-the problems happen only under some circumstances whereas others
-are always present.
-
-We suggest that the SDL video/sound backend is not used for OpenTTD
-in combinations with macOS.
-
-### Train crashes entering same junction from block and path signals [#3928]:
-
-When a train has reserved a path from a path signal to a two way
-block signal and the reservation passes a path signal through the
-back another train can enter the reserved path (only) via that
-same two way block signal.
-
-The reason for this has to do with optimisation; to fix this issue
-the signal update has to pass all path signals until it finds either
-a train or a backwards facing signal. This is a very expensive task.
-
-The (signal) setups that allow these crashes can furthermore be
-considered incorrectly signalled; one extra safe waiting point for
-the train entering from path signal just after the backwards facing
-signal (from the path signal train) resolves the issue.
-
-### Crashes when run in a VM using Parallels Desktop [#4003]:
-
-When the Windows version of OpenTTD is executed in a VM under
-Parallels Desktop a privileged instruction exception may be thrown.
-
-As OpenTTD works natively on macOS as well as natively on Windows and
-these native builds both don't exhibit this behaviour this crash is
-most likely due to a bug in the virtual machine, something out of
-the scope of OpenTTD. Most likely this is due to Parallels Desktop
-lacking support for RDTSC calls. The problem can be avoided by using
-other VM-software, Wine, or running natively on macOS.
-
-### Entry- and exit signals are not dragged [#4378]:
-
-Unlike all other signal types, the entry- and exit signals are not
-dragged but instead normal signals are placed on subsequent track
-sections. This is done on purpose as this is the usually more
-convenient solution. There are little to no occasions where more
-than one entry or exit signal in a row are useful. This is different
-for all other signal types where several in a row can serve one
-purpose or another.
-
-### (Temporary) wrong colours when switching to full screen [#4511]:
-
-On Windows it can happen that you temporarily see wrong colours
-when switching to full screen OpenTTD, either by starting
-OpenTTD in full screen mode, changing to full screen mode or by
-ALT-TAB-ing into a full screen OpenTTD. This is caused by the
-fact that OpenTTD, by default, uses 8bpp paletted output. The
-wrong colours you are seeing is a temporary effect of the video
-driver switching to 8bpp palette mode.
-
-This issue can be worked around in two ways:
-* Setting fullscreen_bpp to 32
-* Setting up the 32bpp-anim or 32bpp-optimized blitter
-
-### Can't run OpenTTD with the -d option from a MSYS console [#4587]:
-
-The MSYS console does not allow OpenTTD to open an extra console for
-debugging output. Compiling OpenTTD with the --enable-console
-configure option prevents this issue and allows the -d option to use
-the MSYS console for its output.
-
-### Unreadable characters for non-latin locales [#4607]:
-
-OpenTTD does not ship a non-latin font in its graphics files. As a
-result OpenTTD needs to acquire the font from somewhere else. What
-OpenTTD does is ask the operating system, or a system library, for
-the best font for a given language if the currently loaded font
-does not provide all characters of the chosen translation. This
-means that OpenTTD has no influence over the quality of the chosen
-font; it just does the best it can do.
-
-If the text is unreadable there are several steps that you can take
-to improve this. The first step is finding a good font and configure
-this in the configuration file. See section 9.0 of README.md for
-more information. You can also increase the font size to make the
-characters bigger and possible better readable.
-
-If the problem is with the clarity of the font you might want to
-enable anti-aliasing by setting the small_aa/medium_aa/large_aa
-settings to "true". However, anti-aliasing only works when a 32-bit
-blitter has been selected, e.g. `blitter = "32bpp-anim"`, as with the
-8 bits blitter there are not enough colours to properly perform the
-anti-aliasing.
-
-### Train does not crash with itself [#4635]:
-
-When a train drives in a circle the front engine passes through
-wagons of the same train without crashing. This is intentional.
-Signals are only aware of tracks, they do not consider the train
-length and whether there would be enough room for a train in some
-circle it might drive on. Also the path a train might take is not
-necessarily known when passing a signal.
-
-Checking all circumstances would take a lot of additional
-computational power for signals, which is not considered worth
-the effort, as it does not add anything to gameplay.
-
-Nevertheless trains shall not crash in normal operation, so making
-a train not crash with itself is the best solution for everyone.
-
-### Aircraft coming through wall in rotated airports [#4705]:
-
-With rotated airports, specifically hangars, you will see that the
-aircraft will show a part through the back wall of the hangar.
-
-This can be solved by only drawing a part of the plane when being
-at the back of the hangar, however then with transparency turned on
-the aircraft would be shown partially which would be even weirder.
-
-As such the current behaviour is deemed the least bad.
-The same applies to overly long ships and their depots.
-
-### Vehicles not keeping their "maximum" speed [#4815]:
-
-Vehicles that have not enough power to reach and maintain their
-advertised maximum speed might be constantly jumping between two
-speeds. This is due to the fact that speed and its calculations
-are done with integral numbers instead of floating point numbers.
-
-As a result of this a vehicle will never reach its equilibrium
-between the drag/friction and propulsion. So in effect it will be
-in a vicious circle of speeding up and slowing down due to being
-just at the other side of the equilibrium.
-
-Not speeding up when near the equilibrium will cause the vehicle to
-never come in the neighbourhood of the equilibrium and not slowing
-down when near the equilibrium will cause the vehicle to never slow
-down towards the equilibrium once it has come down a hill.
-
-It is possible to calculate whether the equilibrium will be passed,
-but then all acceleration calculations need to be done twice.
-
-### Settings not saved when OpenTTD crashes [#4846]:
-
-The settings are not saved when OpenTTD crashes for several reasons.
-The most important is that the game state is broken and as such the
-settings might contain invalid values, or the settings have not even
-been loaded yet. This would cause invalid or totally wrong settings
-to be written to the configuration file.
-
-A solution to that would be saving the settings whenever one changes,
-however due to the way the configuration file is saved this requires
-a flush of the file to the disk and OpenTTD needs to wait till that
-is finished. On some file system implementations this causes the
-flush of all 'write-dirty' caches, which can be a significant amount
-of data to be written. This can further be aggravated by spinning
-down disks to conserve power, in which case this disk needs to be
-spun up first. This means that many seconds may pass before the
-configuration file is actually written, and all that time OpenTTD
-will not be able to show any progress. Changing the way the
-configuration file is saved is not an option as that leaves us more
-vulnerable to corrupt configuration files.
-
-Finally, crashes should not be happening. If they happen they should
-be reported and fixed, so essentially fixing this is fixing the wrong
-thing. If you really need the configuration changes to be saved,
-and you need to run a version that crashes regularly, then you can
-use the `saveconfig` command in the console to save the settings.
-
-### Not all NewGRFs, AIs, game scripts are found [#4887]:
-
-Under certain situations, where the path for the content within a
-tar file is the same as other content on the file system or in another
-tar file, it is possible that content is not found. A more thorough
-explanation and solutions are described in section 4.4 of README.md.
-
-### Mouse cursor going missing with SDL [#4997]:
-
-Under certain circumstances SDL does not notify OpenTTD of changes with
-respect to the mouse pointer, specifically whether the mouse pointer
-is within the bounds of OpenTTD or not. For example, if you "Alt-Tab"
-to another application the mouse cursor will still be shown in OpenTTD,
-and when you move the mouse outside of the OpenTTD window so the cursor
-gets hidden, open/move another application on top of the OpenTTD window
-and then Alt-tab back into OpenTTD the cursor will not be shown.
-
-We cannot fix this problem as SDL simply does not provide the required
-information in these corner cases. This is a bug in SDL and as such
-there is little that we can do about it.
-
-### Trains might not stop at platforms that are currently being changed [#5553]:
-
-If you add tiles to or remove tiles from a platform while a train is
-approaching to stop at the same platform, that train can miss the place
-where it's supposed to stop and pass the station without stopping.
-
-This is caused by the fact that the train is considered to already
-have stopped if it's beyond its assigned stopping location. We can't
-let the train stop just anywhere in the station because then it would
-never leave the station if you have the same station in the order
-list multiple times in a row or if there is only one station
-in theorder list (see #5684).
-
-### Some houses and industries are not affected by transparency [#5817]:
-
-Some of the default houses and industries (f.e. the iron ore mine) are
-not affected by the transparency options. This is because the graphics
-do not (completely) separate the ground from the building.
-
-This is a bug of the original graphics, and unfortunately cannot be
-fixed with OpenGFX for the sake of maintaining compatibility with
-the original graphics.
-
-### Involuntary cargo exchange with cargodist via neutral station [#6114]:
-
-When two players serve a neutral station at an industry, a cross-company
-chain for cargo flow can and will be established which can only be
-interrupted if one of the players stops competing for the resources of
-that industry. There is an easy fix for this: If you are loading at the
-shared station make the order "no unload" and if you're unloading make
-it "no load". Cargodist will then figure out that it should not create
-such a route.
-
-### Incorrect ending year displayed in end of game newspaper [#8625]
-
-The ending year of the game is configurable, but the date displayed in
-the newspaper at the end of the game is part of the graphics, not text.
-
-So to fix this would involve fixing the graphics in every baseset,
-including the original. Additionally, basesets are free to put this
-text in different positions (which they do), making a proper solution
-to this infinitely more complex for a part of the game that fewer than
-1% of players ever see.

known-bugs.txt

@@ -0,0 +1,389 @@
+OpenTTD's known bugs
+------------------------------------------------------------------------
+
+
+Table of contents
+-----------------
+1.0) About
+2.0) Known bugs
+
+
+1.0) About
+---- -----
+All bugs listed below are marked as known. Please do not submit any bugs
+that are the same as these. If you do, do not act surprised, because
+we WILL flame you!
+
+The current list of known bugs that we intend to fix can be found in our
+bug tracking system at https://github.com/OpenTTD/OpenTTD/issues
+Also check the closed bugs when searching for your bug in this system as we
+might have fixed the bug in the mean time.
+
+
+2.0) Known bugs
+---- ----------------------------------
+This section lists all known bugs that we do not intend to fix and the
+reasons why we think that fixing them is infeasible. We might make some
+minor improvements that reduce the scope of these bugs, but we will not
+be able to completely fix them.
+
+No suitable AI can be found:
+        If you have no AIs and an AI is started the so-called 'dummy' AI will
+        be loaded. This AI does nothing but writing a message on the AI debug
+        window and showing a red warning. There are basically two solutions
+        for this problem: Either you set the number of AI players to 0 so that
+        no AI is started. You find that setting at the top of the window in the
+        "AI / Game Scripts Settings" window.
+        The other solution is acquiring (downloading) some AI. The easiest way
+        to do this is via the "Check Online Content" button in the main (intro)
+        menu or directly in the "AI / Game Scripts Settings" dialogue via the
+        "Check Online Content" button.
+
+After a while of playing, colours get corrupted:
+        In Windows 7 the background slideshow corrupts the colour mapping
+        of OpenTTD's 8bpp screen modes. Workarounds for this are:
+                a) Switching to windowed mode, instead of fullscreen
+                b) Switching off background slideshow
+                c) Setting up the 32bpp-anim or 32bpp-optimized blitter
+
+Custom vehicle type name is incorrectly aligned:
+        Some NewGRFs use sprites that are bigger than normal in the "buy
+        vehicle" window. Due to this they have to encode an offset for
+        the vehicle type name. Upon renaming the vehicle type this encoded
+        offset is stripped from the name because the "edit box" cannot show
+        this encoding. As a result the custom vehicle type names will get
+        the default alignment. The only way to (partially) fix this is by
+        adding spaces to the custom name.
+
+Clipping problems [#119]:
+        In some cases sprites are not drawn as one would expect. Examples of
+        this are aircraft that might be hidden below the runway or trees that
+        in some cases are rendered over vehicles.
+        The primary cause of this problem is that OpenTTD does not have enough
+        data (like a 3D model) to properly determine what needs to be drawn in
+        front of what. OpenTTD has bounding boxes but in lots of cases they
+        are either too big or too small and then cause problems with what
+        needs to be drawn in front of what. Also some visual tricks are used.
+        For example trains at 8 pixels high, the catenary needs to be drawn
+        above that. When you want to draw bridges on top of that, which are
+        only one height level (= 8 pixels) higher, you are getting into some
+        big problems.
+        We can not change the height levels; it would require us to either
+        redraw all vehicle or all landscape graphics. Doing so would mean we
+        leave the Transport Tycoon graphics, which in effect means OpenTTD
+        will not be a Transport Tycoon clone anymore.
+
+Mouse scrolling not possible at the edges of the screen [#383] [#3966]:
+        Scrolling the viewport with the mouse cursor at the edges of the screen
+        in the same direction of the edge will fail. If the cursor is near the
+        edge the scrolling will be very slow.
+        OpenTTD only receives cursor position updates when the cursor is inside
+        OpenTTD's window. It is not told how far you have moved the cursor
+        outside of OpenTTD's window.
+
+Lost trains ignore (block) exit signals [#1473]:
+        If trains are lost they ignore block exit signals, blocking junctions
+        with presignals. This is caused because the path finders cannot tell
+        where the train needs to go. As such a random direction is chosen at
+        each junction. This causes the trains to occasionally to make choices
+        that are unwanted from a player's point of view.
+        This will not be fixed because lost trains are in almost all cases a
+        network problem, e.g. a train can never reach a specific place. This
+        makes the impact of fixing the bug enormously small against the amount
+        of work needed to write a system that prevents the lost trains from
+        taking the wrong direction.
+
+Vehicle owner of last transfer leg gets paid for all [#2427]:
+        When you make a transfer system that switches vehicle owners. This
+        is only possible with 'industry stations', e.g. the oil rig station
+        the owner of the vehicle that does the final delivery gets paid for
+        the whole trip. It is not shared amongst the different vehicle
+        owners that have participated in transporting the cargo.
+        This sharing is not done because it would enormously increase the
+        memory and CPU usage in big games for something that is happening
+        in only one corner case. We think it is not worth the effort until
+        sharing of stations is an official feature.
+
+Forbid 90 degree turns does not work for crossing PBS paths [#2737]:
+        When you run a train through itself on a X junction with PBS turned on
+        the train will not obey the 'forbid 90 degree turns' setting. This is
+        due to the fact that we can not be sure that the setting was turned
+        off when the track was reserved, which means that we assume it was
+        turned on and that the setting does not hold at the time. We made it
+        this way to allow one to change the setting in-game, but it breaks
+        slightly when you are running your train through itself. Running a
+        train through means that your network is broken and is thus a user
+        error which OpenTTD tries to graciously handle.
+        Fixing this bug means that we need to record whether this particular
+        setting was turned on or off at the time the reservation was made. This
+        means adding quite a bit of data to the savegame for solving an issue
+        that is basically an user error. We think it is not worth the effort.
+
+Duplicate (station) names after renaming [#3204]:
+        After renaming stations one can create duplicate station names. This
+        is done giving a station the same custom name as another station with
+        an automatically generated name.
+        The major part of this problem is that station names are translatable.
+        Meaning that a station is called e.g. '<TOWN> Central' in English and
+        '<TOWN> Centraal' in Dutch. This means that in network games the
+        renaming of a town could cause the rename to succeed on some clients
+        and fail at others. This creates an inconsistent game state that will
+        be seen as a 'desync'. Secondly the custom names are intended to fall
+        completely outside of the '<TOWN> <name>' naming of stations, so when
+        you rename a town all station names are updated accordingly.
+        As a result the decision has been made that all custom names are only
+        compared to the other custom names in the same class and not compared
+        to the automatically generated names.
+
+Extreme CPU usage/hangs when using SDL and PulseAudio [#3294],
+OpenTTD hangs/freezes when closing, OpenTTD is slow, OpenTTD uses a lot of CPU:
+        OpenTTD can be extremely slow/use a lot of CPU when the sound is
+        played via SDL and then through PulseAudio's ALSA wrapper. Under the
+        same configuration OpenTTD, or rather SDL, might hang when exiting
+        the game. This problem is seen most in Ubuntu 9.04 and higher.
+
+        This is because recent versions of the PulseAudio sound server
+        are configured to use timer-based audio scheduling rather than
+        interrupt-based audio scheduling. Configuring PulseAudio to force
+        use of interrupt-based scheduling may resolve sound problems for
+        some users. Under recent versions of Ubuntu Linux (9.04 and higher)
+        this can be accomplished by changing the following line in the
+        /etc/pulse/default.pa file:
+                load-module module-udev-detect
+        to
+                load-module module-udev-detect tsched=0
+        Note that PulseAudio must be restarted for changes to take effect. Older
+        versions of PulseAudio may use the module-hal-detect module instead.
+        Adding tsched=0 to the end of that line will have a similar effect.
+
+        Another possible solution is selecting the "pulse" backend of SDL
+        by either using "SDL_AUDIODRIVER=pulse openttd" at the command
+        prompt or installing the 'libsdl1.2debian-pulseaudio' package from
+        Ubuntu's Universe repository. For other distributions a similar
+        package needs to be installed.
+
+OpenTTD not properly resizing with SDL on X [#3305]:
+        Under some X window managers OpenTTD's window does not properly
+        resize. You will either end up with a black bar at the right/bottom
+        side of the window or you cannot see the right/bottom of the window,
+        e.g. you cannot see the status bar. The problem is that OpenTTD does
+        not always receive a resize event from SDL making it impossible for
+        OpenTTD to know that the window was resized; sometimes moving the
+        window will solve the problem.
+        Window managers that are known to exhibit this behaviour are GNOME's
+        and KDE's. With the XFCE's and LXDE's window managers the resize
+        event is sent when the user releases the mouse.
+
+Incorrect colours, crashes upon exit, debug warnings and smears upon
+window resizing with SDL on macOS [#3447]:
+        Video handling with (lib)SDL under macOS is known to fail on some
+        versions of macOS with some hardware configurations. Some of
+        the problems happen only under some circumstances whereas others
+        are always present.
+        We suggest that the SDL video/sound backend is not used for OpenTTD
+        in combinations with macOS.
+
+Train crashes entering same junction from block and path signals [#3928]:
+        When a train has reserved a path from a path signal to a two way
+        block signal and the reservation passes a path signal through the
+        back another train can enter the reserved path (only) via that
+        same two way block signal.
+        The reason for this has to do with optimisation; to fix this issue
+        the signal update has to pass all path signals until it finds either
+        a train or a backwards facing signal. This is a very expensive task.
+        The (signal) setups that allow these crashes can furthermore be
+        considered incorrectly signalled; one extra safe waiting point for
+        the train entering from path signal just after the backwards facing
+        signal (from the path signal train) resolves the issue.
+
+Crashes when run in a VM using Parallels Desktop [#4003]:
+        When the Windows version of OpenTTD is executed in a VM under
+        Parallels Desktop a privileged instruction exception may be thrown.
+        As OpenTTD works natively on macOS as well as natively on Windows and
+        these native builds both don't exhibit this behaviour this crash is
+        most likely due to a bug in the virtual machine, something out of
+        the scope of OpenTTD. Most likely this is due to Parallels Desktop
+        lacking support for RDTSC calls. The problem can be avoided by using
+        other VM-software, Wine, or running natively on macOS.
+
+Entry- and exit signals are not dragged [#4378]:
+        Unlike all other signal types, the entry- and exit signals are not
+        dragged but instead normal signals are placed on subsequent track
+        sections. This is done on purpose as this is the usually more
+        convenient solution. There are little to no occasions where more
+        than one entry or exit signal in a row are useful. This is different
+        for all other signal types where several in a row can serve one
+        purpose or another.
+
+Station build date is incorrect [#4415]:
+        The tile query tool will show the date of the last (re)construction
+        at the station and not the date of the first construction. This is
+        due to compatibility reasons with NewGRFs and the fact that it is
+        wrong to say that the station is built in a particular year when it
+        was completely destroyed/rebuilt later on.
+        The tile query tool can be fixed by changing the "Build date" text
+        to "Date at which the last (re)construction took place" but this is
+        deemed too specific and long for that window.
+
+(Temporary) wrong colours when switching to full screen [#4511]:
+        On Windows it can happen that you temporarily see wrong colours
+        when switching to full screen OpenTTD, either by starting
+        OpenTTD in full screen mode, changing to full screen mode or by
+        ALT-TAB-ing into a full screen OpenTTD. This is caused by the
+        fact that OpenTTD, by default, uses 8bpp paletted output. The
+        wrong colours you are seeing is a temporary effect of the video
+        driver switching to 8bpp palette mode.
+
+        This issue can be worked around in two ways:
+                a) Setting fullscreen_bpp to 32
+                b) Setting up the 32bpp-anim or 32bpp-optimized blitter
+
+Can't run OpenTTD with the -d option from a MSYS console [#4587]:
+        The MSYS console does not allow OpenTTD to open an extra console for
+        debugging output. Compiling OpenTTD with the --enable-console
+        configure option prevents this issue and allows the -d option to use
+        the MSYS console for its output.
+
+Unreadable characters for non-latin locales [#4607]:
+        OpenTTD does not ship a non-latin font in its graphics files. As a
+        result OpenTTD needs to acquire the font from somewhere else. What
+        OpenTTD does is ask the operating system, or a system library, for
+        the best font for a given language if the currently loaded font
+        does not provide all characters of the chosen translation. This
+        means that OpenTTD has no influence over the quality of the chosen
+        font; it just does the best it can do.
+
+        If the text is unreadable there are several steps that you can take
+        to improve this. The first step is finding a good font and configure
+        this in the configuration file. See section 9.0 of README.md for
+        more information. You can also increase the font size to make the
+        characters bigger and possible better readable.
+
+        If the problem is with the clarity of the font you might want to
+        enable anti-aliasing by setting the small_aa/medium_aa/large_aa
+        settings to "true". However, anti-aliasing only works when a 32-bit
+        blitter has been selected, e.g. blitter = "32bpp-anim", as with the
+        8 bits blitter there are not enough colours to properly perform the
+        anti-aliasing.
+
+Train does not crash with itself [#4635]:
+        When a train drives in a circle the front engine passes through
+        wagons of the same train without crashing. This is intentional.
+        Signals are only aware of tracks, they do not consider the train
+        length and whether there would be enough room for a train in some
+        circle it might drive on. Also the path a train might take is not
+        necessarily known when passing a signal.
+        Checking all circumstances would take a lot of additional
+        computational power for signals, which is not considered worth
+        the effort, as it does not add anything to gameplay.
+        Nevertheless trains shall not crash in normal operation, so making
+        a train not crash with itself is the best solution for everyone.
+
+Aircraft coming through wall in rotated airports [#4705]:
+        With rotated airports, specifically hangars, you will see that the
+        aircraft will show a part through the back wall of the hangar.
+        This can be solved by only drawing a part of the plane when being
+        at the back of the hangar, however then with transparency turned on
+        the aircraft would be shown partially which would be even weirder.
+        As such the current behaviour is deemed the least bad.
+        The same applies to overly long ships and their depots.
+
+Vehicles not keeping their "maximum" speed [#4815]:
+        Vehicles that have not enough power to reach and maintain their
+        advertised maximum speed might be constantly jumping between two
+        speeds. This is due to the fact that speed and its calculations
+        are done with integral numbers instead of floating point numbers.
+        As a result of this a vehicle will never reach its equilibrium
+        between the drag/friction and propulsion. So in effect it will be
+        in a vicious circle of speeding up and slowing down due to being
+        just at the other side of the equilibrium.
+
+        Not speeding up when near the equilibrium will cause the vehicle to
+        never come in the neighbourhood of the equilibrium and not slowing
+        down when near the equilibrium will cause the vehicle to never slow
+        down towards the equilibrium once it has come down a hill.
+
+        It is possible to calculate whether the equilibrium will be passed,
+        but then all acceleration calculations need to be done twice.
+
+Settings not saved when OpenTTD crashes [#4846]:
+        The settings are not saved when OpenTTD crashes for several reasons.
+        The most important is that the game state is broken and as such the
+        settings might contain invalid values, or the settings have not even
+        been loaded yet. This would cause invalid or totally wrong settings
+        to be written to the configuration file.
+
+        A solution to that would be saving the settings whenever one changes,
+        however due to the way the configuration file is saved this requires
+        a flush of the file to the disk and OpenTTD needs to wait till that
+        is finished. On some file system implementations this causes the
+        flush of all 'write-dirty' caches, which can be a significant amount
+        of data to be written. This can further be aggravated by spinning
+        down disks to conserve power, in which case this disk needs to be
+        spun up first. This means that many seconds may pass before the
+        configuration file is actually written, and all that time OpenTTD
+        will not be able to show any progress. Changing the way the
+        configuration file is saved is not an option as that leaves us more
+        vulnerable to corrupt configuration files.
+
+        Finally, crashes should not be happening. If they happen they should
+        be reported and fixed, so essentially fixing this is fixing the wrong
+        thing. If you really need the configuration changes to be saved,
+        and you need to run a version that crashes regularly, then you can
+        use the 'saveconfig' command in the console to save the settings.
+
+Not all NewGRFs, AIs, game scripts are found [#4887]:
+        Under certain situations, where the path for the content within a
+        tar file is the same as other content on the file system or in another
+        tar file, it is possible that content is not found. A more thorough
+        explanation and solutions are described in section 4.4 of README.md.
+
+Mouse cursor going missing with SDL [#4997]:
+        Under certain circumstances SDL does not notify OpenTTD of changes with
+        respect to the mouse pointer, specifically whether the mouse pointer
+        is within the bounds of OpenTTD or not. For example, if you "Alt-Tab"
+        to another application the mouse cursor will still be shown in OpenTTD,
+        and when you move the mouse outside of the OpenTTD window so the cursor
+        gets hidden, open/move another application on top of the OpenTTD window
+        and then Alt-tab back into OpenTTD the cursor will not be shown.
+
+        We cannot fix this problem as SDL simply does not provide the required
+        information in these corner cases. This is a bug in SDL and as such
+        there is little that we can do about it.
+
+Trains might not stop at platforms that are currently being changed [#5553]:
+        If you add tiles to or remove tiles from a platform while a train is
+        approaching to stop at the same platform, that train can miss the place
+        where it's supposed to stop and pass the station without stopping.
+        This is caused by the fact that the train is considered to already
+        have stopped if it's beyond its assigned stopping location. We can't
+        let the train stop just anywhere in the station because then it would
+        never leave the station if you have the same station in the order
+        list multiple times in a row or if there is only one station
+        in theorder list (see #5684).
+
+Some houses and industries are not affected by transparency [#5817]:
+        Some of the default houses and industries (f.e. the iron ore mine) are
+        not affected by the transparency options. This is because the graphics
+        do not (completely) separate the ground from the building.
+        This is a bug of the original graphics, and unfortunately cannot be
+        fixed with OpenGFX for the sake of maintaining compatibility with
+        the original graphics.
+
+Involuntary cargo exchange with cargodist via neutral station [#6114]:
+        When two players serve a neutral station at an industry, a cross-company
+        chain for cargo flow can and will be established which can only be
+        interrupted if one of the players stops competing for the resources of
+        that industry. There is an easy fix for this: If you are loading at the
+        shared station make the order "no unload" and if you're unloading make
+        it "no load". Cargodist will then figure out that it should not create
+        such a route.
+
+Incorrect ending year displayed in end of game newspaper [#8625]
+        The ending year of the game is configurable, but the date displayed in
+        the newspaper at the end of the game is part of the graphics, not text.
+        So to fix this would involve fixing the graphics in every baseset,
+        including the original. Additionally, basesets are free to put this
+        text in different positions (which they do), making a proper solution
+        to this infinitely more complex for a part of the game that fewer than
+        1% of players ever see.

media/baseset/openttd.grf.hash

@@ -1 +1 @@
-8bc3926cb50e19747de498357417d973
+4f03553f614a06d86dc06376db3353c7

media/baseset/openttd/CMakeLists.txt

@@ -20,7 +20,6 @@ if(GRFCODEC_FOUND)
                          ${CMAKE_CURRENT_SOURCE_DIR}/openttdgui.nfo
                          ${CMAKE_CURRENT_SOURCE_DIR}/palette.nfo
                          ${CMAKE_CURRENT_SOURCE_DIR}/roadstops.nfo
-                         ${CMAKE_CURRENT_SOURCE_DIR}/road_waypoints.nfo
                          ${CMAKE_CURRENT_SOURCE_DIR}/signals.nfo
                          ${CMAKE_CURRENT_SOURCE_DIR}/sloped_tracks.nfo
                          ${CMAKE_CURRENT_SOURCE_DIR}/tramtracks.nfo
@@ -43,7 +42,6 @@ if(GRFCODEC_FOUND)
                          ${CMAKE_CURRENT_SOURCE_DIR}/openttdgui_convert_tram.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/openttdgui_group_livery.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/roadstops.png
-                         ${CMAKE_CURRENT_SOURCE_DIR}/road_waypoints.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/signals.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/sloped_tracks.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/tramtracks.png

media/baseset/openttd/openttd.nfo

@@ -98,4 +98,3 @@
 #include "mono.nfo"
 #include "tunnel_portals.nfo"
 #include "palette.nfo"
-#include "road_waypoints.nfo"

media/baseset/openttd/road_waypoints.nfo

@@ -1,14 +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 "Road waypoints"
-//@@LINT OFF
-   -1 * 3 05 19 04
-//@@LINT ON
-   -1 sprites/road_waypoints.png       8bpp   10   10   64   40   -5  -22 normal
-   -1 sprites/road_waypoints.png       8bpp   90   10   64   40  -31   -9 normal
-   -1 sprites/road_waypoints.png       8bpp  170   10   64   35  -31   -4 normal
-   -1 sprites/road_waypoints.png       8bpp  240   10   64   35  -57  -17 normal

os/emscripten/Dockerfile

@@ -1,3 +1,4 @@
-FROM emscripten/emsdk:3.1.57
+FROM emscripten/emsdk:3.1.42
 
-COPY ports/liblzma.py /emsdk/upstream/emscripten/tools/ports/contrib/liblzma.py
+COPY emsdk-liblzma.patch /
+RUN cd /emsdk/upstream/emscripten && patch -p1 < /emsdk-liblzma.patch

os/emscripten/README.md

@@ -2,8 +2,8 @@
 
 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.
-- Add LibLZMA library under contrib ports.
+- Use a version of emscripten we know works
+- Patch in LibLZMA support (as this is not supported by upstream)
 
 First, build the docker image by navigating in the folder this `README.md` is in, and executing:
 ```

os/emscripten/cmake/FindLibLZMA.cmake

@@ -1,7 +1,7 @@
 # LibLZMA is a custom addition to the emscripten SDK, so it is possible
 # someone patched their SDK. Test out if the SDK supports LibLZMA.
 include(CheckCXXSourceCompiles)
-set(CMAKE_REQUIRED_FLAGS "--use-port=contrib.liblzma")
+set(CMAKE_REQUIRED_FLAGS "-sUSE_LIBLZMA=1")
 
 check_cxx_source_compiles("
     #include <lzma.h>
@@ -12,9 +12,9 @@ check_cxx_source_compiles("
 if (LIBLZMA_FOUND)
         add_library(LibLZMA::LibLZMA INTERFACE IMPORTED)
         set_target_properties(LibLZMA::LibLZMA PROPERTIES
-                INTERFACE_COMPILE_OPTIONS "--use-port=contrib.liblzma"
-                INTERFACE_LINK_LIBRARIES "--use-port=contrib.liblzma"
+                INTERFACE_COMPILE_OPTIONS "-sUSE_LIBLZMA=1"
+                INTERFACE_LINK_LIBRARIES "-sUSE_LIBLZMA=1"
         )
 else()
-        message(WARNING "You are using an emscripten SDK without LibLZMA support. Many savegames won't be able to load in OpenTTD. Please copy liblzma.py to your ports/contrib folder in your local emsdk installation.")
+        message(WARNING "You are using an emscripten SDK without LibLZMA support. Many savegames won't be able to load in OpenTTD. Please apply 'emsdk-liblzma.patch' to your local emsdk installation.")
 endif()

os/emscripten/emsdk-liblzma.patch

@@ -0,0 +1,198 @@
+From 84d0e9112d5c87a714abd21ec8547921f46f37b5 Mon Sep 17 00:00:00 2001
+From: milek7 <me@milek7.pl>
+Date: Tue, 8 Dec 2020 01:03:31 +0100
+Subject: [PATCH] Add liblzma port
+
+---
+ src/settings.js        |   4 ++
+ tools/ports/liblzma.py | 151 +++++++++++++++++++++++++++++++++++++++++
+ tools/settings.py      |   1 +
+ 3 files changed, 156 insertions(+)
+ create mode 100644 tools/ports/liblzma.py
+
+diff --git a/src/settings.js b/src/settings.js
+index f93140d..7b6bec9 100644
+--- a/src/settings.js
++++ b/src/settings.js
+@@ -1451,6 +1451,10 @@ var USE_GIFLIB = false;
+ // [compile+link]
+ var USE_LIBJPEG = false;
+
++// 1 = use liblzma from emscripten-ports
++// [compile+link]
++var USE_LIBLZMA = false;
++
+ // 1 = use libpng from emscripten-ports
+ // [compile+link]
+ var USE_LIBPNG = false;
+diff --git a/tools/ports/liblzma.py b/tools/ports/liblzma.py
+new file mode 100644
+index 0000000..6872a8b
+--- /dev/null
++++ b/tools/ports/liblzma.py
+@@ -0,0 +1,151 @@
++# 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
++# found in the LICENSE file.
++
++import os
++import shutil
++import logging
++from pathlib import Path
++
++VERSION = '5.4.2'
++HASH = '149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737'
++
++
++def needed(settings):
++  return settings.USE_LIBLZMA
++
++
++def get(ports, settings, shared):
++  ports.fetch_project('liblzma', f'https://tukaani.org/xz/xz-{VERSION}.tar.gz', 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')
++
++    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',
++                     '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 = [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)
++
++  return [shared.cache.get_lib('liblzma.a', create, what='port')]
++
++
++def clear(ports, settings, shared):
++  shared.cache.erase_lib('liblzma.a')
++
++
++def process_args(ports):
++  return []
++
++
++def show():
++  return 'liblzma (USE_LIBLZMA=1; public domain)'
++
++
++config_h = '''
++#define ASSUME_RAM 128
++#define ENABLE_NLS 1
++#define HAVE_CHECK_CRC32 1
++#define HAVE_CHECK_CRC64 1
++#define HAVE_CHECK_SHA256 1
++#define HAVE_CLOCK_GETTIME 1
++#define HAVE_DCGETTEXT 1
++#define HAVE_DECL_CLOCK_MONOTONIC 1
++#define HAVE_DECL_PROGRAM_INVOCATION_NAME 1
++#define HAVE_DECODERS 1
++#define HAVE_DECODER_ARM 1
++#define HAVE_DECODER_ARMTHUMB 1
++#define HAVE_DECODER_DELTA 1
++#define HAVE_DECODER_IA64 1
++#define HAVE_DECODER_LZMA1 1
++#define HAVE_DECODER_LZMA2 1
++#define HAVE_DECODER_POWERPC 1
++#define HAVE_DECODER_SPARC 1
++#define HAVE_DECODER_X86 1
++#define HAVE_DLFCN_H 1
++#define HAVE_ENCODERS 1
++#define HAVE_ENCODER_ARM 1
++#define HAVE_ENCODER_ARMTHUMB 1
++#define HAVE_ENCODER_DELTA 1
++#define HAVE_ENCODER_IA64 1
++#define HAVE_ENCODER_LZMA1 1
++#define HAVE_ENCODER_LZMA2 1
++#define HAVE_ENCODER_POWERPC 1
++#define HAVE_ENCODER_SPARC 1
++#define HAVE_ENCODER_X86 1
++#define HAVE_FCNTL_H 1
++#define HAVE_FUTIMENS 1
++#define HAVE_GETOPT_H 1
++#define HAVE_GETOPT_LONG 1
++#define HAVE_GETTEXT 1
++#define HAVE_IMMINTRIN_H 1
++#define HAVE_INTTYPES_H 1
++#define HAVE_LIMITS_H 1
++#define HAVE_MBRTOWC 1
++#define HAVE_MEMORY_H 1
++#define HAVE_MF_BT2 1
++#define HAVE_MF_BT3 1
++#define HAVE_MF_BT4 1
++#define HAVE_MF_HC3 1
++#define HAVE_MF_HC4 1
++#define HAVE_OPTRESET 1
++#define HAVE_POSIX_FADVISE 1
++#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1
++#define HAVE_PTHREAD_PRIO_INHERIT 1
++#define HAVE_STDBOOL_H 1
++#define HAVE_STDINT_H 1
++#define HAVE_STDLIB_H 1
++#define HAVE_STRINGS_H 1
++#define HAVE_STRING_H 1
++#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
++#define HAVE_SYS_PARAM_H 1
++#define HAVE_SYS_STAT_H 1
++#define HAVE_SYS_TIME_H 1
++#define HAVE_SYS_TYPES_H 1
++#define HAVE_UINTPTR_T 1
++#define HAVE_UNISTD_H 1
++#define HAVE_VISIBILITY 1
++#define HAVE_WCWIDTH 1
++#define HAVE__BOOL 1
++#define HAVE___BUILTIN_ASSUME_ALIGNED 1
++#define HAVE___BUILTIN_BSWAPXX 1
++#define MYTHREAD_POSIX 1
++#define NDEBUG 1
++#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_TARNAME "xz"
++#define PACKAGE_VERSION "5.4.0"
++#define SIZEOF_SIZE_T 4
++#define STDC_HEADERS 1
++#define TUKLIB_CPUCORES_SYSCONF 1
++#define TUKLIB_FAST_UNALIGNED_ACCESS 1
++#define TUKLIB_PHYSMEM_SYSCONF 1
++#ifndef _ALL_SOURCE
++# define _ALL_SOURCE 1
++#endif
++#ifndef _GNU_SOURCE
++# define _GNU_SOURCE 1
++#endif
++#ifndef _POSIX_PTHREAD_SEMANTICS
++# define _POSIX_PTHREAD_SEMANTICS 1
++#endif
++#ifndef _TANDEM_SOURCE
++# define _TANDEM_SOURCE 1
++#endif
++#ifndef __EXTENSIONS__
++# define __EXTENSIONS__ 1
++#endif
++#define VERSION "5.4.0"
++'''
+diff --git a/tools/settings.py b/tools/settings.py
+index 10d6ca0..827e4a9 100644
+--- a/tools/settings.py
++++ b/tools/settings.py
+@@ -40,6 +40,7 @@ PORTS_SETTINGS = {
+     'USE_SDL_NET',
+     'USE_SDL_GFX',
+     'USE_LIBJPEG',
++    'USE_LIBLZMA',
+     'USE_OGG',
+     'USE_REGAL',
+     'USE_BOOST_HEADERS',
+--
+2.34.1

os/emscripten/ports/liblzma.py

@@ -1,139 +0,0 @@
-import os
-import logging
-
-VERSION = '5.4.6'
-HASH = '495cc890d25c075c927c907b77e60d86dd8a4c377cea5b1172c8e916984149a7bb5fb32db25091f7219346b83155b47e4bc0404cc8529d992014cd7ed0c278b7'
-
-URL = 'https://github.com/tukaani-project/xz'
-DESCRIPTION = 'liblzma provides a general-purpose data-compression library.'
-LICENSE = 'LGPL-2.1'
-
-def get(ports, settings, shared):
-  ports.fetch_project('contrib.liblzma', f'https://github.com/tukaani-project/xz/releases/download/v{VERSION}/xz-{VERSION}.tar.xz', sha512hash=HASH)
-
-  def create(final):
-    logging.info('building port: contrib.liblzma')
-
-    ports.clear_project_build('contrib.liblzma')
-
-    source_path = os.path.join(ports.get_dir(), 'contrib.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')
-
-    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',
-                     '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 = [os.path.join(source_path, p) for p in include_dirs_rel]
-    ports.build_port(source_path, final, 'contrib.liblzma', flags=build_flags, exclude_files=exclude_files, includes=include_dirs)
-
-  return [shared.cache.get_lib('liblzma.a', create, what='port')]
-
-
-def clear(ports, settings, shared):
-  shared.cache.erase_lib('liblzma.a')
-
-
-def process_args(ports):
-  return []
-
-
-config_h = '''
-#define ASSUME_RAM 128
-#define ENABLE_NLS 1
-#define HAVE_CHECK_CRC32 1
-#define HAVE_CHECK_CRC64 1
-#define HAVE_CHECK_SHA256 1
-#define HAVE_CLOCK_GETTIME 1
-#define HAVE_DCGETTEXT 1
-#define HAVE_DECL_CLOCK_MONOTONIC 1
-#define HAVE_DECL_PROGRAM_INVOCATION_NAME 1
-#define HAVE_DECODERS 1
-#define HAVE_DECODER_ARM 1
-#define HAVE_DECODER_ARMTHUMB 1
-#define HAVE_DECODER_DELTA 1
-#define HAVE_DECODER_IA64 1
-#define HAVE_DECODER_LZMA1 1
-#define HAVE_DECODER_LZMA2 1
-#define HAVE_DECODER_POWERPC 1
-#define HAVE_DECODER_SPARC 1
-#define HAVE_DECODER_X86 1
-#define HAVE_DLFCN_H 1
-#define HAVE_ENCODERS 1
-#define HAVE_ENCODER_ARM 1
-#define HAVE_ENCODER_ARMTHUMB 1
-#define HAVE_ENCODER_DELTA 1
-#define HAVE_ENCODER_IA64 1
-#define HAVE_ENCODER_LZMA1 1
-#define HAVE_ENCODER_LZMA2 1
-#define HAVE_ENCODER_POWERPC 1
-#define HAVE_ENCODER_SPARC 1
-#define HAVE_ENCODER_X86 1
-#define HAVE_FCNTL_H 1
-#define HAVE_FUTIMENS 1
-#define HAVE_GETOPT_H 1
-#define HAVE_GETOPT_LONG 1
-#define HAVE_GETTEXT 1
-#define HAVE_IMMINTRIN_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_LIMITS_H 1
-#define HAVE_MBRTOWC 1
-#define HAVE_MEMORY_H 1
-#define HAVE_MF_BT2 1
-#define HAVE_MF_BT3 1
-#define HAVE_MF_BT4 1
-#define HAVE_MF_HC3 1
-#define HAVE_MF_HC4 1
-#define HAVE_OPTRESET 1
-#define HAVE_POSIX_FADVISE 1
-#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1
-#define HAVE_PTHREAD_PRIO_INHERIT 1
-#define HAVE_STDBOOL_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
-#define HAVE_SYS_PARAM_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TIME_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_UINTPTR_T 1
-#define HAVE_UNISTD_H 1
-#define HAVE_VISIBILITY 1
-#define HAVE_WCWIDTH 1
-#define HAVE__BOOL 1
-#define HAVE___BUILTIN_ASSUME_ALIGNED 1
-#define HAVE___BUILTIN_BSWAPXX 1
-#define MYTHREAD_POSIX 1
-#define NDEBUG 1
-#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_TARNAME "xz"
-#define PACKAGE_VERSION "5.4.0"
-#define SIZEOF_SIZE_T 4
-#define STDC_HEADERS 1
-#define TUKLIB_CPUCORES_SYSCONF 1
-#define TUKLIB_FAST_UNALIGNED_ACCESS 1
-#define TUKLIB_PHYSMEM_SYSCONF 1
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-#define VERSION "5.4.0"
-'''

os/macosx/Info.plist.in

@@ -33,7 +33,5 @@
         <string>True</string>
         <key>LSMinimumSystemVersion</key>
         <string>10.13.0</string>
-        <key>LSApplicationCategoryType</key>
-        <string>public.app-category.simulation-games</string>
 </dict>
 </plist>

os/macosx/openttd.entitlements

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<!-- As requested in https://partner.steamgames.com/doc/store/application/platforms, allows arbitrary plugin loads on hardened runtime -->
-	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
-	<true/>
-	<key>com.apple.security.cs.disable-library-validation</key>
-	<true/>
-</dict>
-</plist>

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 "15"; }
+	function GetAPIVersion()  { return "14"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 	function UseAsRandomAI()  { return false; }

regression/regression/result.txt

@@ -6093,7 +6093,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
   GetNumEngines():          1
   GetNumEngines():          1
   GetNumEngines():          0
-  GetName():                Group 1
+  GetName():                Group 0
   GetName():                (null : 0x00000000)
   AIVehicle.SellVehicle():  true
   AITile.DemolishTile():    true
@@ -7510,7 +7510,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
     BuildRailDepot():              false
     BuildRailDepot():              true
     BuildRailDepot():              true
-    BuildRailDepot():              true
+    BuildRailDepot():              false
     GetRailDepotFrontTile():       33412
     IsBuildable():                 false
     DepotList
@@ -7604,12 +7604,12 @@ ERROR: IsEnd() is invalid as Begin() is never called
     BuildRoadDepot():              false
     BuildRoadDepot():              true
     BuildRoadDepot():              true
-    BuildRoadDepot():              true
+    BuildRoadDepot():              false
     HasRoadType(Road):             true
     HasRoadType(Tram):             false
-    GetLastError():                0
-    GetLastErrorString():          ERR_NONE
-    GetErrorCategory():            0
+    GetLastError():                259
+    GetLastErrorString():          ERR_ALREADY_BUILT
+    GetErrorCategory():            1
     IsRoadTile():                  false
     GetRoadDepotFrontTile():       33412
     IsRoadDepotTile():             true
@@ -9471,7 +9471,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
   IsStoppedInDepot():   false
   --Accounting--
     GetCosts():         -5947
-    Should be:          -5947
+    Should be:          -5946
   GetName():            Road Vehicle #1
   SetName():            true
   GetName():            MyVehicleName
@@ -9485,7 +9485,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetAgeLeft():        5489
     GetCurrentSpeed():   7
     GetRunningCost():    421
-    GetProfitThisYear(): 0
+    GetProfitThisYear(): -1
     GetProfitLastYear(): 0
     GetCurrentValue():   5947
     GetVehicleType():    1
@@ -9604,7 +9604,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
     16 => 0
     14 => 0
     13 => 0
-    12 => 0
+    12 => -1
   ProfitLastYear ListDump:
     17 => 0
     16 => 0

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 "15"; }
+	function GetAPIVersion()  { return "14"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "StationList"; }
 	function UseAsRandomAI()  { return false; }

src/3rdparty/icu/CMakeLists.txt

@@ -1,5 +1,3 @@
-add_subdirectory(tests)
-
 add_files(
     scriptrun.cpp
     scriptrun.h

src/3rdparty/icu/scriptrun.cpp

@@ -184,6 +184,13 @@ UBool ScriptRun::next()
                     parenStack[++startSP].scriptCode = scriptCode;
                 }
             }
+
+            // if this character is a close paired character,
+            // pop it from the stack
+            if (pairIndex >= 0 && (pairIndex & 1) != 0 && parenSP >= 0) {
+                parenSP -= 1;
+                startSP -= 1;
+            }
         } else {
             // if the run broke on a surrogate pair,
             // end it before the high surrogate

src/3rdparty/icu/tests/CMakeLists.txt

@@ -1,4 +0,0 @@
-add_test_files(
-    test_srtest.cpp
-    CONDITION ICU_i18n_FOUND
-)

src/3rdparty/icu/tests/test_srtest.cpp

@@ -1,66 +0,0 @@
-// © 2016 and later: Unicode, Inc. and others.
-// License & terms of use: http://www.unicode.org/copyright.html
-/*
- * %W% %E%
- *
- * (C) Copyright IBM Corp. 2001-2016 - All Rights Reserved
- *
- */
-/** @file test_srtest.cpp Test icu::ScriptRun result. */
-
-#include "../../../stdafx.h"
-
-#include "../../../3rdparty/catch2/catch.hpp"
-#include "../../../3rdparty/fmt/core.h"
-
-#include "../scriptrun.h"
-
-#include <span>
-#include <unicode/uscript.h>
-
-static void TestScriptRun(std::span<const char16_t> testChars, std::span<const std::string_view> testResults)
-{
-	icu::ScriptRun scriptRun(testChars.data(), 0, std::size(testChars));
-	size_t i = 0;
-
-	while (scriptRun.next()) {
-		int32_t start = scriptRun.getScriptStart();
-		int32_t end = scriptRun.getScriptEnd();
-		UScriptCode code = scriptRun.getScriptCode();
-
-		REQUIRE(i < std::size(testResults));
-		CHECK(fmt::format("Script '{}' from {} to {}.", uscript_getName(code), start, end) == testResults[i]);
-
-		++i;
-	}
-
-	REQUIRE(i == std::size(testResults));
-}
-
-TEST_CASE("ICU ScriptRun")
-{
-	/** Example string sequence as in srtest.cpp. */
-	static const char16_t testChars[] = {
-		0x0020, 0x0946, 0x0939, 0x093F, 0x0928, 0x094D, 0x0926, 0x0940, 0x0020,
-		0x0627, 0x0644, 0x0639, 0x0631, 0x0628, 0x064A, 0x0629, 0x0020,
-		0x0420, 0x0443, 0x0441, 0x0441, 0x043A, 0x0438, 0x0439, 0x0020,
-		'E', 'n', 'g', 'l', 'i', 's', 'h',  0x0020,
-		0x6F22, 0x5B75, 0x3068, 0x3072, 0x3089, 0x304C, 0x306A, 0x3068,
-		0x30AB, 0x30BF, 0x30AB, 0x30CA,
-		0xD801, 0xDC00, 0xD801, 0xDC01, 0xD801, 0xDC02, 0xD801, 0xDC03
-	};
-
-	/** Expected results from script run. */
-	static const std::string_view testResults[] = {
-		"Script 'Devanagari' from 0 to 9.",
-		"Script 'Arabic' from 9 to 17.",
-		"Script 'Cyrillic' from 17 to 25.",
-		"Script 'Latin' from 25 to 33.",
-		"Script 'Han' from 33 to 35.",
-		"Script 'Hiragana' from 35 to 41.",
-		"Script 'Katakana' from 41 to 45.",
-		"Script 'Deseret' from 45 to 53.",
-	};
-
-	TestScriptRun(testChars, testResults);
-}

src/3rdparty/md5/md5.h

@@ -57,8 +57,8 @@
 static const size_t MD5_HASH_BYTES = 16;
 
 /** Container for storing a MD5 hash/checksum/digest. */
-struct MD5Hash : std::array<uint8_t, MD5_HASH_BYTES> {
-	MD5Hash() : std::array<uint8_t, MD5_HASH_BYTES>{} {}
+struct MD5Hash : std::array<byte, MD5_HASH_BYTES> {
+	MD5Hash() : std::array<byte, MD5_HASH_BYTES>{} {}
 
 	/**
 	 * Exclusively-or the given hash into this hash.

src/3rdparty/squirrel/squirrel/sqcompiler.cpp

@@ -650,7 +650,8 @@ public:
 							_fs->AddInstruction(_OP_LOADINT, _exst._deref,_integer(constval));
 						}
 						else if(ctype == OT_FLOAT && sizeof(SQFloat) == sizeof(SQInt32)) {
-							_fs->AddInstruction(_OP_LOADFLOAT, _exst._deref, std::bit_cast<SQInt32>(_float(constval)));
+							SQFloat f = _float(constval);
+							_fs->AddInstruction(_OP_LOADFLOAT, _exst._deref,*((SQInt32 *)&f));
 						}
 						else {
 							_fs->AddInstruction(_OP_LOAD, _exst._deref, _fs->GetConstant(constval));
@@ -696,7 +697,7 @@ public:
 			break;
 		case TK_FLOAT:
 			if(sizeof(SQFloat) == sizeof(SQInt32)) {
-				_fs->AddInstruction(_OP_LOADFLOAT, _fs->PushTarget(), std::bit_cast<SQInt32>(_lex._fvalue));
+				_fs->AddInstruction(_OP_LOADFLOAT, _fs->PushTarget(),*((SQInt32 *)&_lex._fvalue));
 			}
 			else {
 				_fs->AddInstruction(_OP_LOAD, _fs->PushTarget(), _fs->GetNumericConstant(_lex._fvalue));

src/3rdparty/squirrel/squirrel/sqfuncstate.cpp

@@ -199,7 +199,7 @@ void SQFuncState::Dump(SQFunctionProto *func)
 			}
 		}
 		else if(inst.op==_OP_LOADFLOAT) {
-			printf("[%03d] %15s %d %f %d %d\n",n,g_InstrDesc[inst.op].name,inst._arg0,std::bit_cast<SQFloat>(inst._arg1),inst._arg2,inst._arg3);
+			printf("[%03d] %15s %d %f %d %d\n",n,g_InstrDesc[inst.op].name,inst._arg0,*((SQFloat*)&inst._arg1),inst._arg2,inst._arg3);
 		}
 		else if(inst.op==_OP_ARITH){
 			printf("[%03d] %15s %d %d %d %c\n",n,g_InstrDesc[inst.op].name,inst._arg0,inst._arg1,inst._arg2,inst._arg3);
@@ -242,20 +242,19 @@ SQInteger SQFuncState::GetConstant(const SQObject &cons)
 
 void SQFuncState::SetIntructionParams(SQInteger pos,SQInteger arg0,SQInteger arg1,SQInteger arg2,SQInteger arg3)
 {
-	_instructions[pos]._arg0 = (unsigned char)std::bit_cast<SQUnsignedInteger>(arg0);
-	_instructions[pos]._arg1 = (SQInt32)std::bit_cast<SQUnsignedInteger>(arg1);
-	_instructions[pos]._arg2 = (unsigned char)std::bit_cast<SQUnsignedInteger>(arg2);
-	_instructions[pos]._arg3 = (unsigned char)std::bit_cast<SQUnsignedInteger>(arg3);
+	_instructions[pos]._arg0=(unsigned char)*((SQUnsignedInteger *)&arg0);
+	_instructions[pos]._arg1=(SQInt32)*((SQUnsignedInteger *)&arg1);
+	_instructions[pos]._arg2=(unsigned char)*((SQUnsignedInteger *)&arg2);
+	_instructions[pos]._arg3=(unsigned char)*((SQUnsignedInteger *)&arg3);
 }
 
 void SQFuncState::SetIntructionParam(SQInteger pos,SQInteger arg,SQInteger val)
 {
 	switch(arg){
-		case 0: _instructions[pos]._arg0 = (unsigned char)std::bit_cast<SQUnsignedInteger>(val); break;
-		case 1:
-		case 4: _instructions[pos]._arg1 = (SQInt32)std::bit_cast<SQUnsignedInteger>(val); break;
-		case 2: _instructions[pos]._arg2 = (unsigned char)std::bit_cast<SQUnsignedInteger>(val); break;
-		case 3: _instructions[pos]._arg3 = (unsigned char)std::bit_cast<SQUnsignedInteger>(val); break;
+		case 0:_instructions[pos]._arg0=(unsigned char)*((SQUnsignedInteger *)&val);break;
+		case 1:case 4:_instructions[pos]._arg1=(SQInt32)*((SQUnsignedInteger *)&val);break;
+		case 2:_instructions[pos]._arg2=(unsigned char)*((SQUnsignedInteger *)&val);break;
+		case 3:_instructions[pos]._arg3=(unsigned char)*((SQUnsignedInteger *)&val);break;
 	};
 }
 

src/3rdparty/squirrel/squirrel/sqvm.cpp

@@ -51,7 +51,7 @@ bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,con
 			case BW_XOR:	res = i1 ^ i2; break;
 			case BW_SHIFTL:	res = i1 << i2; break;
 			case BW_SHIFTR:	res = i1 >> i2; break;
-			case BW_USHIFTR:res = (SQInteger)(std::bit_cast<SQUnsignedInteger>(i1) >> i2); break;
+			case BW_USHIFTR:res = (SQInteger)(*((SQUnsignedInteger*)&i1) >> i2); break;
 			default: { Raise_Error("internal vm error bitwise op failed"); return false; }
 		}
 	}
@@ -472,10 +472,10 @@ bool SQVM::DerefInc(SQInteger op,SQObjectPtr &target, SQObjectPtr &self, SQObjec
 
 #define arg0 (_i_._arg0)
 #define arg1 (_i_._arg1)
-#define sarg1 (std::bit_cast<SQInt32>(_i_._arg1))
+#define sarg1 (*(const_cast<SQInt32 *>(&_i_._arg1)))
 #define arg2 (_i_._arg2)
 #define arg3 (_i_._arg3)
-#define sarg3 ((SQInteger)std::bit_cast<char>(_i_._arg3))
+#define sarg3 ((SQInteger)*((const signed char *)&_i_._arg3))
 
 SQRESULT SQVM::Suspend()
 {
@@ -764,7 +764,7 @@ exception_restore:
 				continue;
 			case _OP_LOAD: TARGET = ci->_literals[arg1]; continue;
 			case _OP_LOADINT: TARGET = (SQInteger)arg1; continue;
-			case _OP_LOADFLOAT: TARGET = std::bit_cast<SQFloat>(arg1); continue;
+			case _OP_LOADFLOAT: TARGET = *((const SQFloat *)&arg1); continue;
 			case _OP_DLOAD: TARGET = ci->_literals[arg1]; STK(arg2) = ci->_literals[arg3];continue;
 			case _OP_TAILCALL:
 				temp_reg = STK(arg1);

src/CMakeLists.txt

@@ -39,11 +39,6 @@ add_files(
     CONDITION ICU_i18n_FOUND AND HARFBUZZ_FOUND
 )
 
-add_files(
-    soundloader_opus.cpp
-    CONDITION OpusFile_FOUND
-)
-
 add_files(
     aircraft.h
     aircraft_cmd.cpp
@@ -55,11 +50,8 @@ add_files(
     airport_gui.cpp
     animated_tile.cpp
     animated_tile_func.h
-    animated_tile_map.h
     articulated_vehicles.cpp
     articulated_vehicles.h
-    autocompletion.cpp
-    autocompletion.h
     autoreplace.cpp
     autoreplace_base.h
     autoreplace_cmd.cpp
@@ -83,7 +75,6 @@ add_files(
     bridge_map.cpp
     bridge_map.h
     build_vehicle_gui.cpp
-    cachecheck.cpp
     cargo_type.h
     cargoaction.cpp
     cargoaction.h
@@ -145,10 +136,6 @@ add_files(
     dock_gui.cpp
     driver.cpp
     driver.h
-    dropdown.cpp
-    dropdown_common_type.h
-    dropdown_func.h
-    dropdown_type.h
     economy.cpp
     economy_base.h
     economy_cmd.h
@@ -261,7 +248,6 @@ add_files(
     music_gui.cpp
     newgrf.cpp
     newgrf.h
-    newgrf_act5.h
     newgrf_airport.cpp
     newgrf_airport.h
     newgrf_airporttiles.cpp
@@ -313,7 +299,6 @@ add_files(
     newgrf_storage.h
     newgrf_text.cpp
     newgrf_text.h
-    newgrf_text_type.h
     newgrf_town.cpp
     newgrf_town.h
     newgrf_townname.cpp
@@ -345,12 +330,8 @@ add_files(
     palette_func.h
     pbs.cpp
     pbs.h
-    picker_func.h
-    picker_gui.cpp
-    picker_gui.h
     progress.cpp
     progress.h
-    provider_manager.h
     querystring_gui.h
     rail.cpp
     rail.h
@@ -410,8 +391,6 @@ add_files(
     signs_func.h
     signs_gui.cpp
     signs_type.h
-    slider.cpp
-    slider_func.h
     slope_func.h
     slope_type.h
     smallmap_gui.cpp
@@ -422,11 +401,6 @@ add_files(
     sound.cpp
     sound_func.h
     sound_type.h
-    soundloader.cpp
-    soundloader_func.h
-    soundloader_type.h
-    soundloader_raw.cpp
-    soundloader_wav.cpp
     sprite.cpp
     sprite.h
     spritecache.cpp
@@ -492,6 +466,7 @@ add_files(
     tilearea_type.h
     tilehighlight_func.h
     tilehighlight_type.h
+    tilematrix_type.hpp
     timetable.h
     timetable_cmd.cpp
     timetable_cmd.h

src/ai/ai_core.cpp

@@ -40,7 +40,7 @@
 	/* Clients shouldn't start AIs */
 	if (_networking && !_network_server) return;
 
-	Backup<CompanyID> cur_company(_current_company, company);
+	Backup<CompanyID> cur_company(_current_company, company, FILE_LINE);
 	Company *c = Company::Get(company);
 
 	AIConfig *config = c->ai_config.get();
@@ -60,7 +60,7 @@
 
 	c->ai_info = info;
 	assert(c->ai_instance == nullptr);
-	c->ai_instance = std::make_unique<AIInstance>();
+	c->ai_instance = new AIInstance();
 	c->ai_instance->Initialize(info);
 	c->ai_instance->LoadOnStack(config->GetToLoadData());
 	config->SetToLoadData(nullptr);
@@ -81,7 +81,7 @@
 	assert(_settings_game.difficulty.competitor_speed <= 4);
 	if ((AI::frame_counter & ((1 << (4 - _settings_game.difficulty.competitor_speed)) - 1)) != 0) return;
 
-	Backup<CompanyID> cur_company(_current_company);
+	Backup<CompanyID> cur_company(_current_company, FILE_LINE);
 	for (const Company *c : Company::Iterate()) {
 		if (c->is_ai) {
 			PerformanceMeasurer framerate((PerformanceElement)(PFE_AI0 + c->index));
@@ -109,10 +109,11 @@
 	if (_networking && !_network_server) return;
 	PerformanceMeasurer::SetInactive((PerformanceElement)(PFE_AI0 + company));
 
-	Backup<CompanyID> cur_company(_current_company, company);
+	Backup<CompanyID> cur_company(_current_company, company, FILE_LINE);
 	Company *c = Company::Get(company);
 
-	c->ai_instance.reset();
+	delete c->ai_instance;
+	c->ai_instance = nullptr;
 	c->ai_info = nullptr;
 	c->ai_config.reset();
 
@@ -128,7 +129,7 @@
 	 * for the server owner to unpause the script again. */
 	if (_network_dedicated) return;
 
-	Backup<CompanyID> cur_company(_current_company, company);
+	Backup<CompanyID> cur_company(_current_company, company, FILE_LINE);
 	Company::Get(company)->ai_instance->Pause();
 
 	cur_company.Restore();
@@ -136,7 +137,7 @@
 
 /* static */ void AI::Unpause(CompanyID company)
 {
-	Backup<CompanyID> cur_company(_current_company, company);
+	Backup<CompanyID> cur_company(_current_company, company, FILE_LINE);
 	Company::Get(company)->ai_instance->Unpause();
 
 	cur_company.Restore();
@@ -144,7 +145,7 @@
 
 /* static */ bool AI::IsPaused(CompanyID company)
 {
-	Backup<CompanyID> cur_company(_current_company, company);
+	Backup<CompanyID> cur_company(_current_company, company, FILE_LINE);
 	bool paused = Company::Get(company)->ai_instance->IsPaused();
 
 	cur_company.Restore();
@@ -242,30 +243,37 @@
 
 /* static */ void AI::NewEvent(CompanyID company, ScriptEvent *event)
 {
-	ScriptObjectRef counter(event);
+	/* AddRef() and Release() need to be called at least once, so do it here */
+	event->AddRef();
 
 	/* Clients should ignore events */
 	if (_networking && !_network_server) {
+		event->Release();
 		return;
 	}
 
 	/* Only AIs can have an event-queue */
 	if (!Company::IsValidAiID(company)) {
+		event->Release();
 		return;
 	}
 
 	/* Queue the event */
-	Backup<CompanyID> cur_company(_current_company, company);
+	Backup<CompanyID> cur_company(_current_company, company, FILE_LINE);
 	Company::Get(_current_company)->ai_instance->InsertEvent(event);
 	cur_company.Restore();
+
+	event->Release();
 }
 
 /* static */ void AI::BroadcastNewEvent(ScriptEvent *event, CompanyID skip_company)
 {
-	ScriptObjectRef counter(event);
+	/* AddRef() and Release() need to be called at least once, so do it here */
+	event->AddRef();
 
 	/* Clients should ignore events */
 	if (_networking && !_network_server) {
+		event->Release();
 		return;
 	}
 
@@ -273,6 +281,8 @@
 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
 		if (c != skip_company) AI::NewEvent(c, event);
 	}
+
+	event->Release();
 }
 
 /* static */ void AI::Save(CompanyID company)
@@ -283,7 +293,7 @@
 
 		/* When doing emergency saving, an AI can be not fully initialised. */
 		if (c->ai_instance != nullptr) {
-			Backup<CompanyID> cur_company(_current_company, company);
+			Backup<CompanyID> cur_company(_current_company, company, FILE_LINE);
 			c->ai_instance->Save();
 			cur_company.Restore();
 			return;

src/ai/ai_gui.cpp

@@ -82,11 +82,11 @@ static constexpr NWidgetPart _nested_ai_config_widgets[] = {
 };
 
 /** Window definition for the configure AI window. */
-static WindowDesc _ai_config_desc(
+static WindowDesc _ai_config_desc(__FILE__, __LINE__,
 	WDP_CENTER, nullptr, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
 	0,
-	_nested_ai_config_widgets
+	std::begin(_nested_ai_config_widgets), std::end(_nested_ai_config_widgets)
 );
 
 /**
@@ -97,7 +97,7 @@ struct AIConfigWindow : public Window {
 	int line_height;         ///< Height of a single AI-name line.
 	Scrollbar *vscroll;      ///< Cache of the vertical scrollbar.
 
-	AIConfigWindow() : Window(_ai_config_desc)
+	AIConfigWindow() : Window(&_ai_config_desc)
 	{
 		this->InitNested(WN_GAME_OPTIONS_AI); // Initializes 'this->line_height' as a side effect.
 		this->vscroll = this->GetScrollbar(WID_AIC_SCROLLBAR);
@@ -128,20 +128,20 @@ struct AIConfigWindow : public Window {
 		}
 	}
 
-	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
+	void UpdateWidgetSize(WidgetID widget, Dimension *size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension *fill, [[maybe_unused]] Dimension *resize) override
 	{
 		switch (widget) {
 			case WID_AIC_DECREASE_NUMBER:
 			case WID_AIC_INCREASE_NUMBER:
 			case WID_AIC_DECREASE_INTERVAL:
 			case WID_AIC_INCREASE_INTERVAL:
-				size = maxdim(size, NWidgetScrollbar::GetHorizontalDimension());
+				*size = maxdim(*size, NWidgetScrollbar::GetHorizontalDimension());
 				break;
 
 			case WID_AIC_LIST:
 				this->line_height = GetCharacterHeight(FS_NORMAL) + padding.height;
-				resize.height = this->line_height;
-				size.height = 8 * this->line_height;
+				resize->height = this->line_height;
+				size->height = 8 * this->line_height;
 				break;
 		}
 	}

src/ai/ai_info.cpp

@@ -24,7 +24,7 @@
  */
 static bool CheckAPIVersion(const std::string &api_version)
 {
-	static const std::set<std::string> versions = { "0.7", "1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "12", "13", "14", "15" };
+	static const std::set<std::string> versions = { "0.7", "1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "12", "13", "14" };
 	return versions.find(api_version) != versions.end();
 }
 

src/aircraft.h

@@ -17,10 +17,12 @@
  * Base values for flight levels above ground level for 'normal' flight and holding patterns.
  * Due to speed and direction, the actual flight level may be higher.
  */
-static constexpr int AIRCRAFT_MIN_FLYING_ALTITUDE = 120; ///< Minimum flying altitude above tile.
-static constexpr int AIRCRAFT_MAX_FLYING_ALTITUDE = 360; ///< Maximum flying altitude above tile.
-static constexpr int PLANE_HOLD_MAX_FLYING_ALTITUDE = 150; ///< holding flying altitude above tile of planes.
-static constexpr int HELICOPTER_HOLD_MAX_FLYING_ALTITUDE = 184; ///< holding flying altitude above tile of helicopters.
+enum AircraftFlyingAltitude {
+	AIRCRAFT_MIN_FLYING_ALTITUDE        = 120, ///< Minimum flying altitude above tile.
+	AIRCRAFT_MAX_FLYING_ALTITUDE        = 360, ///< Maximum flying altitude above tile.
+	PLANE_HOLD_MAX_FLYING_ALTITUDE      = 150, ///< holding flying altitude above tile of planes.
+	HELICOPTER_HOLD_MAX_FLYING_ALTITUDE = 184  ///< holding flying altitude above tile of helicopters.
+};
 
 struct Aircraft;
 
@@ -71,14 +73,14 @@ struct AircraftCache {
  */
 struct Aircraft final : public SpecializedVehicle<Aircraft, VEH_AIRCRAFT> {
 	uint16_t crashed_counter;        ///< Timer for handling crash animations.
-	uint8_t pos;                      ///< Next desired position of the aircraft.
-	uint8_t previous_pos;             ///< Previous desired position of the aircraft.
+	byte pos;                      ///< Next desired position of the aircraft.
+	byte previous_pos;             ///< Previous desired position of the aircraft.
 	StationID targetairport;       ///< Airport to go to next.
-	uint8_t state;                    ///< State of the airport. @see AirportMovementStates
+	byte state;                    ///< State of the airport. @see AirportMovementStates
 	Direction last_direction;
-	uint8_t number_consecutive_turns; ///< Protection to prevent the aircraft of making a lot of turns in order to reach a specific point.
-	uint8_t turn_counter;             ///< Ticks between each turn to prevent > 45 degree turns.
-	uint8_t flags;                    ///< Aircraft flags. @see AirVehicleFlags
+	byte number_consecutive_turns; ///< Protection to prevent the aircraft of making a lot of turns in order to reach a specific point.
+	byte turn_counter;             ///< Ticks between each turn to prevent > 45 degree turns.
+	byte flags;                    ///< Aircraft flags. @see AirVehicleFlags
 
 	AircraftCache acache;
 
@@ -109,7 +111,6 @@ struct Aircraft final : public SpecializedVehicle<Aircraft, VEH_AIRCRAFT> {
 	void OnNewEconomyDay() override;
 	uint Crash(bool flooded = false) override;
 	TileIndex GetOrderStationLocation(StationID station) override;
-	TileIndex GetCargoTile() const override { return this->First()->tile; }
 	ClosestDepot FindClosestDepot() override;
 
 	/**

src/aircraft_cmd.cpp

@@ -134,7 +134,7 @@ static StationID FindNearestHangar(const Aircraft *v)
 	const Station *next_dest = nullptr;
 	if (max_range != 0) {
 		if (v->current_order.IsType(OT_GOTO_STATION) ||
-				(v->current_order.IsType(OT_GOTO_DEPOT) && (v->current_order.GetDepotActionType() & ODATFB_NEAREST_DEPOT) == 0)) {
+				(v->current_order.IsType(OT_GOTO_DEPOT) && v->current_order.GetDepotActionType() != ODATFB_NEAREST_DEPOT)) {
 			last_dest = Station::GetIfValid(v->last_station_visited);
 			next_dest = Station::GetIfValid(v->current_order.GetDestination());
 		} else {
@@ -630,11 +630,13 @@ void UpdateAircraftCache(Aircraft *v, bool update_range)
 /**
  * Special velocities for aircraft
  */
-static constexpr uint16_t SPEED_LIMIT_TAXI = 50; ///< Maximum speed of an aircraft while taxiing
-static constexpr uint16_t SPEED_LIMIT_APPROACH = 230; ///< Maximum speed of an aircraft on finals
-static constexpr uint16_t SPEED_LIMIT_BROKEN = 320; ///< Maximum speed of an aircraft that is broken
-static constexpr uint16_t SPEED_LIMIT_HOLD = 425; ///< Maximum speed of an aircraft that flies the holding pattern
-static constexpr uint16_t SPEED_LIMIT_NONE = UINT16_MAX; ///< No environmental speed limit. Speed limit is type dependent
+enum AircraftSpeedLimits {
+	SPEED_LIMIT_TAXI     =     50,  ///< Maximum speed of an aircraft while taxiing
+	SPEED_LIMIT_APPROACH =    230,  ///< Maximum speed of an aircraft on finals
+	SPEED_LIMIT_BROKEN   =    320,  ///< Maximum speed of an aircraft that is broken
+	SPEED_LIMIT_HOLD     =    425,  ///< Maximum speed of an aircraft that flies the holding pattern
+	SPEED_LIMIT_NONE     = 0xFFFF,  ///< No environmental speed limit. Speed limit is type dependent
+};
 
 /**
  * Sets the new speed for an aircraft
@@ -653,7 +655,7 @@ static int UpdateAircraftSpeed(Aircraft *v, uint speed_limit = SPEED_LIMIT_NONE,
 	 *                               ~ acceleration * 77 (km-ish/h / 256)
 	 */
 	uint spd = v->acceleration * 77;
-	uint8_t t;
+	byte t;
 
 	/* Adjust speed limits by plane speed factor to prevent taxiing
 	 * and take-off speeds being too low. */
@@ -670,7 +672,7 @@ static int UpdateAircraftSpeed(Aircraft *v, uint speed_limit = SPEED_LIMIT_NONE,
 		speed_limit = v->vcache.cached_max_speed;
 	}
 
-	v->subspeed = (t = v->subspeed) + (uint8_t)spd;
+	v->subspeed = (t = v->subspeed) + (byte)spd;
 
 	/* Aircraft's current speed is used twice so that very fast planes are
 	 * forced to slow down rapidly in the short distance needed. The magic
@@ -697,7 +699,7 @@ static int UpdateAircraftSpeed(Aircraft *v, uint speed_limit = SPEED_LIMIT_NONE,
 	spd = v->GetOldAdvanceSpeed(spd);
 
 	spd += v->progress;
-	v->progress = (uint8_t)spd;
+	v->progress = (byte)spd;
 	return spd >> 8;
 }
 
@@ -823,7 +825,7 @@ template int GetAircraftFlightLevel(Aircraft *v, bool takeoff);
  * @param rotation The rotation of the airport.
  * @return   The index of the entry point
  */
-static uint8_t AircraftGetEntryPoint(const Aircraft *v, const AirportFTAClass *apc, Direction rotation)
+static byte AircraftGetEntryPoint(const Aircraft *v, const AirportFTAClass *apc, Direction rotation)
 {
 	assert(v != nullptr);
 	assert(apc != nullptr);
@@ -1180,13 +1182,10 @@ static bool HandleCrashedAircraft(Aircraft *v)
 	if (v->crashed_counter < 500 && st == nullptr && ((v->crashed_counter % 3) == 0) ) {
 		int z = GetSlopePixelZ(Clamp(v->x_pos, 0, Map::MaxX() * TILE_SIZE), Clamp(v->y_pos, 0, Map::MaxY() * TILE_SIZE));
 		v->z_pos -= 1;
-		if (v->z_pos <= z) {
+		if (v->z_pos == z) {
 			v->crashed_counter = 500;
-			v->z_pos = z + 1;
-		} else {
-			v->crashed_counter = 0;
+			v->z_pos++;
 		}
-		SetAircraftPosition(v, v->x_pos, v->y_pos, v->z_pos);
 	}
 
 	if (v->crashed_counter < 650) {
@@ -1286,7 +1285,7 @@ void HandleMissingAircraftOrders(Aircraft *v)
 	 */
 	const Station *st = GetTargetAirportIfValid(v);
 	if (st == nullptr) {
-		Backup<CompanyID> cur_company(_current_company, v->owner);
+		Backup<CompanyID> cur_company(_current_company, v->owner, FILE_LINE);
 		CommandCost ret = Command<CMD_SEND_VEHICLE_TO_DEPOT>::Do(DC_EXEC, v->index, DepotCommand::None, {});
 		cur_company.Restore();
 
@@ -1320,10 +1319,10 @@ void Aircraft::MarkDirty()
 
 uint Aircraft::Crash(bool flooded)
 {
-	uint victims = Vehicle::Crash(flooded) + 2; // pilots
+	uint pass = Vehicle::Crash(flooded) + 2; // pilots
 	this->crashed_counter = flooded ? 9000 : 0; // max 10000, disappear pretty fast when flooded
 
-	return victims;
+	return pass;
 }
 
 /**
@@ -1334,8 +1333,8 @@ static void CrashAirplane(Aircraft *v)
 {
 	CreateEffectVehicleRel(v, 4, 4, 8, EV_EXPLOSION_LARGE);
 
-	uint victims = v->Crash();
-	SetDParam(0, victims);
+	uint pass = v->Crash();
+	SetDParam(0, pass);
 
 	v->cargo.Truncate();
 	v->Next()->cargo.Truncate();
@@ -1349,8 +1348,8 @@ static void CrashAirplane(Aircraft *v)
 		newsitem = STR_NEWS_AIRCRAFT_CRASH;
 	}
 
-	AI::NewEvent(v->owner, new ScriptEventVehicleCrashed(v->index, vt, st == nullptr ? ScriptEventVehicleCrashed::CRASH_AIRCRAFT_NO_AIRPORT : ScriptEventVehicleCrashed::CRASH_PLANE_LANDING, victims));
-	Game::NewEvent(new ScriptEventVehicleCrashed(v->index, vt, st == nullptr ? ScriptEventVehicleCrashed::CRASH_AIRCRAFT_NO_AIRPORT : ScriptEventVehicleCrashed::CRASH_PLANE_LANDING, victims));
+	AI::NewEvent(v->owner, new ScriptEventVehicleCrashed(v->index, vt, st == nullptr ? ScriptEventVehicleCrashed::CRASH_AIRCRAFT_NO_AIRPORT : ScriptEventVehicleCrashed::CRASH_PLANE_LANDING));
+	Game::NewEvent(new ScriptEventVehicleCrashed(v->index, vt, st == nullptr ? ScriptEventVehicleCrashed::CRASH_AIRCRAFT_NO_AIRPORT : ScriptEventVehicleCrashed::CRASH_PLANE_LANDING));
 
 	NewsType newstype = NT_ACCIDENT;
 	if (v->owner != _local_company) {
@@ -1652,7 +1651,7 @@ static void AircraftEventHandler_HeliTakeOff(Aircraft *v, const AirportFTAClass
 
 	/* Send the helicopter to a hangar if needed for replacement */
 	if (v->NeedsAutomaticServicing()) {
-		Backup<CompanyID> cur_company(_current_company, v->owner);
+		Backup<CompanyID> cur_company(_current_company, v->owner, FILE_LINE);
 		Command<CMD_SEND_VEHICLE_TO_DEPOT>::Do(DC_EXEC, v->index, DepotCommand::Service | DepotCommand::LocateHangar, {});
 		cur_company.Restore();
 	}
@@ -1667,7 +1666,7 @@ static void AircraftEventHandler_Flying(Aircraft *v, const AirportFTAClass *apc)
 		/* {32,FLYING,NOTHING_block,37}, {32,LANDING,N,33}, {32,HELILANDING,N,41},
 		 * if it is an airplane, look for LANDING, for helicopter HELILANDING
 		 * it is possible to choose from multiple landing runways, so loop until a free one is found */
-		uint8_t landingtype = (v->subtype == AIR_HELICOPTER) ? HELILANDING : LANDING;
+		byte landingtype = (v->subtype == AIR_HELICOPTER) ? HELILANDING : LANDING;
 		const AirportFTA *current = apc->layout[v->pos].next;
 		while (current != nullptr) {
 			if (current->heading == landingtype) {
@@ -1703,7 +1702,7 @@ static void AircraftEventHandler_Landing(Aircraft *v, const AirportFTAClass *)
 
 	/* check if the aircraft needs to be replaced or renewed and send it to a hangar if needed */
 	if (v->NeedsAutomaticServicing()) {
-		Backup<CompanyID> cur_company(_current_company, v->owner);
+		Backup<CompanyID> cur_company(_current_company, v->owner, FILE_LINE);
 		Command<CMD_SEND_VEHICLE_TO_DEPOT>::Do(DC_EXEC, v->index, DepotCommand::Service, {});
 		cur_company.Restore();
 	}
@@ -1814,8 +1813,8 @@ static bool AirportMove(Aircraft *v, const AirportFTAClass *apc)
 	const AirportFTA *current = &apc->layout[v->pos];
 	/* we have arrived in an important state (eg terminal, hangar, etc.) */
 	if (current->heading == v->state) {
-		uint8_t prev_pos = v->pos; // location could be changed in state, so save it before-hand
-		uint8_t prev_state = v->state;
+		byte prev_pos = v->pos; // location could be changed in state, so save it before-hand
+		byte prev_state = v->state;
 		_aircraft_state_handlers[v->state](v, apc);
 		if (v->state != FLYING) v->previous_pos = prev_pos;
 		if (v->state != prev_state || v->pos != prev_pos) UpdateAircraftCache(v);
@@ -1951,7 +1950,7 @@ static const MovementTerminalMapping _airport_terminal_mapping[] = {
  * @param last_terminal Terminal number to stop examining.
  * @return A terminal or helipad has been found, and has been assigned to the aircraft.
  */
-static bool FreeTerminal(Aircraft *v, uint8_t i, uint8_t last_terminal)
+static bool FreeTerminal(Aircraft *v, byte i, byte last_terminal)
 {
 	assert(last_terminal <= lengthof(_airport_terminal_mapping));
 	Station *st = Station::Get(v->targetairport);

src/aircraft_gui.cpp

@@ -97,17 +97,6 @@ void DrawAircraftImage(const Vehicle *v, const Rect &r, VehicleID selection, Eng
 
 	PaletteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
 	seq.Draw(x, y, pal, (v->vehstatus & VS_CRASHED) != 0);
-
-	/* Aircraft can store cargo in their shadow, show this if present. */
-	const Vehicle *u = v->Next();
-	assert(u != nullptr);
-	int dx = 0;
-	if (u->cargo_cap > 0 && u->cargo_type != v->cargo_type) {
-		dx = GetLargestCargoIconSize().width / 2;
-		DrawCargoIconOverlay(x + dx, y, u->cargo_type);
-	}
-	if (v->cargo_cap > 0) DrawCargoIconOverlay(x - dx, y, v->cargo_type);
-
 	if (helicopter) {
 		const Aircraft *a = Aircraft::From(v);
 		VehicleSpriteSeq rotor_seq;

src/airport.cpp

@@ -110,12 +110,12 @@ AirportMovingData RotateAirportMovingData(const AirportMovingData *orig, Directi
 
 AirportFTAClass::AirportFTAClass(
 	const AirportMovingData *moving_data_,
-	const uint8_t *terminals_,
-	const uint8_t num_helipads_,
-	const uint8_t *entry_points_,
+	const byte *terminals_,
+	const byte num_helipads_,
+	const byte *entry_points_,
 	Flags flags_,
 	const AirportFTAbuildup *apFA,
-	uint8_t delta_z_
+	byte delta_z_
 ) :
 	moving_data(moving_data_),
 	terminals(terminals_),
@@ -204,7 +204,7 @@ static AirportFTA *AirportBuildAutomata(uint nofelements, const AirportFTAbuildu
  * @param airport_type %Airport type to query FTA from. @see AirportTypes
  * @return Finite state machine of the airport.
  */
-const AirportFTAClass *GetAirport(const uint8_t airport_type)
+const AirportFTAClass *GetAirport(const byte airport_type)
 {
 	if (airport_type == AT_DUMMY) return &_airportfta_dummy;
 	return AirportSpec::Get(airport_type)->fsm;
@@ -215,7 +215,7 @@ const AirportFTAClass *GetAirport(const uint8_t airport_type)
  * @param hangar_tile The tile on which the vehicle is build
  * @return The position (index in airport node array) where the aircraft ends up
  */
-uint8_t GetVehiclePosOnBuild(TileIndex hangar_tile)
+byte GetVehiclePosOnBuild(TileIndex hangar_tile)
 {
 	const Station *st = Station::GetByTile(hangar_tile);
 	const AirportFTAClass *apc = st->airport.GetFTA();

src/airport.h

@@ -152,12 +152,12 @@ public:
 
 	AirportFTAClass(
 		const AirportMovingData *moving_data,
-		const uint8_t *terminals,
-		const uint8_t num_helipads,
-		const uint8_t *entry_points,
+		const byte *terminals,
+		const byte num_helipads,
+		const byte *entry_points,
 		Flags flags,
 		const AirportFTAbuildup *apFA,
-		uint8_t delta_z
+		byte delta_z
 	);
 
 	~AirportFTAClass();
@@ -167,7 +167,7 @@ public:
 	 * @param position Element number to get movement data about.
 	 * @return Pointer to the movement data.
 	 */
-	const AirportMovingData *MovingData(uint8_t position) const
+	const AirportMovingData *MovingData(byte position) const
 	{
 		assert(position < nofelements);
 		return &moving_data[position];
@@ -175,12 +175,12 @@ public:
 
 	const AirportMovingData *moving_data; ///< Movement data.
 	struct AirportFTA *layout;            ///< state machine for airport
-	const uint8_t *terminals;                ///< %Array with the number of terminal groups, followed by the number of terminals in each group.
-	const uint8_t num_helipads;              ///< Number of helipads on this airport. When 0 helicopters will go to normal terminals.
+	const byte *terminals;                ///< %Array with the number of terminal groups, followed by the number of terminals in each group.
+	const byte num_helipads;              ///< Number of helipads on this airport. When 0 helicopters will go to normal terminals.
 	Flags flags;                          ///< Flags for this airport type.
-	uint8_t nofelements;                     ///< number of positions the airport consists of
-	const uint8_t *entry_points;             ///< when an airplane arrives at this airport, enter it at position entry_point, index depends on direction
-	uint8_t delta_z;                         ///< Z adjustment for helicopter pads
+	byte nofelements;                     ///< number of positions the airport consists of
+	const byte *entry_points;             ///< when an airplane arrives at this airport, enter it at position entry_point, index depends on direction
+	byte delta_z;                         ///< Z adjustment for helicopter pads
 };
 
 DECLARE_ENUM_AS_BIT_SET(AirportFTAClass::Flags)
@@ -190,12 +190,12 @@ DECLARE_ENUM_AS_BIT_SET(AirportFTAClass::Flags)
 struct AirportFTA {
 	AirportFTA *next;        ///< possible extra movement choices from this position
 	uint64_t block;            ///< 64 bit blocks (st->airport.flags), should be enough for the most complex airports
-	uint8_t position;           ///< the position that an airplane is at
-	uint8_t next_position;      ///< next position from this position
-	uint8_t heading;            ///< heading (current orders), guiding an airplane to its target on an airport
+	byte position;           ///< the position that an airplane is at
+	byte next_position;      ///< next position from this position
+	byte heading;            ///< heading (current orders), guiding an airplane to its target on an airport
 };
 
-const AirportFTAClass *GetAirport(const uint8_t airport_type);
-uint8_t GetVehiclePosOnBuild(TileIndex hangar_tile);
+const AirportFTAClass *GetAirport(const byte airport_type);
+byte GetVehiclePosOnBuild(TileIndex hangar_tile);
 
 #endif /* AIRPORT_H */

src/airport_gui.cpp

@@ -22,8 +22,7 @@
 #include "station_type.h"
 #include "newgrf_airport.h"
 #include "newgrf_callbacks.h"
-#include "dropdown_type.h"
-#include "dropdown_func.h"
+#include "widgets/dropdown_type.h"
 #include "core/geometry_func.hpp"
 #include "hotkeys.h"
 #include "vehicle_func.h"
@@ -42,11 +41,11 @@
 
 static AirportClassID _selected_airport_class; ///< the currently visible airport class
 static int _selected_airport_index;            ///< the index of the selected airport in the current class or -1
-static uint8_t _selected_airport_layout;          ///< selected airport layout number.
+static byte _selected_airport_layout;          ///< selected airport layout number.
 
 static void ShowBuildAirportPicker(Window *parent);
 
-SpriteID GetCustomAirportSprite(const AirportSpec *as, uint8_t layout);
+SpriteID GetCustomAirportSprite(const AirportSpec *as, byte layout);
 
 void CcBuildAirport(Commands, const CommandCost &result, TileIndex tile)
 {
@@ -64,8 +63,8 @@ static void PlaceAirport(TileIndex tile)
 {
 	if (_selected_airport_index == -1) return;
 
-	uint8_t airport_type = AirportClass::Get(_selected_airport_class)->GetSpec(_selected_airport_index)->GetIndex();
-	uint8_t layout = _selected_airport_layout;
+	byte airport_type = AirportClass::Get(_selected_airport_class)->GetSpec(_selected_airport_index)->GetIndex();
+	byte layout = _selected_airport_layout;
 	bool adjacent = _ctrl_pressed;
 
 	auto proc = [=](bool test, StationID to_join) -> bool {
@@ -83,7 +82,7 @@ static void PlaceAirport(TileIndex tile)
 struct BuildAirToolbarWindow : Window {
 	int last_user_action; // Last started user action.
 
-	BuildAirToolbarWindow(WindowDesc &desc, WindowNumber window_number) : Window(desc)
+	BuildAirToolbarWindow(WindowDesc *desc, WindowNumber window_number) : Window(desc)
 	{
 		this->InitNested(window_number);
 		this->OnInvalidateData();
@@ -208,11 +207,11 @@ static constexpr NWidgetPart _nested_air_toolbar_widgets[] = {
 	EndContainer(),
 };
 
-static WindowDesc _air_toolbar_desc(
+static WindowDesc _air_toolbar_desc(__FILE__, __LINE__,
 	WDP_ALIGN_TOOLBAR, "toolbar_air", 0, 0,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WDF_CONSTRUCTION,
-	_nested_air_toolbar_widgets,
+	std::begin(_nested_air_toolbar_widgets), std::end(_nested_air_toolbar_widgets),
 	&BuildAirToolbarWindow::hotkeys
 );
 
@@ -228,7 +227,7 @@ Window *ShowBuildAirToolbar()
 	if (!Company::IsValidID(_local_company)) return nullptr;
 
 	CloseWindowByClass(WC_BUILD_TOOLBAR);
-	return AllocateWindowDescFront<BuildAirToolbarWindow>(_air_toolbar_desc, TRANSPORT_AIR);
+	return AllocateWindowDescFront<BuildAirToolbarWindow>(&_air_toolbar_desc, TRANSPORT_AIR);
 }
 
 class BuildAirportWindow : public PickerWindowBase {
@@ -241,15 +240,15 @@ class BuildAirportWindow : public PickerWindowBase {
 	{
 		DropDownList list;
 
-		for (const auto &cls : AirportClass::Classes()) {
-			list.push_back(MakeDropDownListStringItem(cls.name, cls.Index()));
+		for (uint i = 0; i < AirportClass::GetClassCount(); i++) {
+			list.push_back(std::make_unique<DropDownListStringItem>(AirportClass::Get((AirportClassID)i)->name, i, false));
 		}
 
 		return list;
 	}
 
 public:
-	BuildAirportWindow(WindowDesc &desc, Window *parent) : PickerWindowBase(desc, parent)
+	BuildAirportWindow(WindowDesc *desc, Window *parent) : PickerWindowBase(desc, parent)
 	{
 		this->CreateNestedTree();
 
@@ -277,7 +276,7 @@ public:
 			const AirportSpec *as = ac->GetSpec(_selected_airport_index);
 			if (as->IsAvailable()) {
 				/* Ensure the airport layout is valid. */
-				_selected_airport_layout = Clamp(_selected_airport_layout, 0, static_cast<uint8_t>(as->layouts.size() - 1));
+				_selected_airport_layout = Clamp(_selected_airport_layout, 0, as->num_table - 1);
 				selectFirstAirport = false;
 				this->UpdateSelectSize();
 			}
@@ -306,7 +305,7 @@ public:
 					StringID string = GetAirportTextCallback(as, _selected_airport_layout, CBID_AIRPORT_LAYOUT_NAME);
 					if (string != STR_UNDEFINED) {
 						SetDParam(0, string);
-					} else if (as->layouts.size() > 1) {
+					} else if (as->num_table > 1) {
 						SetDParam(0, STR_STATION_BUILD_AIRPORT_LAYOUT_NAME);
 						SetDParam(1, _selected_airport_layout + 1);
 					}
@@ -317,17 +316,17 @@ public:
 		}
 	}
 
-	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
+	void UpdateWidgetSize(WidgetID widget, Dimension *size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension *fill, [[maybe_unused]] Dimension *resize) override
 	{
 		switch (widget) {
 			case WID_AP_CLASS_DROPDOWN: {
 				Dimension d = {0, 0};
-				for (const auto &cls : AirportClass::Classes()) {
-					d = maxdim(d, GetStringBoundingBox(cls.name));
+				for (uint i = 0; i < AirportClass::GetClassCount(); i++) {
+					d = maxdim(d, GetStringBoundingBox(AirportClass::Get((AirportClassID)i)->name));
 				}
 				d.width += padding.width;
 				d.height += padding.height;
-				size = maxdim(size, d);
+				*size = maxdim(*size, d);
 				break;
 			}
 
@@ -336,11 +335,11 @@ public:
 					const AirportSpec *as = AirportSpec::Get(i);
 					if (!as->enabled) continue;
 
-					size.width = std::max(size.width, GetStringBoundingBox(as->name).width + padding.width);
+					size->width = std::max(size->width, GetStringBoundingBox(as->name).width + padding.width);
 				}
 
 				this->line_height = GetCharacterHeight(FS_NORMAL) + padding.height;
-				size.height = 5 * this->line_height;
+				size->height = 5 * this->line_height;
 				break;
 			}
 
@@ -348,13 +347,13 @@ public:
 				for (int i = 0; i < NUM_AIRPORTS; i++) {
 					const AirportSpec *as = AirportSpec::Get(i);
 					if (!as->enabled) continue;
-					for (uint8_t layout = 0; layout < static_cast<uint8_t>(as->layouts.size()); layout++) {
+					for (byte layout = 0; layout < as->num_table; layout++) {
 						SpriteID sprite = GetCustomAirportSprite(as, layout);
 						if (sprite != 0) {
 							Dimension d = GetSpriteSize(sprite);
 							d.width += WidgetDimensions::scaled.framerect.Horizontal();
 							d.height += WidgetDimensions::scaled.framerect.Vertical();
-							size = maxdim(d, size);
+							*size = maxdim(d, *size);
 						}
 					}
 				}
@@ -364,12 +363,12 @@ public:
 				for (int i = NEW_AIRPORT_OFFSET; i < NUM_AIRPORTS; i++) {
 					const AirportSpec *as = AirportSpec::Get(i);
 					if (!as->enabled) continue;
-					for (uint8_t layout = 0; layout < static_cast<uint8_t>(as->layouts.size()); layout++) {
+					for (byte layout = 0; layout < as->num_table; layout++) {
 						StringID string = GetAirportTextCallback(as, layout, CBID_AIRPORT_ADDITIONAL_TEXT);
 						if (string == STR_UNDEFINED) continue;
 
-						Dimension d = GetStringMultiLineBoundingBox(string, size);
-						size = maxdim(d, size);
+						Dimension d = GetStringMultiLineBoundingBox(string, *size);
+						*size = maxdim(d, *size);
 					}
 				}
 				break;
@@ -384,14 +383,13 @@ public:
 			case WID_AP_AIRPORT_LIST: {
 				Rect row = r.WithHeight(this->line_height).Shrink(WidgetDimensions::scaled.bevel);
 				Rect text = r.WithHeight(this->line_height).Shrink(WidgetDimensions::scaled.matrix);
-				const auto specs = AirportClass::Get(_selected_airport_class)->Specs();
-				auto [first, last] = this->vscroll->GetVisibleRangeIterators(specs);
-				for (auto it = first; it != last; ++it) {
-					const AirportSpec *as = *it;
+				AirportClass *apclass = AirportClass::Get(_selected_airport_class);
+				for (uint i = this->vscroll->GetPosition(); this->vscroll->IsVisible(i) && i < apclass->GetSpecCount(); i++) {
+					const AirportSpec *as = apclass->GetSpec(i);
 					if (!as->IsAvailable()) {
 						GfxFillRect(row, PC_BLACK, FILLRECT_CHECKER);
 					}
-					DrawString(text, as->name, (static_cast<int>(as->index) == _selected_airport_index) ? TC_WHITE : TC_BLACK);
+					DrawString(text, as->name, ((int)i == _selected_airport_index) ? TC_WHITE : TC_BLACK);
 					row = row.Translate(0, this->line_height);
 					text = text.Translate(0, this->line_height);
 				}
@@ -475,14 +473,14 @@ public:
 			const AirportSpec *as = AirportClass::Get(_selected_airport_class)->GetSpec(_selected_airport_index);
 			int w = as->size_x;
 			int h = as->size_y;
-			Direction rotation = as->layouts[_selected_airport_layout].rotation;
+			Direction rotation = as->rotation[_selected_airport_layout];
 			if (rotation == DIR_E || rotation == DIR_W) Swap(w, h);
 			SetTileSelectSize(w, h);
 
 			this->preview_sprite = GetCustomAirportSprite(as, _selected_airport_layout);
 
 			this->SetWidgetDisabledState(WID_AP_LAYOUT_DECREASE, _selected_airport_layout == 0);
-			this->SetWidgetDisabledState(WID_AP_LAYOUT_INCREASE, _selected_airport_layout + 1U >= as->layouts.size());
+			this->SetWidgetDisabledState(WID_AP_LAYOUT_INCREASE, _selected_airport_layout + 1 >= as->num_table);
 
 			int rad = _settings_game.station.modified_catchment ? as->catchment : (uint)CA_UNMODIFIED;
 			if (_settings_client.gui.station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
@@ -497,8 +495,8 @@ public:
 				break;
 
 			case WID_AP_AIRPORT_LIST: {
-				int32_t num_clicked = this->vscroll->GetScrolledRowFromWidget(pt.y, this, widget, 0, this->line_height);
-				if (num_clicked == INT32_MAX) break;
+				int num_clicked = this->vscroll->GetScrolledRowFromWidget(pt.y, this, widget, 0, this->line_height);
+				if (num_clicked == INT_MAX) break;
 				const AirportSpec *as = AirportClass::Get(_selected_airport_class)->GetSpec(num_clicked);
 				if (as->IsAvailable()) this->SelectOtherAirport(num_clicked);
 				break;
@@ -537,21 +535,24 @@ public:
 	{
 		/* First try to select an airport in the selected class. */
 		AirportClass *sel_apclass = AirportClass::Get(_selected_airport_class);
-		for (const AirportSpec *as : sel_apclass->Specs()) {
+		for (uint i = 0; i < sel_apclass->GetSpecCount(); i++) {
+			const AirportSpec *as = sel_apclass->GetSpec(i);
 			if (as->IsAvailable()) {
-				this->SelectOtherAirport(as->index);
+				this->SelectOtherAirport(i);
 				return;
 			}
 		}
 		if (change_class) {
 			/* If that fails, select the first available airport
 			 * from the first class where airports are available. */
-			for (const auto &cls : AirportClass::Classes()) {
-				for (const auto &as : cls.Specs()) {
+			for (AirportClassID j = APC_BEGIN; j < APC_MAX; j++) {
+				AirportClass *apclass = AirportClass::Get(j);
+				for (uint i = 0; i < apclass->GetSpecCount(); i++) {
+					const AirportSpec *as = apclass->GetSpec(i);
 					if (as->IsAvailable()) {
-						_selected_airport_class = cls.Index();
-						this->vscroll->SetCount(cls.GetSpecCount());
-						this->SelectOtherAirport(as->index);
+						_selected_airport_class = j;
+						this->vscroll->SetCount(apclass->GetSpecCount());
+						this->SelectOtherAirport(i);
 						return;
 					}
 				}
@@ -617,16 +618,16 @@ static constexpr NWidgetPart _nested_build_airport_widgets[] = {
 	EndContainer(),
 };
 
-static WindowDesc _build_airport_desc(
+static WindowDesc _build_airport_desc(__FILE__, __LINE__,
 	WDP_AUTO, nullptr, 0, 0,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	_nested_build_airport_widgets
+	std::begin(_nested_build_airport_widgets), std::end(_nested_build_airport_widgets)
 );
 
 static void ShowBuildAirportPicker(Window *parent)
 {
-	new BuildAirportWindow(_build_airport_desc, parent);
+	new BuildAirportWindow(&_build_airport_desc, parent);
 }
 
 void InitializeAirportGui()

src/animated_tile.cpp

@@ -8,8 +8,7 @@
 /** @file animated_tile.cpp Everything related to animated tiles. */
 
 #include "stdafx.h"
-#include "animated_tile_func.h"
-#include "animated_tile_map.h"
+#include "core/container_func.hpp"
 #include "tile_cmd.h"
 #include "viewport_func.h"
 #include "framerate_type.h"
@@ -20,53 +19,28 @@
 std::vector<TileIndex> _animated_tiles;
 
 /**
- * Stops animation on the given tile.
+ * Removes the given tile from the animated tile table.
  * @param tile the tile to remove
- * @param immediate immediately delete the tile from the animated tile list instead of waiting for the next tick.
  */
-void DeleteAnimatedTile(TileIndex tile, bool immediate)
+void DeleteAnimatedTile(TileIndex tile)
 {
-	if (immediate) {
-		if (GetAnimatedTileState(tile) == AnimatedTileState::None) return;
-
-		/* The tile may be switched to a non-animatable tile soon, so we should remove it from the
-		 * animated tile list early. */
-		SetAnimatedTileState(tile, AnimatedTileState::None);
-
-		/* To avoid having to move everything after this tile in the animated tile list, look for this tile
-		 * in the animated tile list and replace with last entry if not last. */
-		auto it = std::ranges::find(_animated_tiles, tile);
-		if (it == std::end(_animated_tiles)) return;
-
-		if (std::next(it) != std::end(_animated_tiles)) *it = _animated_tiles.back();
-		_animated_tiles.pop_back();
-
-		return;
+	auto to_remove = std::find(_animated_tiles.begin(), _animated_tiles.end(), tile);
+	if (to_remove != _animated_tiles.end()) {
+		/* The order of the remaining elements must stay the same, otherwise the animation loop may miss a tile. */
+		_animated_tiles.erase(to_remove);
+		MarkTileDirtyByTile(tile);
 	}
-
-	/* If the tile was animated, mark it for deletion from the tile list on the next animation loop. */
-	if (GetAnimatedTileState(tile) == AnimatedTileState::Animated) SetAnimatedTileState(tile, AnimatedTileState::Deleted);
 }
 
 /**
- * Add the given tile to the animated tile table (if it does not exist yet).
+ * Add the given tile to the animated tile table (if it does not exist
+ * on that table yet). Also increases the size of the table if necessary.
  * @param tile the tile to make animated
- * @param mark_dirty whether to also mark the tile dirty.
  */
-void AddAnimatedTile(TileIndex tile, bool mark_dirty)
+void AddAnimatedTile(TileIndex tile)
 {
-	if (mark_dirty) MarkTileDirtyByTile(tile);
-
-	const AnimatedTileState state = GetAnimatedTileState(tile);
-
-	/* Tile is already animated so nothing needs to happen. */
-	if (state == AnimatedTileState::Animated) return;
-
-	/* Tile has no previous animation state, so add to the tile list. If the state is anything
-	 * other than None (e.g. Deleted) then the tile will still be in the list and does not need to be added again. */
-	if (state == AnimatedTileState::None) _animated_tiles.push_back(tile);
-
-	SetAnimatedTileState(tile, AnimatedTileState::Animated);
+	MarkTileDirtyByTile(tile);
+	include(_animated_tiles, tile);
 }
 
 /**
@@ -74,29 +48,22 @@ void AddAnimatedTile(TileIndex tile, bool mark_dirty)
  */
 void AnimateAnimatedTiles()
 {
-	PerformanceAccumulator landscape_framerate(PFE_GL_LANDSCAPE);
+	PerformanceAccumulator framerate(PFE_GL_LANDSCAPE);
 
-	for (auto it = std::begin(_animated_tiles); it != std::end(_animated_tiles); /* nothing */) {
-		TileIndex &tile = *it;
-
-		if (GetAnimatedTileState(tile) != AnimatedTileState::Animated) {
-			/* Tile should not be animated any more, mark it as not animated and erase it from the list. */
-			SetAnimatedTileState(tile, AnimatedTileState::None);
-
-			/* Removing the last entry, no need to swap and continue. */
-			if (std::next(it) == std::end(_animated_tiles)) {
-				_animated_tiles.pop_back();
-				break;
-			}
-
-			/* Replace the current list entry with the back of the list to avoid moving elements. */
-			*it = _animated_tiles.back();
-			_animated_tiles.pop_back();
-			continue;
-		}
-
-		AnimateTile(tile);
-		++it;
+	const TileIndex *ti = _animated_tiles.data();
+	while (ti < _animated_tiles.data() + _animated_tiles.size()) {
+		const TileIndex curr = *ti;
+		AnimateTile(curr);
+		/* During the AnimateTile call, DeleteAnimatedTile could have been called,
+		 * deleting an element we've already processed and pushing the rest one
+		 * slot to the left. We can detect this by checking whether the index
+		 * in the current slot has changed - if it has, an element has been deleted,
+		 * and we should process the current slot again instead of going forward.
+		 * NOTE: this will still break if more than one animated tile is being
+		 *       deleted during the same AnimateTile call, but no code seems to
+		 *       be doing this anyway.
+		 */
+		if (*ti == curr) ++ti;
 	}
 }
 

src/animated_tile_func.h

@@ -12,8 +12,8 @@
 
 #include "tile_type.h"
 
-void AddAnimatedTile(TileIndex tile, bool mark_dirty = true);
-void DeleteAnimatedTile(TileIndex tile, bool immediate = false);
+void AddAnimatedTile(TileIndex tile);
+void DeleteAnimatedTile(TileIndex tile);
 void AnimateAnimatedTiles();
 void InitializeAnimatedTiles();
 

src/animated_tile_map.h

@@ -1,44 +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/>.
- */
-
-/** @file animated_tile_map.h Maps accessors for animated tiles. */
-
-#ifndef ANIMATED_TILE_MAP_H
-#define ANIMATED_TILE_MAP_H
-
-#include "core/bitmath_func.hpp"
-#include "map_func.h"
-
-/**
- * Animation state of a possibly-animated tile.
- */
-enum class AnimatedTileState : uint8_t {
-	None = 0, ///< Tile is not animated.
-	Deleted = 1, ///< Tile was animated but should be removed.
-	Animated = 3, ///< Tile is animated.
-};
-
-/**
- * Get the animated state of a tile.
- * @param t The tile.
- * @returns true iff the tile is animated.
- */
-inline AnimatedTileState GetAnimatedTileState(Tile t)
-{
-	return static_cast<AnimatedTileState>(GB(t.m6(), 0, 2));
-}
-
-/**
- * Set the animated state of a tile.
- * @param t The tile.
- */
-inline void SetAnimatedTileState(Tile t, AnimatedTileState state)
-{
-	SB(t.m6(), 0, 2, to_underlying(state));
-}
-
-#endif /* ANIMATED_TILE_MAP_H */

src/articulated_vehicles.cpp

@@ -99,15 +99,18 @@ uint CountArticulatedParts(EngineID engine_type, bool purchase_window)
 
 
 /**
- * Returns the default (non-refitted) cargo and capacity of a specific EngineID.
+ * Returns the default (non-refitted) capacity of a specific EngineID.
  * @param engine the EngineID of interest
- * @return cargo and capacity
+ * @param cargo_type returns the default cargo type, if needed
+ * @return capacity
  */
-static inline std::pair<CargoID, uint16_t> GetVehicleDefaultCapacity(EngineID engine)
+static inline uint16_t GetVehicleDefaultCapacity(EngineID engine, CargoID *cargo_type)
 {
 	const Engine *e = Engine::Get(engine);
-	CargoID cargo = e->CanCarryCargo() ? e->GetDefaultCargoType() : INVALID_CARGO;
-	return {cargo, IsValidCargoID(cargo) ? e->GetDisplayDefaultCapacity() : 0};
+	CargoID cargo = (e->CanCarryCargo() ? e->GetDefaultCargoType() : INVALID_CARGO);
+	if (cargo_type != nullptr) *cargo_type = cargo;
+	if (!IsValidCargoID(cargo)) return 0;
+	return e->GetDisplayDefaultCapacity();
 }
 
 /**
@@ -140,9 +143,9 @@ CargoArray GetCapacityOfArticulatedParts(EngineID engine)
 	CargoArray capacity{};
 	const Engine *e = Engine::Get(engine);
 
-	if (auto [cargo, cap] = GetVehicleDefaultCapacity(engine); IsValidCargoID(cargo)) {
-		capacity[cargo] = cap;
-	}
+	CargoID cargo_type;
+	uint16_t cargo_capacity = GetVehicleDefaultCapacity(engine, &cargo_type);
+	if (cargo_type < NUM_CARGO) capacity[cargo_type] = cargo_capacity;
 
 	if (!e->IsGroundVehicle()) return capacity;
 
@@ -152,9 +155,8 @@ CargoArray GetCapacityOfArticulatedParts(EngineID engine)
 		EngineID artic_engine = GetNextArticulatedPart(i, engine);
 		if (artic_engine == INVALID_ENGINE) break;
 
-		if (auto [cargo, cap] = GetVehicleDefaultCapacity(artic_engine); IsValidCargoID(cargo)) {
-			capacity[cargo] += cap;
-		}
+		cargo_capacity = GetVehicleDefaultCapacity(artic_engine, &cargo_type);
+		if (cargo_type < NUM_CARGO) capacity[cargo_type] += cargo_capacity;
 	}
 
 	return capacity;
@@ -170,9 +172,9 @@ CargoTypes GetCargoTypesOfArticulatedParts(EngineID engine)
 	CargoTypes cargoes = 0;
 	const Engine *e = Engine::Get(engine);
 
-	if (auto [cargo, cap] = GetVehicleDefaultCapacity(engine); IsValidCargoID(cargo) && cap > 0) {
-		SetBit(cargoes, cargo);
-	}
+	CargoID cargo_type;
+	uint16_t cargo_capacity = GetVehicleDefaultCapacity(engine, &cargo_type);
+	if (cargo_type < NUM_CARGO && cargo_capacity > 0) SetBit(cargoes, cargo_type);
 
 	if (!e->IsGroundVehicle()) return cargoes;
 
@@ -182,9 +184,8 @@ CargoTypes GetCargoTypesOfArticulatedParts(EngineID engine)
 		EngineID artic_engine = GetNextArticulatedPart(i, engine);
 		if (artic_engine == INVALID_ENGINE) break;
 
-		if (auto [cargo, cap] = GetVehicleDefaultCapacity(artic_engine); IsValidCargoID(cargo) && cap > 0) {
-			SetBit(cargoes, cargo);
-		}
+		cargo_capacity = GetVehicleDefaultCapacity(artic_engine, &cargo_type);
+		if (cargo_type < NUM_CARGO && cargo_capacity > 0) SetBit(cargoes, cargo_type);
 	}
 
 	return cargoes;

src/autocompletion.cpp

@@ -1,66 +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/>.
- */
-
-/** @file autocompletion.cpp Generic auto-completion engine. */
-
-#include "stdafx.h"
-
-#include "autocompletion.h"
-
-#include "console_internal.h"
-#include "town.h"
-#include "network/network_base.h"
-
-#include "safeguards.h"
-
-bool AutoCompletion::AutoComplete()
-{
-	// We are pressing TAB for the first time after reset.
-	if (this->suggestions.empty()) {
-		this->InitSuggestions(this->textbuf->buf);
-		if (this->suggestions.empty()) {
-			return false;
-		}
-		this->ApplySuggestion(prefix, suggestions[0]);
-		return true;
-	}
-
-	// We are pressing TAB again on the same text.
-	if (this->current_suggestion_index + 1 < this->suggestions.size()) {
-		this->ApplySuggestion(prefix, this->suggestions[++this->current_suggestion_index]);
-	} else {
-		// We are out of options, restore original text.
-		this->textbuf->Assign(initial_buf);
-		this->Reset();
-	}
-	return true;
-}
-
-void AutoCompletion::Reset()
-{
-	this->prefix = "";
-	this->query = "";
-	this->initial_buf.clear();
-	this->suggestions.clear();
-	this->current_suggestion_index = 0;
-}
-
-void AutoCompletion::InitSuggestions(std::string_view text)
-{
-	this->initial_buf = text;
-	size_t space_pos = this->initial_buf.find_last_of(' ');
-	this->query = this->initial_buf;
-	if (space_pos == std::string::npos) {
-		this->prefix = "";
-	} else {
-		this->prefix = this->query.substr(0, space_pos + 1);
-		this->query.remove_prefix(space_pos + 1);
-	}
-
-	this->suggestions = this->GetSuggestions(prefix, query);
-	this->current_suggestion_index = 0;
-}

src/autocompletion.h

@@ -1,46 +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/>.
- */
-
-/** @file autocompletion.h Generic auto-completion engine. */
-
-#ifndef AUTOCOMPLETION_H
-#define AUTOCOMPLETION_H
-
-#include "textbuf_type.h"
-
-class AutoCompletion {
-protected:
-	Textbuf *textbuf;
-
-private:
-	std::string              initial_buf; ///< Value of text buffer when we started current suggestion session.
-
-	std::string_view         prefix;      ///< Prefix of the text before the last space.
-	std::string_view         query;       ///< Last token of the text. This is used to based the suggestions on.
-
-	std::vector<std::string> suggestions;
-	size_t                   current_suggestion_index;
-
-public:
-	AutoCompletion(Textbuf *textbuf) : textbuf(textbuf)
-	{
-		this->Reset();
-	}
-	virtual ~AutoCompletion() = default;
-
-	// Returns true the textbuf was updated.
-	bool AutoComplete();
-	void Reset();
-
-private:
-	void InitSuggestions(std::string_view text);
-
-	virtual std::vector<std::string> GetSuggestions(std::string_view prefix, std::string_view query) = 0;
-	virtual void ApplySuggestion(std::string_view prefix, std::string_view suggestion) = 0;
-};
-
-#endif /* AUTOCOMPLETION_H */

src/autoreplace_cmd.cpp

@@ -362,7 +362,7 @@ static CommandCost BuildReplacementVehicle(Vehicle *old_veh, Vehicle **new_vehic
 
 	/* Refit the vehicle if needed */
 	if (refit_cargo != CARGO_NO_REFIT) {
-		uint8_t subtype = GetBestFittingSubType(old_veh, new_veh, refit_cargo);
+		byte subtype = GetBestFittingSubType(old_veh, new_veh, refit_cargo);
 
 		cost.AddCost(std::get<0>(Command<CMD_REFIT_VEHICLE>::Do(DC_EXEC, new_veh->index, refit_cargo, subtype, false, false, 0)));
 		assert(cost.Succeeded()); // This should be ensured by GetNewCargoTypeForReplace()

src/autoreplace_gui.cpp

@@ -24,8 +24,7 @@
 #include "core/geometry_func.hpp"
 #include "rail_gui.h"
 #include "road_gui.h"
-#include "dropdown_type.h"
-#include "dropdown_func.h"
+#include "widgets/dropdown_func.h"
 #include "autoreplace_cmd.h"
 #include "group_cmd.h"
 #include "settings_cmd.h"
@@ -34,6 +33,8 @@
 
 #include "safeguards.h"
 
+void DrawEngineList(VehicleType type, const Rect &r, const GUIEngineList &eng_list, uint16_t min, uint16_t max, EngineID selected_id, bool show_count, GroupID selected_group);
+
 static bool EngineNumberSorter(const GUIEngineListItem &a, const GUIEngineListItem &b)
 {
 	return Engine::Get(a.engine_id)->list_position < Engine::Get(b.engine_id)->list_position;
@@ -71,6 +72,7 @@ void AddRemoveEngineFromAutoreplaceAndBuildWindows(VehicleType type)
 static const StringID _start_replace_dropdown[] = {
 	STR_REPLACE_VEHICLES_NOW,
 	STR_REPLACE_VEHICLES_WHEN_OLD,
+	INVALID_STRING_ID
 };
 
 /**
@@ -83,7 +85,7 @@ class ReplaceVehicleWindow : public Window {
 	bool reset_sel_engine;        ///< Also reset #sel_engine while updating left and/or right and no valid engine selected.
 	GroupID sel_group;            ///< Group selected to replace.
 	int details_height;           ///< Minimal needed height of the details panels, in text lines (found so far).
-	uint8_t sort_criteria;           ///< Criteria of sorting vehicles.
+	byte sort_criteria;           ///< Criteria of sorting vehicles.
 	bool descending_sort_order;   ///< Order of sorting vehicles.
 	bool show_hidden_engines;     ///< Whether to show the hidden engines.
 	RailType sel_railtype;        ///< Type of rail tracks selected. #INVALID_RAILTYPE to show all.
@@ -111,6 +113,27 @@ class ReplaceVehicleWindow : public Window {
 		return true;
 	}
 
+	void AddChildren(const GUIEngineList &source, GUIEngineList &target, EngineID parent, int indent, int side)
+	{
+		for (const auto &item : source) {
+			if (item.variant_id != parent || item.engine_id == parent) continue;
+
+			const Engine *e = Engine::Get(item.engine_id);
+			EngineDisplayFlags flags = item.flags;
+			if (e->display_last_variant != INVALID_ENGINE) flags &= ~EngineDisplayFlags::Shaded;
+			target.emplace_back(e->display_last_variant == INVALID_ENGINE ? item.engine_id : e->display_last_variant, item.engine_id, flags, indent);
+
+			/* Add variants if not folded */
+			if ((item.flags & (EngineDisplayFlags::HasVariants | EngineDisplayFlags::IsFolded)) == EngineDisplayFlags::HasVariants) {
+				/* Add this engine again as a child */
+				if ((item.flags & EngineDisplayFlags::Shaded) == EngineDisplayFlags::None) {
+					target.emplace_back(item.engine_id, item.engine_id, EngineDisplayFlags::None, indent + 1);
+				}
+				AddChildren(source, target, item.engine_id, indent + 1, side);
+			}
+		}
+	}
+
 	/**
 	 * Generate an engines list
 	 * @param draw_left true if generating the left list, otherwise false
@@ -120,7 +143,7 @@ class ReplaceVehicleWindow : public Window {
 		std::vector<EngineID> variants;
 		EngineID selected_engine = INVALID_ENGINE;
 		VehicleType type = (VehicleType)this->window_number;
-		uint8_t side = draw_left ? 0 : 1;
+		byte side = draw_left ? 0 : 1;
 
 		GUIEngineList list;
 
@@ -167,7 +190,7 @@ class ReplaceVehicleWindow : public Window {
 		if (side == 1) {
 			/* ensure primary engine of variant group is in list */
 			for (const auto &variant : variants) {
-				if (std::ranges::find(list, variant, &GUIEngineListItem::engine_id) == list.end()) {
+				if (std::find(list.begin(), list.end(), variant) == list.end()) {
 					const Engine *e = Engine::Get(variant);
 					list.emplace_back(variant, e->info.variant_id, e->display_flags | EngineDisplayFlags::Shaded, 0);
 				}
@@ -184,7 +207,7 @@ class ReplaceVehicleWindow : public Window {
 
 		this->engines[side].clear();
 		if (side == 1) {
-			GUIEngineListAddChildren(this->engines[side], list);
+			AddChildren(list, this->engines[side], INVALID_ENGINE, 0, side);
 		} else {
 			this->engines[side].swap(list);
 		}
@@ -263,7 +286,7 @@ class ReplaceVehicleWindow : public Window {
 	}
 
 public:
-	ReplaceVehicleWindow(WindowDesc &desc, VehicleType vehicletype, GroupID id_g) : Window(desc)
+	ReplaceVehicleWindow(WindowDesc *desc, VehicleType vehicletype, GroupID id_g) : Window(desc)
 	{
 		this->sel_railtype = INVALID_RAILTYPE;
 		this->sel_roadtype = INVALID_ROADTYPE;
@@ -292,26 +315,26 @@ public:
 		this->sel_group = id_g;
 	}
 
-	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
+	void UpdateWidgetSize(WidgetID widget, Dimension *size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension *fill, [[maybe_unused]] Dimension *resize) override
 	{
 		switch (widget) {
 			case WID_RV_SORT_ASCENDING_DESCENDING: {
 				Dimension d = GetStringBoundingBox(this->GetWidget<NWidgetCore>(widget)->widget_data);
 				d.width += padding.width + Window::SortButtonWidth() * 2; // Doubled since the string is centred and it also looks better.
 				d.height += padding.height;
-				size = maxdim(size, d);
+				*size = maxdim(*size, d);
 				break;
 			}
 
 			case WID_RV_LEFT_MATRIX:
 			case WID_RV_RIGHT_MATRIX:
-				resize.height = GetEngineListHeight((VehicleType)this->window_number);
-				size.height = (this->window_number <= VEH_ROAD ? 8 : 4) * resize.height;
+				resize->height = GetEngineListHeight((VehicleType)this->window_number);
+				size->height = (this->window_number <= VEH_ROAD ? 8 : 4) * resize->height;
 				break;
 
 			case WID_RV_LEFT_DETAILS:
 			case WID_RV_RIGHT_DETAILS:
-				size.height = GetCharacterHeight(FS_NORMAL) * this->details_height + padding.height;
+				size->height = GetCharacterHeight(FS_NORMAL) * this->details_height + padding.height;
 				break;
 
 			case WID_RV_TRAIN_WAGONREMOVE_TOGGLE: {
@@ -322,7 +345,7 @@ public:
 				d = maxdim(d, GetStringBoundingBox(str));
 				d.width += padding.width;
 				d.height += padding.height;
-				size = maxdim(size, d);
+				*size = maxdim(*size, d);
 				break;
 			}
 
@@ -331,7 +354,7 @@ public:
 				d = maxdim(d, GetStringBoundingBox(STR_REPLACE_WAGONS));
 				d.width += padding.width;
 				d.height += padding.height;
-				size = maxdim(size, d);
+				*size = maxdim(*size, d);
 				break;
 			}
 
@@ -340,7 +363,7 @@ public:
 				d = maxdim(d, GetStringBoundingBox(STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED));
 				d.width += padding.width;
 				d.height += padding.height;
-				size = maxdim(size, d);
+				*size = maxdim(*size, d);
 				break;
 			}
 
@@ -351,7 +374,7 @@ public:
 				}
 				d.width += padding.width;
 				d.height += padding.height;
-				size = maxdim(size, d);
+				*size = maxdim(*size, d);
 				break;
 			}
 
@@ -362,16 +385,18 @@ public:
 				}
 				d.width += padding.width;
 				d.height += padding.height;
-				size = maxdim(size, d);
+				*size = maxdim(*size, d);
 				break;
 			}
 
 			case WID_RV_START_REPLACE: {
 				Dimension d = GetStringBoundingBox(STR_REPLACE_VEHICLES_START);
-				d = maxdim(d, GetStringListBoundingBox(_start_replace_dropdown));
+				for (int i = 0; _start_replace_dropdown[i] != INVALID_STRING_ID; i++) {
+					d = maxdim(d, GetStringBoundingBox(_start_replace_dropdown[i]));
+				}
 				d.width += padding.width;
 				d.height += padding.height;
-				size = maxdim(size, d);
+				*size = maxdim(*size, d);
 				break;
 			}
 		}
@@ -399,7 +424,7 @@ public:
 				break;
 
 			case WID_RV_SORT_DROPDOWN:
-				SetDParam(0, std::data(_engine_sort_listing[this->window_number])[this->sort_criteria]);
+				SetDParam(0, _engine_sort_listing[this->window_number][this->sort_criteria]);
 				break;
 
 			case WID_RV_TRAIN_WAGONREMOVE_TOGGLE: {
@@ -462,9 +487,11 @@ public:
 			case WID_RV_LEFT_MATRIX:
 			case WID_RV_RIGHT_MATRIX: {
 				int side = (widget == WID_RV_LEFT_MATRIX) ? 0 : 1;
+				EngineID start  = static_cast<EngineID>(this->vscroll[side]->GetPosition()); // what is the offset for the start (scrolling)
+				EngineID end    = static_cast<EngineID>(std::min<size_t>(this->vscroll[side]->GetCapacity() + start, this->engines[side].size()));
 
 				/* Do the actual drawing */
-				DrawEngineList((VehicleType)this->window_number, r, this->engines[side], *this->vscroll[side], this->sel_engine[side], side == 0, this->sel_group);
+				DrawEngineList((VehicleType)this->window_number, r, this->engines[side], start, end, this->sel_engine[side], side == 0, this->sel_group);
 				break;
 			}
 		}
@@ -538,8 +565,8 @@ public:
 
 			case WID_RV_TRAIN_ENGINEWAGON_DROPDOWN: {
 				DropDownList list;
-				list.push_back(MakeDropDownListStringItem(STR_REPLACE_ENGINES, 1));
-				list.push_back(MakeDropDownListStringItem(STR_REPLACE_WAGONS, 0));
+				list.push_back(std::make_unique<DropDownListStringItem>(STR_REPLACE_ENGINES, 1, false));
+				list.push_back(std::make_unique<DropDownListStringItem>(STR_REPLACE_WAGONS, 0, false));
 				ShowDropDownList(this, std::move(list), this->replace_engines ? 1 : 0, WID_RV_TRAIN_ENGINEWAGON_DROPDOWN);
 				break;
 			}
@@ -582,7 +609,7 @@ public:
 
 			case WID_RV_LEFT_MATRIX:
 			case WID_RV_RIGHT_MATRIX: {
-				uint8_t click_side;
+				byte click_side;
 				if (widget == WID_RV_LEFT_MATRIX) {
 					click_side = 0;
 				} else {
@@ -594,7 +621,7 @@ public:
 				if (it != this->engines[click_side].end()) {
 					const auto &item = *it;
 					const Rect r = this->GetWidget<NWidgetBase>(widget)->GetCurrentRect().Shrink(WidgetDimensions::scaled.matrix).WithWidth(WidgetDimensions::scaled.hsep_indent * (item.indent + 1), _current_text_dir == TD_RTL);
-					if (HasFlag(item.flags, EngineDisplayFlags::HasVariants) && IsInsideMM(r.left, r.right, pt.x)) {
+					if ((item.flags & EngineDisplayFlags::HasVariants) != EngineDisplayFlags::None && IsInsideMM(r.left, r.right, pt.x)) {
 						/* toggle folded flag on engine */
 						assert(item.variant_id != INVALID_ENGINE);
 						Engine *engine = Engine::Get(item.variant_id);
@@ -604,7 +631,7 @@ public:
 						InvalidateWindowClassesData(WC_BUILD_VEHICLE); // The build windows needs updating as well
 						return;
 					}
-					if (!HasFlag(item.flags, EngineDisplayFlags::Shaded)) e = item.engine_id;
+					if ((item.flags & EngineDisplayFlags::Shaded) == EngineDisplayFlags::None) e = item.engine_id;
 				}
 
 				/* If Ctrl is pressed on the left side and we don't have any engines of the selected type, stop autoreplacing.
@@ -715,10 +742,10 @@ static constexpr NWidgetPart _nested_replace_rail_vehicle_widgets[] = {
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
 		NWidget(WWT_PANEL, COLOUR_GREY),
-			NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_REPLACE_VEHICLE_VEHICLES_IN_USE, STR_REPLACE_VEHICLE_VEHICLES_IN_USE_TOOLTIP), SetFill(1, 1), SetMinimalTextLines(1, WidgetDimensions::unscaled.framerect.Vertical()), SetResize(1, 0),
+			NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_REPLACE_VEHICLE_VEHICLES_IN_USE, STR_REPLACE_VEHICLE_VEHICLES_IN_USE_TOOLTIP), SetFill(1, 1), SetMinimalSize(0, 12), SetResize(1, 0),
 		EndContainer(),
 		NWidget(WWT_PANEL, COLOUR_GREY),
-			NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES, STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES_TOOLTIP), SetFill(1, 1), SetMinimalTextLines(1, WidgetDimensions::unscaled.framerect.Vertical()), SetResize(1, 0),
+			NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES, STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES_TOOLTIP), SetFill(1, 1), SetMinimalSize(0, 12), SetResize(1, 0),
 		EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
@@ -762,11 +789,11 @@ static constexpr NWidgetPart _nested_replace_rail_vehicle_widgets[] = {
 	EndContainer(),
 };
 
-static WindowDesc _replace_rail_vehicle_desc(
+static WindowDesc _replace_rail_vehicle_desc(__FILE__, __LINE__,
 	WDP_AUTO, "replace_vehicle_train", 500, 140,
 	WC_REPLACE_VEHICLE, WC_NONE,
 	WDF_CONSTRUCTION,
-	_nested_replace_rail_vehicle_widgets
+	std::begin(_nested_replace_rail_vehicle_widgets), std::end(_nested_replace_rail_vehicle_widgets)
 );
 
 static constexpr NWidgetPart _nested_replace_road_vehicle_widgets[] = {
@@ -779,10 +806,10 @@ static constexpr NWidgetPart _nested_replace_road_vehicle_widgets[] = {
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
 		NWidget(WWT_PANEL, COLOUR_GREY),
-			NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_REPLACE_VEHICLE_VEHICLES_IN_USE, STR_REPLACE_VEHICLE_VEHICLES_IN_USE_TOOLTIP), SetFill(1, 1), SetMinimalTextLines(1, WidgetDimensions::unscaled.framerect.Vertical()), SetResize(1, 0),
+			NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_REPLACE_VEHICLE_VEHICLES_IN_USE, STR_REPLACE_VEHICLE_VEHICLES_IN_USE_TOOLTIP), SetFill(1, 1), SetMinimalSize(0, 12), SetResize(1, 0),
 		EndContainer(),
 		NWidget(WWT_PANEL, COLOUR_GREY),
-			NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES, STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES_TOOLTIP), SetFill(1, 1), SetMinimalTextLines(1, WidgetDimensions::unscaled.framerect.Vertical()), SetResize(1, 0),
+			NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES, STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES_TOOLTIP), SetFill(1, 1), SetMinimalSize(0, 12), SetResize(1, 0),
 		EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
@@ -820,11 +847,11 @@ static constexpr NWidgetPart _nested_replace_road_vehicle_widgets[] = {
 	EndContainer(),
 };
 
-static WindowDesc _replace_road_vehicle_desc(
+static WindowDesc _replace_road_vehicle_desc(__FILE__, __LINE__,
 	WDP_AUTO, "replace_vehicle_road", 500, 140,
 	WC_REPLACE_VEHICLE, WC_NONE,
 	WDF_CONSTRUCTION,
-	_nested_replace_road_vehicle_widgets
+	std::begin(_nested_replace_road_vehicle_widgets), std::end(_nested_replace_road_vehicle_widgets)
 );
 
 static constexpr NWidgetPart _nested_replace_vehicle_widgets[] = {
@@ -837,10 +864,10 @@ static constexpr NWidgetPart _nested_replace_vehicle_widgets[] = {
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
 		NWidget(WWT_PANEL, COLOUR_GREY),
-			NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_REPLACE_VEHICLE_VEHICLES_IN_USE, STR_REPLACE_VEHICLE_VEHICLES_IN_USE_TOOLTIP), SetFill(1, 1), SetMinimalTextLines(1, WidgetDimensions::unscaled.framerect.Vertical()), SetResize(1, 0),
+			NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_REPLACE_VEHICLE_VEHICLES_IN_USE, STR_REPLACE_VEHICLE_VEHICLES_IN_USE_TOOLTIP), SetFill(1, 1), SetMinimalSize(0, 12), SetResize(1, 0),
 		EndContainer(),
 		NWidget(WWT_PANEL, COLOUR_GREY),
-			NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES, STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES_TOOLTIP), SetFill(1, 1), SetMinimalTextLines(1, WidgetDimensions::unscaled.framerect.Vertical()), SetResize(1, 0),
+			NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES, STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES_TOOLTIP), SetFill(1, 1), SetMinimalSize(0, 12), SetResize(1, 0),
 		EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
@@ -874,11 +901,11 @@ static constexpr NWidgetPart _nested_replace_vehicle_widgets[] = {
 	EndContainer(),
 };
 
-static WindowDesc _replace_vehicle_desc(
+static WindowDesc _replace_vehicle_desc(__FILE__, __LINE__,
 	WDP_AUTO, "replace_vehicle", 456, 118,
 	WC_REPLACE_VEHICLE, WC_NONE,
 	WDF_CONSTRUCTION,
-	_nested_replace_vehicle_widgets
+	std::begin(_nested_replace_vehicle_widgets), std::end(_nested_replace_vehicle_widgets)
 );
 
 /**
@@ -889,9 +916,11 @@ static WindowDesc _replace_vehicle_desc(
 void ShowReplaceGroupVehicleWindow(GroupID id_g, VehicleType vehicletype)
 {
 	CloseWindowById(WC_REPLACE_VEHICLE, vehicletype);
+	WindowDesc *desc;
 	switch (vehicletype) {
-		case VEH_TRAIN: new ReplaceVehicleWindow(_replace_rail_vehicle_desc, vehicletype, id_g); break;
-		case VEH_ROAD:  new ReplaceVehicleWindow(_replace_road_vehicle_desc, vehicletype, id_g); break;
-		default:        new ReplaceVehicleWindow(_replace_vehicle_desc, vehicletype, id_g);      break;
+		case VEH_TRAIN: desc = &_replace_rail_vehicle_desc; break;
+		case VEH_ROAD:  desc = &_replace_road_vehicle_desc; break;
+		default:        desc = &_replace_vehicle_desc;      break;
 	}
+	new ReplaceVehicleWindow(desc, vehicletype, id_g);
 }

src/autoslope.h

@@ -16,7 +16,7 @@
 
 /**
  * Autoslope check for tiles with an entrance on an edge.
- * E.g. depots and bay road-stops.
+ * E.g. depots and non-drive-through-road-stops.
  *
  * The test succeeds if the slope is not steep and at least one corner of the entrance edge is on the TileMaxZ() level.
  *
@@ -34,27 +34,6 @@ inline bool AutoslopeCheckForEntranceEdge(TileIndex tile, int z_new, Slope tileh
 	return ((tileh_new == SLOPE_FLAT) || CanBuildDepotByTileh(entrance, tileh_new));
 }
 
-/**
- * Autoslope check for tiles with something built along an axis.
- * E.g. railway stations and drive through road stops.
- *
- * The test succeeds if the slope is not steep and at least one corner at either of the entrance edges is on the TileMaxZ() level.
- *
- * @note The test does not check if autoslope is enabled at all.
- *
- * @param tile The tile.
- * @param z_new New TileZ.
- * @param tileh_new New TileSlope.
- * @param axis The axis.
- * @return true iff terraforming is allowed.
- */
-inline bool AutoslopeCheckForAxis(TileIndex tile, int z_new, Slope tileh_new, Axis axis)
-{
-	DiagDirection direction = AxisToDiagDir(axis);
-	return AutoslopeCheckForEntranceEdge(tile, z_new, tileh_new, direction) &&
-		AutoslopeCheckForEntranceEdge(tile, z_new, tileh_new, ReverseDiagDir(direction));
-}
-
 /**
  * Tests if autoslope is enabled for _current_company.
  *

src/base_media_base.h

@@ -158,8 +158,8 @@ struct BaseSet {
 	 */
 	std::optional<std::string> GetTextfile(TextfileType type) const
 	{
-		for (const auto &file : this->files) {
-			auto textfile = ::GetTextfile(type, BASESET_DIR, file.filename);
+		for (uint i = 0; i < NUM_FILES; i++) {
+			auto textfile = ::GetTextfile(type, BASESET_DIR, this->files[i].filename);
 			if (textfile.has_value()) {
 				return textfile;
 			}
@@ -313,8 +313,8 @@ static const uint NUM_SONGS_AVAILABLE = 1 + NUM_SONG_CLASSES * NUM_SONGS_CLASS;
 static const uint NUM_SONGS_PLAYLIST  = 32;
 
 /* Functions to read DOS music CAT files, similar to but not quite the same as sound effect CAT files */
-std::optional<std::string> GetMusicCatEntryName(const std::string &filename, size_t entrynum);
-std::optional<std::vector<uint8_t>> GetMusicCatEntryData(const std::string &filename, size_t entrynum);
+char *GetMusicCatEntryName(const std::string &filename, size_t entrynum);
+byte *GetMusicCatEntryData(const std::string &filename, size_t entrynum, size_t &entrylen);
 
 enum MusicTrackType {
 	MTT_STANDARDMIDI, ///< Standard MIDI file
@@ -324,7 +324,7 @@ enum MusicTrackType {
 /** Metadata about a music track. */
 struct MusicSongInfo {
 	std::string songname;    ///< name of song displayed in UI
-	uint8_t tracknr;            ///< track number of song displayed in UI
+	byte tracknr;            ///< track number of song displayed in UI
 	std::string filename;    ///< file on disk containing song (when used in MusicSet class)
 	MusicTrackType filetype; ///< decoder required for song file
 	int cat_index;           ///< entry index in CAT file, for filetype==MTT_MPSMIDI
@@ -338,7 +338,7 @@ struct MusicSet : BaseSet<MusicSet, NUM_SONGS_AVAILABLE, false> {
 	/** Data about individual songs in set. */
 	MusicSongInfo songinfo[NUM_SONGS_AVAILABLE];
 	/** Number of valid songs in set. */
-	uint8_t num_available;
+	byte num_available;
 
 	bool FillSetDetails(const IniFile &ini, const std::string &path, const std::string &full_filename);
 };

src/base_media_func.h

@@ -325,8 +325,8 @@ template <class Tbase_set> const char *TryGetBaseSetFile(const ContentInfo *ci,
 		if (!md5sum) return s->files[0].filename.c_str();
 
 		MD5Hash md5;
-		for (const auto &file : s->files) {
-			md5 ^= file.hash;
+		for (uint i = 0; i < Tbase_set::NUM_FILES; i++) {
+			md5 ^= s->files[i].hash;
 		}
 		if (md5 == ci->md5sum) return s->files[0].filename.c_str();
 	}

src/base_station_base.h

@@ -19,11 +19,16 @@
 typedef Pool<BaseStation, StationID, 32, 64000> StationPool;
 extern StationPool _station_pool;
 
-template <typename T>
-struct SpecMapping {
-	const T *spec; ///< Custom spec.
-	uint32_t grfid; ///< GRF ID of this custom spec.
-	uint16_t localidx; ///< Local ID within GRF of this custom spec.
+struct StationSpecList {
+	const StationSpec *spec;
+	uint32_t grfid;      ///< GRF ID of this custom station
+	uint16_t localidx; ///< Station ID within GRF of station
+};
+
+struct RoadStopSpecList {
+	const RoadStopSpec *spec;
+	uint32_t grfid;      ///< GRF ID of this custom road stop
+	uint16_t localidx; ///< Station ID within GRF of road stop
 };
 
 struct RoadStopTileData {
@@ -59,7 +64,7 @@ struct StationRect : public Rect {
 struct BaseStation : StationPool::PoolItem<&_station_pool> {
 	TileIndex xy;                   ///< Base tile of the station
 	TrackedViewportSign sign;       ///< NOSAVE: Dimensions of sign
-	uint8_t delete_ctr;                ///< Delete counter. If greater than 0 then it is decremented until it reaches 0; the waypoint is then is deleted.
+	byte delete_ctr;                ///< Delete counter. If greater than 0 then it is decremented until it reaches 0; the waypoint is then is deleted.
 
 	std::string name;               ///< Custom name
 	StringID string_id;             ///< Default name (town area) of station
@@ -69,13 +74,13 @@ struct BaseStation : StationPool::PoolItem<&_station_pool> {
 	Owner owner;                    ///< The owner of this station
 	StationFacility facilities;     ///< The facilities that this station has
 
-	std::vector<SpecMapping<StationSpec>> speclist;           ///< List of rail station specs of this station.
-	std::vector<SpecMapping<RoadStopSpec>> roadstop_speclist; ///< List of road stop specs of this station
+	std::vector<StationSpecList> speclist;           ///< List of rail station specs of this station.
+	std::vector<RoadStopSpecList> roadstop_speclist; ///< List of road stop specs of this station
 
 	TimerGameCalendar::Date build_date; ///< Date of construction
 
 	uint16_t random_bits;             ///< Random bits assigned to this station
-	uint8_t waiting_triggers;          ///< Waiting triggers (NewGRF) for this station
+	byte waiting_triggers;          ///< Waiting triggers (NewGRF) for this station
 	uint8_t cached_anim_triggers;                ///< NOSAVE: Combined animation trigger bitmask, used to determine if trigger processing should happen.
 	uint8_t cached_roadstop_anim_triggers;       ///< NOSAVE: Combined animation trigger bitmask for road stops, used to determine if trigger processing should happen.
 	CargoTypes cached_cargo_triggers;          ///< NOSAVE: Combined cargo trigger bitmask
@@ -113,7 +118,7 @@ struct BaseStation : StationPool::PoolItem<&_station_pool> {
 	 * @param available will return false if ever the variable asked for does not exist
 	 * @return the value stored in the corresponding variable
 	 */
-	virtual uint32_t GetNewGRFVariable(const struct ResolverObject &object, uint8_t variable, uint8_t parameter, bool &available) const = 0;
+	virtual uint32_t GetNewGRFVariable(const struct ResolverObject &object, byte variable, byte parameter, bool *available) const = 0;
 
 	/**
 	 * Update the coordinated of the sign (as shown in the viewport).
@@ -179,7 +184,7 @@ struct BaseStation : StationPool::PoolItem<&_station_pool> {
 		return (this->facilities & ~FACIL_WAYPOINT) != 0;
 	}
 
-	inline uint8_t GetRoadStopRandomBits(TileIndex tile) const
+	inline byte GetRoadStopRandomBits(TileIndex tile) const
 	{
 		for (const RoadStopTileData &tile_data : this->custom_roadstop_tile_data) {
 			if (tile_data.tile == tile) return tile_data.random_bits;
@@ -187,7 +192,7 @@ struct BaseStation : StationPool::PoolItem<&_station_pool> {
 		return 0;
 	}
 
-	inline uint8_t GetRoadStopAnimationFrame(TileIndex tile) const
+	inline byte GetRoadStopAnimationFrame(TileIndex tile) const
 	{
 		for (const RoadStopTileData &tile_data : this->custom_roadstop_tile_data) {
 			if (tile_data.tile == tile) return tile_data.animation_frame;
@@ -196,11 +201,11 @@ struct BaseStation : StationPool::PoolItem<&_station_pool> {
 	}
 
 private:
-	bool SetRoadStopTileData(TileIndex tile, uint8_t data, bool animation);
+	void SetRoadStopTileData(TileIndex tile, byte data, bool animation);
 
 public:
-	inline void SetRoadStopRandomBits(TileIndex tile, uint8_t random_bits) { this->SetRoadStopTileData(tile, random_bits, false); }
-	inline bool SetRoadStopAnimationFrame(TileIndex tile, uint8_t frame) { return this->SetRoadStopTileData(tile, frame, true); }
+	inline void SetRoadStopRandomBits(TileIndex tile, byte random_bits) { this->SetRoadStopTileData(tile, random_bits, false); }
+	inline void SetRoadStopAnimationFrame(TileIndex tile, byte frame) { this->SetRoadStopTileData(tile, frame, true); }
 	void RemoveRoadStopTileData(TileIndex tile);
 
 	static void PostDestructor(size_t index);
@@ -221,7 +226,7 @@ struct SpecializedStation : public BaseStation {
 	 * Set station type correctly
 	 * @param tile The base tile of the station.
 	 */
-	inline SpecializedStation(TileIndex tile) :
+	inline SpecializedStation<T, Tis_waypoint>(TileIndex tile) :
 			BaseStation(tile)
 	{
 		this->facilities = EXPECTED_FACIL;
@@ -305,14 +310,4 @@ struct SpecializedStation : public BaseStation {
 	static Pool::IterateWrapper<T> Iterate(size_t from = 0) { return Pool::IterateWrapper<T>(from); }
 };
 
-/**
- * Get spec mapping list for each supported custom spec type.
- * @tparam T Spec type.
- * @param bst Station of custom spec list.
- * @return Speclist of custom spec type.
- */
-template <class T> std::vector<SpecMapping<T>> &GetStationSpecList(BaseStation *bst);
-template <> inline std::vector<SpecMapping<StationSpec>> &GetStationSpecList<StationSpec>(BaseStation *bst) { return bst->speclist; }
-template <> inline std::vector<SpecMapping<RoadStopSpec>> &GetStationSpecList<RoadStopSpec>(BaseStation *bst) { return bst->roadstop_speclist; }
-
 #endif /* BASE_STATION_BASE_H */