Add: Changelog entries for 1.11.1 release

#9042 did not fix all combinations of scaling options. This additional
change makes the server list automatically fill available height.

.dorpsgek.yml

@@ -10,7 +10,6 @@ notifications:
     only-by:
     - DorpsGek
   commit-comment:
-  discussion:
   pull-request:
   issue:
   tag-created:

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,7 @@
+## Version of OpenTTD
+
+## Expected result
+
+## Actual result
+
+## Steps to reproduce

.github/ISSUE_TEMPLATE/bug.yaml

@@ -1,41 +0,0 @@
-name: Bug Report
-description: Found a bug in OpenTTD?
-title: "[Bug]: "
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-  - type: input
-    id: version
-    attributes:
-      label: Version of OpenTTD
-      description: Fill in below what version of OpenTTD you are using, including your OS.
-      placeholder: ex. 1.11.2, Windows 10
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected result
-      description: Describe in a few words what you expected to happen.
-    validations:
-      required: true
-  - type: textarea
-    id: actual
-    attributes:
-      label: Actual result
-      description: Describe in a few words what actually happens.
-    validations:
-      required: true
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: Steps to reproduce
-      description: As detailed as possible, please tell us how we can reproduce this. Feel free to attach a savegame (zip it first) to make it more clear.
-      placeholder: |
-        1. Loaded the attached savegame.
-        2. Click on the button left of that other icon.
-        3. The window doesn't open.
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-- name: Suggestions and ideas?
-  url: https://www.tt-forums.net/viewforum.php?f=32
-  about: Have a suggestion or an idea for a cool new feature? Post them on our forum!

.github/ISSUE_TEMPLATE/crash.yaml

@@ -1,37 +0,0 @@
-name: Crash
-description: Did OpenTTD crash?
-title: "[Crash]: "
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this crash report!
-  - type: input
-    id: version
-    attributes:
-      label: Version of OpenTTD
-      description: Fill in below what version of OpenTTD you are using, including your OS.
-      placeholder: ex. 1.11.2, Windows 10
-    validations:
-      required: true
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: Steps to reproduce
-      description: Please spend a few words if you can reproduce this problem.
-      placeholder: |
-        1. Bought a new train.
-        2. The game crashed.
-    validations:
-      required: true
-  - type: textarea
-    id: crashlogs
-    attributes:
-      label: Upload crash files
-      description: With the `crash.log`, `crash.dmp`, and `crash.sav` we can analyze the crash in detail; this way you allow us to easier triage and fix the problem.
-      placeholder: |
-        1. Zip the `crash.log`, `crash.dmp` and `crash.sav`.
-        2. Click on this field.
-        3. Drag and drop the zip file in here.
-    validations:
-      required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -39,7 +39,6 @@ Describe here
 
 Some things are not automated, and forgotten often. This list is a reminder for the reviewers.
 * The bug fix is important enough to be backported? (label: 'backport requested')
-* This PR touches english.txt or translations? Check the [guidelines](https://github.com/OpenTTD/OpenTTD/blob/master/docs/eints.md)
 * This PR affects the save game format? (label 'savegame upgrade')
 * This PR affects the GS/AI API? (label 'needs review: Script API')
     * ai_changelog.hpp, gs_changelog.hpp need updating.

.github/changelog.sh

@@ -4,9 +4,9 @@ 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]\+[^-]'
+    grep='^[0-9]\+\.[0-9]\+\.[0-9]\+[^-]'
     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 }'
+    cat changelog.txt | awk 'BEGIN { show="false" } /^[0-9]+.[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

@@ -1,221 +0,0 @@
-"""
-Script to scan the OpenTTD source-tree for STR_ entries that are defined but
-no longer used.
-
-This is not completely trivial, as OpenTTD references a lot of strings in
-relation to another string. The most obvious example of this is a list. OpenTTD
-only references the first entry in the list, and does "+ <var>" to get to the
-correct string.
-
-There are other ways OpenTTD does use relative values. This script tries to
-account for all of them, to give the best approximation we have for "this
-string is unused".
-"""
-
-import glob
-import os
-import re
-import subprocess
-import sys
-
-from enum import Enum
-
-LENGTH_NAME_LOOKUP = {
-    "VEHICLE_TYPES": 4,
-}
-
-
-class SkipType(Enum):
-    NONE = 1
-    LENGTH = 2
-    EXTERNAL = 3
-    ZERO_IS_SPECIAL = 4
-    EXPECT_NEWLINE = 5
-
-
-def read_language_file(filename, strings_found, errors):
-    strings_defined = []
-
-    skip = SkipType.NONE
-    length = 0
-    common_prefix = ""
-    last_tiny_string = ""
-
-    with open(filename) as fp:
-        for line in fp.readlines():
-            if not line.strip():
-                if skip == SkipType.EXPECT_NEWLINE:
-                    skip = SkipType.NONE
-                continue
-
-            line = line.strip()
-
-            if skip == SkipType.EXPECT_NEWLINE:
-                # The only thing allowed after a list, is this next marker, or a newline.
-                if line == "###next-name-looks-similar":
-                    # "###next-name-looks-similar"
-                    # Indicates the common prefix of the last list has a very
-                    # similar name to the next entry, but isn't part of the
-                    # list. So do not emit a warning about them looking very
-                    # similar.
-
-                    if length != 0:
-                        errors.append(f"ERROR: list around {name} is shorted than indicated by ###length")
-
-                    common_prefix = ""
-                else:
-                    errors.append(f"ERROR: expected a newline after a list, but didn't find any around {name}. Did you add an entry to the list without increasing the length?")
-
-                skip = SkipType.NONE
-
-            if line[0] == "#":
-                if line.startswith("###length "):
-                    # "###length <count>"
-                    # Indicates the next few entries are part of a list. Only
-                    # the first entry is possibly referenced, and the rest are
-                    # indirectly.
-
-                    if length != 0:
-                        errors.append(f"ERROR: list around {name} is shorted than indicated by ###length")
-
-                    length = line.split(" ")[1].strip()
-
-                    if length.isnumeric():
-                        length = int(length)
-                    else:
-                        length = LENGTH_NAME_LOOKUP[length]
-
-                    skip = SkipType.LENGTH
-                elif line.startswith("###external "):
-                    # "###external <count>"
-                    # Indicates the next few entries are used outside the
-                    # source and will not be referenced.
-
-                    if length != 0:
-                        errors.append(f"ERROR: list around {name} is shorted than indicated by ###length")
-
-                    length = line.split(" ")[1].strip()
-                    length = int(length)
-
-                    skip = SkipType.EXTERNAL
-                elif line.startswith("###setting-zero-is-special"):
-                    # "###setting-zero-is-special"
-                    # Indicates the next entry is part of the "zero is special"
-                    # flag of settings. These entries are not referenced
-                    # directly in the code.
-
-                    if length != 0:
-                        errors.append(f"ERROR: list around {name} is shorted than indicated by ###length")
-
-                    skip = SkipType.ZERO_IS_SPECIAL
-
-                continue
-
-            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
-
-            if skip == SkipType.LENGTH:
-                skip = SkipType.NONE
-                length -= 1
-                common_prefix = name
-            elif skip == SkipType.ZERO_IS_SPECIAL:
-                strings_found.add(name)
-            elif length > 0:
-                strings_found.add(name)
-                length -= 1
-
-                # Find the common prefix of these strings
-                for i in range(len(common_prefix)):
-                    if common_prefix[0 : i + 1] != name[0 : i + 1]:
-                        common_prefix = common_prefix[0:i]
-                        break
-
-                if length == 0:
-                    skip = SkipType.EXPECT_NEWLINE
-
-                    if len(common_prefix) < 6:
-                        errors.append(f"ERROR: common prefix of block including {name} was reduced to {common_prefix}. This means the names in the list are not consistent.")
-            elif common_prefix:
-                if name.startswith(common_prefix):
-                    errors.append(f"ERROR: {name} looks a lot like block above with prefix {common_prefix}. This mostly means that the list length was too short. Use '###next-name-looks-similar' if it is not.")
-                common_prefix = ""
-
-    return strings_defined
-
-
-def scan_source_files(path, strings_found):
-    for new_path in glob.glob(f"{path}/*"):
-        if os.path.isdir(new_path):
-            scan_source_files(new_path, strings_found)
-            continue
-
-        if not new_path.endswith((".c", ".h", ".cpp", ".hpp", ".ini")):
-            continue
-
-        # Most files we can just open, but some use magic, that requires the
-        # G++ preprocessor before we can make sense out of it.
-        if new_path == "src/table/cargo_const.h":
-            p = subprocess.run(["g++", "-E", new_path], stdout=subprocess.PIPE)
-            output = p.stdout.decode()
-        else:
-            with open(new_path) as fp:
-                output = fp.read()
-
-        # Find all the string references.
-        matches = re.findall(r"[^A-Z_](STR_[A-Z0-9_]*)", output)
-        strings_found.update(matches)
-
-
-def main():
-    strings_found = set()
-    errors = []
-
-    scan_source_files("src", strings_found)
-    strings_defined = read_language_file("src/lang/english.txt", strings_found, errors)
-
-    # STR_LAST_STRINGID is special, and not really a string.
-    strings_found.remove("STR_LAST_STRINGID")
-    # These are mentioned in comments, not really a string.
-    strings_found.remove("STR_XXX")
-    strings_found.remove("STR_NEWS")
-    strings_found.remove("STR_CONTENT_TYPE_")
-
-    # This string is added for completion, but never used.
-    strings_defined.remove("STR_JUST_DATE_SHORT")
-
-    strings_defined = sorted(strings_defined)
-    strings_found = sorted(list(strings_found))
-
-    for string in strings_found:
-        if string not in strings_defined:
-            errors.append(f"ERROR: {string} found but never defined.")
-
-    for string in strings_defined:
-        if string not in strings_found:
-            errors.append(f"ERROR: {string} is (possibly) no longer needed.")
-
-    if errors:
-        for error in errors:
-            print(error)
-        sys.exit(1)
-    else:
-        print("OK")
-
-
-if __name__ == "__main__":
-    main()

.github/workflows/ci-build.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-20.04
     container:
       # If you change this version, change the number in the cache step too.
-      image: emscripten/emsdk:2.0.31
+      image: emscripten/emsdk:2.0.10
 
     steps:
     - name: Checkout
@@ -26,12 +26,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: /emsdk/upstream/emscripten/cache
-        key: 2.0.31-${{ runner.os }}
-
-    - name: Patch Emscripten to support LZMA
-      run: |
-        cd /emsdk/upstream/emscripten
-        patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch
+        key: 2.0.10-${{ runner.os }}
 
     - name: Build (host tools)
       run: |
@@ -82,7 +77,7 @@ jobs:
           libsdl: libsdl1.2-dev
         - compiler: gcc
           cxxcompiler: g++
-          extra-cmake-parameters: -DOPTION_DEDICATED=ON -DCMAKE_CXX_FLAGS_INIT="-DRANDOM_DEBUG"
+          extra-cmake-parameters: -DOPTION_DEDICATED=ON
 
     runs-on: ubuntu-20.04
     env:
@@ -148,7 +143,7 @@ jobs:
     - name: Test
       run: |
         cd build
-        ctest -j $(nproc) --timeout 120
+        ctest -j $(nproc)
 
   macos:
     name: Mac OS
@@ -162,7 +157,7 @@ jobs:
 
     runs-on: macos-latest
     env:
-      MACOSX_DEPLOYMENT_TARGET: 10.14
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
     steps:
     - name: Checkout
@@ -229,7 +224,7 @@ jobs:
     - name: Test
       run: |
         cd build
-        ctest -j $(sysctl -n hw.logicalcpu) --timeout 120
+        ctest -j $(sysctl -n hw.logicalcpu)
 
   windows:
     name: Windows
@@ -237,7 +232,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, windows-2019]
+        os: [windows-latest, windows-2016]
         arch: [x86, x64]
 
     runs-on: ${{ matrix.os }}
@@ -319,93 +314,4 @@ jobs:
       shell: bash
       run: |
         cd ${GITHUB_WORKSPACE}/build
-        ctest --timeout 120
-
-
-  msys2:
-    name: msys2
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - msystem: MINGW64
-            arch: x86_64
-          - msystem: MINGW32
-            arch: i686
-
-    runs-on: windows-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - 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
-
-    - 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}
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake .. -G"MSYS Makefiles"
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        cmake --build . -j $(nproc)
-        echo "::endgroup::"
-
-    - name: Test
-      shell: msys2 {0}
-      run: |
-        cd build
-        ctest -j $(nproc) --timeout 120
-
-  check_annotations:
-    name: Check Annotations
-    needs:
-    - emscripten
-    - linux
-    - macos
-    - windows
-    - msys2
-
-    if: always() && github.event_name == 'pull_request'
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Check annotations
-      uses: OpenTTD/actions/annotation-check@v2
+        ctest

.github/workflows/commit-checker.yml

@@ -15,7 +15,37 @@ jobs:
         fetch-depth: 4
 
     - name: Get pull-request commits
-      uses: OpenTTD/actions/checkout-pull-request@v2
+      run: |
+        set -x
+        # actions/checkout did a merge checkout of the pull-request. As such, the first
+        # commit is the merge commit. This means that on HEAD^ is the base branch, and
+        # on HEAD^2 are the commits from the pull-request. We now check if those trees
+        # have a common parent. If not, we fetch a few more commits till we do. In result,
+        # the log between HEAD^ and HEAD^2 will be the commits in the pull-request.
+        DEPTH=4
+        while [ -z "$(git merge-base HEAD^ HEAD^2)" ]; do
+            # Prevent infinite recursion
+            if [ ${DEPTH} -gt 256 ]; then
+                echo "No common parent between '${GITHUB_HEAD_REF}' and '${GITHUB_BASE_REF}'." >&2
+                exit 1
+            fi
+
+            git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --deepen=${DEPTH} origin HEAD
+            DEPTH=$(( ${DEPTH} * 4 ))
+        done
+
+        # Just to show which commits we are going to evaluate.
+        git log --oneline HEAD^..HEAD^2
+
+    - name: Checkout commit-checker
+      uses: actions/checkout@v2
+      with:
+        repository: OpenTTD/OpenTTD-git-hooks
+        path: git-hooks
+        ref: master
 
     - name: Check commits
-      uses: OpenTTD/OpenTTD-git-hooks@main
+      run: |
+        set -x
+        HOOKS_DIR=./git-hooks/hooks GIT_DIR=.git ./git-hooks/hooks/check-commits.sh HEAD^..HEAD^2
+        echo "Commit checks passed"

.github/workflows/preview_build.yml

@@ -12,7 +12,9 @@ jobs:
     runs-on: ubuntu-20.04
     container:
       # If you change this version, change the number in the cache step too.
-      image: emscripten/emsdk:2.0.31
+      image: emscripten/emsdk:2.0.10
+      # uid=1001(runner) gid=121(docker)
+      options: -u 1001:121
 
     steps:
     - name: Update deployment status to in progress
@@ -44,12 +46,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: /emsdk/upstream/emscripten/cache
-        key: 2.0.31-${{ runner.os }}
-
-    - name: Patch Emscripten to support LZMA
-      run: |
-        cd /emsdk/upstream/emscripten
-        patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch
+        key: 2.0.10-${{ runner.os }}
 
     - name: Build (host tools)
       run: |
@@ -76,7 +73,7 @@ jobs:
         echo "::group::CMake"
         emcmake cmake .. \
           -DHOST_BINARY_DIR=../build-host \
-          -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
           # EOF
         echo "::endgroup::"
 
@@ -87,15 +84,18 @@ jobs:
 
     - name: Publish preview
       run: |
+        # setuptools is missing in this Docker image, which breaks installing
+        # awscli. So we need to do this in two steps to recover sanity.
+        pip3 install setuptools
         pip3 install awscli
 
-        aws s3 cp --only-show-errors build/openttd.data s3://${{ secrets.PREVIEW_S3_BUCKET }}/${{ github.event.client_payload.folder }}/
-        aws s3 cp --only-show-errors build/openttd.html s3://${{ secrets.PREVIEW_S3_BUCKET }}/${{ github.event.client_payload.folder }}/
-        aws s3 cp --only-show-errors build/openttd.js s3://${{ secrets.PREVIEW_S3_BUCKET }}/${{ github.event.client_payload.folder }}/
-        aws s3 cp --only-show-errors build/openttd.wasm s3://${{ secrets.PREVIEW_S3_BUCKET }}/${{ github.event.client_payload.folder }}/
+        ~/.local/bin/aws s3 cp --only-show-errors build/openttd.data s3://${{ secrets.PREVIEW_S3_BUCKET }}/${{ github.event.client_payload.folder }}/
+        ~/.local/bin/aws s3 cp --only-show-errors build/openttd.html s3://${{ secrets.PREVIEW_S3_BUCKET }}/${{ github.event.client_payload.folder }}/
+        ~/.local/bin/aws s3 cp --only-show-errors build/openttd.js s3://${{ secrets.PREVIEW_S3_BUCKET }}/${{ github.event.client_payload.folder }}/
+        ~/.local/bin/aws s3 cp --only-show-errors build/openttd.wasm s3://${{ secrets.PREVIEW_S3_BUCKET }}/${{ github.event.client_payload.folder }}/
 
         # Invalidate the cache of the CloudFront distribution
-        aws cloudfront create-invalidation --distribution-id ${{ secrets.PREVIEW_CF_DISTRIBUTION_ID }} --paths "/${{ github.event.client_payload.folder }}/*"
+        ~/.local/bin/aws cloudfront create-invalidation --distribution-id ${{ secrets.PREVIEW_CF_DISTRIBUTION_ID }} --paths "/${{ github.event.client_payload.folder }}/*"
       env:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/release.yml

@@ -373,16 +373,14 @@ jobs:
         include:
         - container_image: "ubuntu:18.04"
           bundle_name: "bionic"
-          compiler: "g++-8"
         - container_image: "ubuntu:20.04"
           bundle_name: "focal"
-          compiler: "g++"
+        - container_image: "ubuntu:20.10"
+          bundle_name: "groovy"
         - container_image: "debian:buster"
           bundle_name: "buster"
-          compiler: "g++"
         - container_image: "debian:bullseye"
           bundle_name: "bullseye"
-          compiler: "g++"
 
     runs-on: ubuntu-20.04
     container:
@@ -408,7 +406,7 @@ jobs:
         apt-get install -y --no-install-recommends \
           cmake \
           debhelper \
-          ${{ matrix.compiler }} \
+          g++ \
           git \
           make \
           openssl \
@@ -434,7 +432,7 @@ jobs:
         cd build
 
         echo "::group::CMake"
-        CXX=${{ matrix.compiler }} cmake ${GITHUB_WORKSPACE} \
+        cmake ${GITHUB_WORKSPACE} \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
           -DCMAKE_INSTALL_PREFIX=/usr \
           # EOF
@@ -472,7 +470,7 @@ jobs:
 
     runs-on: macos-10.15
     env:
-      MACOSX_DEPLOYMENT_TARGET: 10.14
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
     steps:
     - name: Download source
@@ -748,21 +746,6 @@ jobs:
       with:
         arch: ${{ matrix.host }}
 
-    - name: Import code signing certificate
-      shell: powershell
-      # If this is run on a fork, there may not be a certificate set up - continue in this case
-      continue-on-error: true
-      run: |
-        $tempFile = [System.IO.Path]::GetTempFileName()
-        $bytes = [System.Convert]::FromBase64String($env:WINDOWS_CERTIFICATE_P12)
-        [IO.File]::WriteAllBytes($tempFile, $bytes)
-        $pwd = ConvertTo-SecureString $env:WINDOWS_CERTIFICATE_PASSWORD -AsPlainText -Force
-        Import-PfxCertificate -FilePath $tempFile -CertStoreLocation Cert:\CurrentUser\My -Password $pwd
-        Remove-Item $tempFile
-      env:
-        WINDOWS_CERTIFICATE_P12: ${{ secrets.WINDOWS_CERTIFICATE_P12 }}
-        WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
-
     - name: Build (with installer)
       if: needs.source.outputs.is_tag == 'true'
       shell: bash
@@ -778,15 +761,12 @@ jobs:
           -DOPTION_USE_NSIS=ON \
           -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DWINDOWS_CERTIFICATE_COMMON_NAME="${WINDOWS_CERTIFICATE_COMMON_NAME}" \
           # EOF
         echo "::endgroup::"
 
         echo "::group::Build"
         cmake --build .
         echo "::endgroup::"
-      env:
-        WINDOWS_CERTIFICATE_COMMON_NAME: ${{ secrets.WINDOWS_CERTIFICATE_COMMON_NAME }}
 
     - name: Build (without installer)
       if: needs.source.outputs.is_tag != 'true'
@@ -802,15 +782,12 @@ jobs:
           -DCMAKE_TOOLCHAIN_FILE="c:\vcpkg\scripts\buildsystems\vcpkg.cmake" \
           -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DWINDOWS_CERTIFICATE_COMMON_NAME="${WINDOWS_CERTIFICATE_COMMON_NAME}" \
           # EOF
         echo "::endgroup::"
 
         echo "::group::Build"
         cmake --build .
         echo "::endgroup::"
-      env:
-        WINDOWS_CERTIFICATE_COMMON_NAME: ${{ secrets.WINDOWS_CERTIFICATE_COMMON_NAME }}
 
     - name: Create bundles
       shell: bash
@@ -832,17 +809,6 @@ jobs:
         rm -f bundles/*.sha256
         echo "::endgroup::"
 
-    - name: Sign installer
-      if: needs.source.outputs.is_tag == 'true'
-      shell: bash
-      # If this is run on a fork, there may not be a certificate set up - continue in this case
-      continue-on-error: true
-      run: |
-        cd ${GITHUB_WORKSPACE}/build/bundles
-        ../../os/windows/sign.bat *.exe "${WINDOWS_CERTIFICATE_COMMON_NAME}"
-      env:
-        WINDOWS_CERTIFICATE_COMMON_NAME: ${{ secrets.WINDOWS_CERTIFICATE_COMMON_NAME }}
-
     - name: Store bundles
       uses: actions/upload-artifact@v2
       with:

.github/workflows/unused-strings.yml

@@ -1,18 +0,0 @@
-name: Unused strings
-
-on:
-  pull_request:
-
-jobs:
-  unused-strings:
-    name: Unused strings
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Check for unused strings
-      run: |
-        set -ex
-        python3 .github/unused-strings.py

CMakeLists.txt

@@ -4,9 +4,7 @@ if(NOT BINARY_NAME)
     set(BINARY_NAME openttd)
 endif()
 
-project(${BINARY_NAME}
-    VERSION 12.2
-)
+project(${BINARY_NAME})
 
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     message(FATAL_ERROR "In-source builds not allowed. Please run \"cmake ..\" from the build directory. You may need to delete \"${CMAKE_SOURCE_DIR}/CMakeCache.txt\" first.")
@@ -22,7 +20,7 @@ if (EMSCRIPTEN)
 endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14)
+set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
 
 # Use GNUInstallDirs to allow customisation
 # but set our own default data and bin dir
@@ -74,9 +72,6 @@ add_custom_target(find_version
         ${CMAKE_COMMAND}
                 -DFIND_VERSION_BINARY_DIR=${CMAKE_BINARY_DIR}/generated
                 -DCPACK_BINARY_DIR=${CMAKE_BINARY_DIR}
-                -DREV_MAJOR=${PROJECT_VERSION_MAJOR}
-                -DREV_MINOR=${PROJECT_VERSION_MINOR}
-                -DWINDOWS=${WIN32}
                 -P "${CMAKE_SOURCE_DIR}/cmake/scripts/FindVersion.cmake"
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         BYPRODUCTS ${GENERATED_SOURCE_FILES}
@@ -241,10 +236,6 @@ target_link_libraries(openttd
     Threads::Threads
 )
 
-if(HAIKU)
-    target_link_libraries(openttd "be" "network" "midi")
-endif()
-
 if(IPO_FOUND)
     set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE True)
     set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL True)
@@ -305,7 +296,7 @@ if(EMSCRIPTEN)
     add_definitions(-s DISABLE_EXCEPTION_CATCHING=0)
 
     # Export functions to Javascript.
-    target_link_libraries(WASM::WASM INTERFACE "-s EXPORTED_FUNCTIONS='[\"_main\", \"_em_openttd_add_server\"]' -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'")
+    target_link_libraries(WASM::WASM INTERFACE "-s EXPORTED_FUNCTIONS='[\"_main\", \"_em_openttd_add_server\"]' -s EXTRA_EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'")
 
     # Preload all the files we generate during build.
     # As we do not compile with FreeType / FontConfig, we also have no way to
@@ -359,20 +350,17 @@ if(WIN32)
         -DUNICODE
         -D_UNICODE
         -DWITH_UNISCRIBE
-        -DPSAPI_VERSION=1
     )
 
     target_link_libraries(openttd
         ws2_32
         winmm
         imm32
-        usp10
-        psapi
     )
 endif()
 
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    add_definitions(-DPOINTER_IS_64BIT)
+    add_definitions(-D_SQ64)
 endif()
 
 include(CreateRegression)

COMPILING.md

@@ -2,27 +2,26 @@
 
 ## Required/optional libraries
 
-OpenTTD makes use of the following external libraries:
+The following libraries are used by OpenTTD for:
 
-- (encouraged) zlib: (de)compressing of old (0.3.0-1.0.5) savegames, content downloads,
+- zlib: (de)compressing of old (0.3.0-1.0.5) savegames, content downloads,
    heightmaps
-- (encouraged) liblzma: (de)compressing of savegames (1.1.0 and later)
-- (encouraged) libpng: making screenshots and loading heightmaps
-- (optional) liblzo2: (de)compressing of old (pre 0.3.0) savegames
-
-For Linux, the following additional libraries are used (for non-dedicated only):
-
-- libSDL2: hardware access (video, sound, mouse)
+- liblzo2: (de)compressing of old (pre 0.3.0) savegames
+- liblzma: (de)compressing of savegames (1.1.0 and later)
+- libpng: making screenshots and loading heightmaps
 - libfreetype: loading generic fonts and rendering them
 - libfontconfig: searching for fonts, resolving font names to actual fonts
 - libicu: handling of right-to-left scripts (e.g. Arabic and Persian) and
-   natural sorting of strings
+   natural sorting of strings (Linux only)
+- libSDL2: hardware access (video, sound, mouse) (not required for Windows or macOS)
 
 OpenTTD does not require any of the libraries to be present, but without
 liblzma you cannot open most recent savegames and without zlib you cannot
 open most older savegames or use the content downloading system.
+Without libSDL/liballegro on non-Windows and non-macOS machines you have
+no graphical user interface; you would be building a dedicated server.
 
-## Windows
+## Windows:
 
 You need Microsoft Visual Studio 2017 or more recent.
 
@@ -69,7 +68,7 @@ that comes with vcpkg. After that, you can run something similar to this:
 ```powershell
 mkdir build
 cd build
-cmake.exe .. -G"Visual Studio 16 2019" -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
@@ -78,8 +77,6 @@ files himself via the `ZERO_CHECK` project.
 
 ## All other platforms
 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.
 
 ```bash
 mkdir build
@@ -91,25 +88,6 @@ make
 For more information on how to use CMake (including how to make Release builds),
 we urge you to read [their excellent manual](https://cmake.org/cmake/help/latest/guide/user-interaction/index.html).
 
-## CMake Options
-
-Via CMake, several options can be influenced to get different types of
-builds.
-
-- `-DCMAKE_BUILD_TYPE=RelWithDebInfo`: build a release build. This is
-   significant faster than a debug build, but has far less useful information
-   in case of a crash.
-- `-DOPTION_DEDICATED=ON`: build OpenTTD without a GUI. Useful if you are
-   running a headless server, as it requires less libraries to operate.
-- `-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++17, should be

CONTRIBUTING.md

@@ -137,7 +137,7 @@ git checkout upstream/master -b <topic-branch-name>
 ```
 
 4. Commit your changes in logical chunks. Please adhere to these [git commit message guidelines](https://wiki.openttd.org/en/Development/Coding%20style#commit-message) or your code is unlikely to be merged into the main project.
-Use Git's [interactive rebase](https://docs.github.com/en/get-started/using-git/about-git-rebase) feature to tidy up your commits before making them public.
+Use Git's [interactive rebase](https://help.github.com/articles/interactive-rebase) feature to tidy up your commits before making them public.
 
 5. Locally rebase the upstream development branch into your topic branch:
 
@@ -265,5 +265,5 @@ If you would not like to accept this risk, please do either commit anonymously o
 
 ### Attribution of this Contributing Guide
 
-This contributing guide is adapted from [Bootstrap](https://github.com/twbs/bootstrap/blob/main/.github/CONTRIBUTING.md) under the [Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/) terms for Bootstrap documentation.
+This contributing guide is adapted from [Bootstrap](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) under the [Creative Commons Attribution 3.0 Unported License](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE) terms for Bootstrap documentation.
 The GDPR notice is adapted from [rsyslog](https://github.com/rsyslog/rsyslog/blob/master/CONTRIBUTING.md) under the [GNU General Public License](https://github.com/rsyslog/rsyslog/blob/master/COPYING).

CREDITS.md

@@ -14,6 +14,7 @@
 - Ingo von Borstel (planetmaker) - General coding, Support (since 1.1)
 - Remko Bijker (Rubidium) - Lead coder and way more (since 0.4.5)
 - José Soler (Terkhen) - General coding (since 1.0)
+- Leif Linse (Zuu) - AI/Game Script (since 1.2)
 
 ### Inactive Developers:
 
@@ -27,7 +28,6 @@
 - Christoph Mallon (Tron) - Programmer, code correctness police (0.3 - 0.5)
 - Patric Stout (TrueBrain) - NoProgrammer (0.3 - 1.2), sys op (active)
 - Thijs Marinussen (Yexo) - AI Framework, General (0.6 - 1.3)
-- Leif Linse (Zuu) - AI/Game Script (1.2 - 1.6)
 
 ### Retired Developers:
 

README.md

@@ -34,7 +34,7 @@ Both 'stable' and 'nightly' versions are available for download:
 - most people should choose the 'stable' version, as this has been more extensively tested
 - the 'nightly' version includes the latest changes and features, but may sometimes be less reliable
 
-OpenTTD is also available for free on [Steam](https://store.steampowered.com/app/1536610/OpenTTD/), [GOG.com](https://www.gog.com/game/openttd), and the [Microsoft Store](https://www.microsoft.com/p/openttd-official/9ncjg5rvrr1c). On some platforms OpenTTD will be available via your OS package manager or a similar service.
+On some platforms OpenTTD will also be available via your OS package manager or a similar service.
 
 
 ## 1.2) OpenTTD gameplay manual
@@ -46,13 +46,15 @@ OpenTTD has a [community-maintained wiki](https://wiki.openttd.org/), including
 
 OpenTTD has been ported to several platforms and operating systems.
 
-The currently supported platforms are:
+The currently working platforms are:
 
-- Linux (SDL (OpenGL and non-OpenGL))
-- macOS (universal) (Cocoa)
-- Windows (Win32 GDI / OpenGL)
-
-Other platforms may also work (in particular various BSD systems), but we don't actively test or maintain these.
+- FreeBSD (SDL)
+- Haiku (SDL)
+- Linux (SDL)
+- macOS (universal) (Cocoa video and sound drivers)
+- OpenBSD (SDL)
+- OS/2 (SDL)
+- Windows (Win32 GDI (faster) or SDL)
 
 ### 1.3.1) Legacy support
 Platforms, languages and compilers change.
@@ -77,9 +79,9 @@ For some platforms, you will need to refer to [the installation guide](https://w
 The free data files, split into OpenGFX for graphics, OpenSFX for sounds and
 OpenMSX for music can be found at:
 
-- https://www.openttd.org/downloads/opengfx-releases/latest for OpenGFX
-- https://www.openttd.org/downloads/opensfx-releases/latest for OpenSFX
-- https://www.openttd.org/downloads/openmsx-releases/latest for OpenMSX
+- https://www.openttd.org/download-opengfx for OpenGFX
+- https://www.openttd.org/download-opensfx for OpenSFX
+- https://www.openttd.org/download-openmsx for OpenMSX
 
 Please follow the readme of these packages about the installation procedure.
 The Windows installer can optionally download and install these packages.
@@ -163,7 +165,7 @@ If you want to compile OpenTTD from source, instructions can be found in [COMPIL
 
 - [OpenTTD website](https://www.openttd.org)
 - IRC chat using #openttd on irc.oftc.net [more info about our irc channel](https://wiki.openttd.org/en/Development/IRC%20channel)
-- [OpenTTD on Github](https://github.com/OpenTTD/) for code repositories and for reporting issues
+- [OpenTTD on Github](https://github.com/openTTD/) for code repositories and for reporting issues
 - [forum.openttd.org](https://forum.openttd.org/) - the primary community forum site for discussing OpenTTD and related games
 - [OpenTTD wiki](https://wiki.openttd.org/) community-maintained wiki, including topics like gameplay guide, detailed explanation of some game mechanics, how to use add-on content (mods) and much more
 
@@ -205,9 +207,6 @@ See the comments in the source files in `src/3rdparty/md5` for the complete lice
 The implementations of Posix `getaddrinfo` and `getnameinfo` for OS/2 in `src/3rdparty/os2` are distributed partly under the GNU Lesser General Public License 2.1, and partly under the (3-clause) BSD license.
 The exact licensing terms can be found in `src/3rdparty/os2/getaddrinfo.c` resp. `src/3rdparty/os2/getnameinfo.c`.
 
-The fmt implementation in `src/3rdparty/fmt` is licensed under the MIT license.
-See `src/3rdparty/fmt/LICENSE.rst` for the complete license text.
-
 
 ## 4.0 Credits
 

bin/ai/CMakeLists.txt

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

bin/ai/compat_1.11.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("1.11 API compatibility in effect.");

bin/ai/compat_12.nut

@@ -1,6 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */

bin/game/CMakeLists.txt

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

bin/game/compat_1.11.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("1.11 API compatibility in effect.");

bin/game/compat_12.nut

@@ -1,6 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */

changelog.txt

@@ -1,227 +1,3 @@
-12.2 (2022-04-02)
-------------------------------------------------------------------------
-Feature: Remember the last-used signal between games (#9792)
-Change: [MacOS] Allow touchbar usage on all supported OS versions (#9776)
-Change: Add a timestamp in name of crash files (#9761)
-Fix #9736: Duplicate multiplayer window opens upon canceling password entry (#9842)
-Fix: Removing long roads doesn't prioritise refusal of local authority over other errors (#9831)
-Fix #9020: Glitchy station coverage highlight when changing selection (#9825)
-Fix: Correct some Romanian town names (#9819)
-Fix: Original music playback rate was slightly too fast (#9814)
-Fix #9811: Use the NewGRF-defined vehicle center when dragging ships and aircraft (#9812)
-Fix: Do not let shares in the company taking over another company disappear (#9808)
-Fix #9802: Crash when using lots of NewGRF waypoint types (#9803)
-Fix #9766: Don't write uninitialised data in config file (#9767)
-Fix #9743: [MacOS] Don't try to render touchbar sprites with invalid zoom level (#9776)
-Fix #9774: Building roadstop in estimation mode updates station acceptance (#9775)
-Fix: If vehicles only refit to cargo-slots >= 32, the default cargo was wrong (#9744)
-Fix #9735: Possible desync when replacing a depot on same tile (#9738)
-Fix #9730: [Network] Connections can use an invalid socket due to a race condition (#9731)
-Fix: Don't show sign edit window for GS-owned signs (#9716)
-Fix #9702: Display order window for vehicle group on ctrl-click only when using shared orders (#9704)
-Fix #9680: Crash when loading really old savegames with aircraft in certain places (#9699)
-Fix: Update last servicing dates when using the date cheat (#9694)
-Fix: Error message shows about missing glyphs while suitable fallback font is found (#9692)
-
-
-12.1 (2021-11-08)
-------------------------------------------------------------------------
-Feature: Button to toggle showing advanced signal types (#9617)
-Change: Don't show screenshot GUI in screenshots (#9674)
-Change: Suppress panning in intro game, while user is interacting with the GUI (#9645)
-Change: Draw rotor in cursor when dragging helicopters in depots (#9612)
-Fix: Invalid memory access when loading a currency NewGRF (#9675)
-Fix #9579: Object and HQ construction is Construction cost, not Property Maintenance (#9673)
-Fix #9669: Ships exiting a blocked depot/lock could exit in the wrong direction (#9672)
-Fix: Every 16th client never reconnects after server restart (#9666)
-Fix #9643: Screenshots were always written as BMP files (#9644)
-Fix #9630: Intro game could zoom in/out more than allowed by settings (#9633)
-Fix #9626: Incorrect loading of script saved data (#9629)
-Fix: Emergency crash save had the wrong NewGRF list saved in it (#9627)
-Fix #9595: Always use plural forms of cargo for subsidy strings (#9619)
-Fix #9614: Refresh rate dropdown was still active when vsync was enabled (#9618)
-Fix: Don't use 'server address' string in server list when displaying an invite code (#9615)
-
-
-12.0 (2021-10-17)
-------------------------------------------------------------------------
-Add: [Network] Keep the refresh button in lowered state while refreshing (#9600)
-Add: Console command to list search directories for various things (#9583)
-Fix: Try all possible reverse directions when a ship reaches a dead end (#9610)
-Fix: Incorrect Romanian own name (#9598)
-Fix #9591: Update station docking tiles upon placing a water object on a docking tile (#9594)
-Fix #9548: [Squirrel] Crash during engine cleanup after reaching memory limit on realloc (#9592)
-Fix #9588: [Squirrel] Reaching memory limit during script registration could prevent further script detections (#9589)
-Fix: Make ships more likely to find their destination at the cost of slightly worse paths (#9576)
-Change: Reverse ship when leaving docks if a better path exists (#9610)
-Change: Allow all tiles around docks to be docking tiles (#9578)
-
-
-12.0-RC1 (2021-09-25)
-------------------------------------------------------------------------
-Feature: Display icon/text whether vehicle is lost in vehicle (list) window (#9543)
-Feature: [MacOS] Add selected toolbar buttons to MacBook Pro Touch Bar (#9511)
-Feature: Button to open order window from vehicle shared orders window (#9325)
-Feature: Ctrl-Clicking shared order vehicle list opens order window (#9325)
-Feature: Multiple rotating views on title screen (#8980)
-Feature: Hide block signals in GUI by default (#8688)
-Add: [Script] Allow GameScripts to build neutral objects (#9568)
-Add: [Network] Allow sending chat messages via admin port (#9563)
-Add: [AI/GS] Missing water related functions and objects (#8390)
-Fix: Industry funding window did not update when changing funding method (#9572)
-Fix #9562: [NewGRF] Handle case of invalid Action2 with zero results (#9564)
-Fix: Incorrect error messages when placing water in scenario editor (#9560)
-Fix #9484: Update locale currencies settings config map (#9559)
-Fix: Prevent train reversing when entirely inside a train depot (#9557)
-Fix: [Network] Add back 'Spectate' option to company toolbar menu (#9556)
-Fix #9463: [Win32] Work around XAudio2 crashes (#9549)
-Fix #8603: Don't give focus to text filter when opening Object GUI (#9547)
-Fix #9241: Grove and forest tree brushes did not also create rainforest terrain (#9542)
-Fix: [Network] Several crashes in our network code (#9534, #9456)
-Fix #9527: Crash when trying to place multi-tile objects at map edge (#9529)
-Fix: [Network] SendCmdNames only sent one name per packet (#9528)
-Fix #9407: Desync when founding a town nearby a station (#9526)
-Fix #9521: Don't load at just removed docks that were part of a multi-dock station (#9524)
-Fix: Ships always tried to avoid docking tiles when pathfinding (even if nothing was on them) (#9522)
-Fix: [Network] Convert server_advertise to server_game_type in config file (#9515)
-Fix #9490: [Network] A full server couldn't be queried (#9508)
-Fix: [Network] Don't show GameScript " (v0)" for old servers (#9507)
-Fix: [Network] Show query errors in the server listing instead of error popup (#9506)
-Fix: [Network] Crash when last-joined server was no longer available (#9503)
-Fix #9501: [Network] Crash when more than one game-info query was pending (#9502)
-Fix: Wrong error message when building canals over ship depots / locks (#9410)
-Fix: Reduce cost of building canals over objects on sea (#9410)
-Change: [Linkgraph] Delete links only served by vehicles stopped in depot (#9499)
-
-
-12.0-beta2 (2021-08-19)
-------------------------------------------------------------------------
-Feature: [Linkgraph] Prioritize faster routes for passengers, mail and express cargo (#9457)
-Fix: Wrong town window refreshed when building an airport with noise levels enabled (#9497)
-Fix: Improve wording of network-related messages (#9494, #9495, #9500)
-Fix: [Network] Report reuse of invite-code (#9487)
-Fix: [Network] Connecting with the same client name thrice hangs the server (#9485)
-
-
-12.0-beta1 (2021-08-15)
-------------------------------------------------------------------------
-Feature: [Network] Remove lobby window; pressing "Join Game" now immediately joins a server (#9467)
-Feature: [Network] Synchronize server name to clients and display in Online Players window (#9472)
-Feature: [Network] Mention you are a spectator in the status bar (#9471)
-Feature: [Network] No longer require port-forwarding to host a server (#9443, #9447)
-Feature: [Network] Allow setting your server visibility to "invite-only" (#9434)
-Feature: [Network] Join servers based on their invite code (#9432)
-Feature: Raise the maximum NewGRF limit to 255 (#9428)
-Feature: Persistent rotation of numbered auto/netsave after restart (#9395, #9397)
-Feature: [NewGRF] Maximum curve speed modifier for rail vehicles (#9346)
-Feature: Move sensitive information to secrets.cfg and private information to private.cfg (#9298)
-Feature: Signed Windows builds (#9294)
-Feature: [NewGRF] Define refittability of default vehicles using cargo classes (#9148)
-Feature: Configurable subsidy duration, up to 5000 years (#9081)
-Feature: [Network] Rework in-game Online Players window (#9067)
-Feature: [Network] Show previous chat history when the chat message box is open (#9025)
-Feature: Button to reset game settings to their default values (#8958)
-Feature: Press Ctrl to build diagonal rivers in Scenario Editor (#8880)
-Feature: Set wagon replacement per group when using autoreplace (#7441)
-Add: [Network] Open Online Players window on starting/joining a server (#9479)
-Add: [Script] Basic information about loaded NewGRFs for scripts (#9464)
-Add: [AI] Get the number of vehicles in a given group (#9462)
-Add: [Network] Inform network clients what game-script a server is running (#9441)
-Add: Hindi translation (#9086)
-Add: [Network] Ensure players fill in a name instead of defaulting to "Player" (#9080)
-Change: Allow pause/unpause console command in single player (#9342)
-Change: Make savegame format self-descriptive and consistent across all objects (#9322, #9335, #9338, #9339)
-Change: By default, make "unload all" leave stations empty (#9301)
-Change: Reworked the debug levels and messages for network logs (#9230, #9251)
-Change: [Emscripten] Set default scrolling mode to non-pointer-locking (#9191)
-Change: Use neutral pronouns for various strings (#9189, #9203, #9228)
-Change: Make the town directory horizontally resizable (#9157)
-Change: Allow non-ASCII currency separators (#9121)
-Change: [NewGRF] Display a pop-up window for Errors with severity ERROR (#9119)
-Change: Treat languages as finished, if translations are 75% completed (#9019, #9086)
-Change: Disable NewGRF window apply button if no change was made (#8934)
-Fix: [Script] Crash when iterating lists of which the key is larger than 32bit (#9465)
-Fix: [Network] Desync due to use of unstable sort when distributing cargo production (#9460)
-Fix #9440: Negative cargo payments not being handled correctly (#9455)
-Fix: [Network] Crash when joining a server again after a TCP disconnect (#9453)
-Fix: Don't enable rename button for network clients in build vehicle window (#9452)
-Fix: Money could underflow and wrap around (#9451)
-Fix: Parse the console settings the same way as config settings (#9438)
-Fix: Ensure no more than the allowed number of NewGRFs are loaded from the configuration (#9430)
-Fix: [NewGRF] Overflow when determining cargo mask for string code 9A 1E (#9423)
-Fix: Integers for scripts are 64bit, but saved as 32bit (#9415)
-Fix #9392: [Script] Return a valid value with GetBuildWithRefitCapacity even when AIs are maxed out in vehicles (#9393)
-Fix #8169: Crash when autoreplacing vehicle with no orders (#9387)
-Fix: Wrong cargo line position in IndustryCargo window (#9383)
-Fix: Race-condition during startup of NewGRF scan (#9382)
-Fix: Don't propagate Shift/Ctrl state till next game-tick (#9381)
-Fix: Prevent palette updates during copying to the video driver (#9379)
-Fix: [Network] Determining GetNetworkRevisionString could overflow and underflow its buffer (#9372)
-Fix #9358: Don't skip empty files in tar archives (#9367)
-Fix: For old savegames, station bus/truck station cache was not updated (#9366)
-Fix #9353: [Script] Garbage collecting on priority queues could crash the game (#9356)
-Fix: Respect the autosave_on_exit setting for Null video driver (#9343)
-Fix: Compatible NewGRFs in crash-log reported wrong MD5 hash (#9340)
-Fix: [Script] Ensure the saved script strings are properly validated and terminated (#9336)
-Fix #9316: Town bridge length limit check incorrect above 250k inhabitants (#9318)
-Fix: Limit heightmap sizes to 8192x8192 (#9307)
-Fix #9281: Money generating exploit when buying out a company (#9300)
-Fix: Part of a tile might not be redrawn when terraforming (#9296)
-Fix: [OpenGL] Increase timeout when waiting for the GPU to be done with the drawing buffer (#9282)
-Fix: Vehicles sent in the wrong direction if there is no path to the destination (#9280)
-Fix #9264: Do not attach temporary wagons to free wagon chains when autoreplacing (#9278)
-Fix #9267: [Script] Crash during garbage collection (#9275)
-Fix: Encountering two-way red signals could prune unrelated Pathfinder branches (#9271)
-Fix #9255: [Network] Crash when hostname is not found (#9259)
-Fix #9256: Invalid read after free when replacing train chains (#9258)
-Fix: [Emscripten] Force secure WebSockets over HTTPS (#9248)
-Fix #9242: Tree tick handler did not scale by map size (#9246)
-Fix: [Network] Mark server as offline when no longer reachable (#9244)
-Fix: [Network] Don't rebuild the host-list during iterating the list (#9240)
-Fix: [Network] Don't mark the last-joined server as a manually added server (#9239)
-Fix: [Network] Clients leaving because of broken connections was not broadcasted (#9238)
-Fix: [Network] Check on CIDR for netmask check considered everything valid (#9235)
-Fix: Creating screenshots on dedicated servers failed (#9232)
-Fix: Leaking file descriptors for downloaded content (#9229)
-Fix: Spelling of several town names (#9222)
-Fix #9209: Game hangs when resizing highscore/news window if the screen is too small (#9210)
-Fix: [Network] Optimize creating network connections for clients using IPv4 and IPv6 (#9199)
-Fix #9186: Fix incorrect bounding box height causing station sprite glitch (#9187)
-Fix: Truncating strings in settings could leave invalid UTF-8 characters (#9121)
-Fix: Many issues related to window scaling (#9087, #9219)
-Fix: Invalidate cached vehicle colourmaps when changing liveries setting (#9006)
-Fix #8981: Don't attempt to re-reserve path if already entering/entered depot (#9000)
-Fix: Missing 'Town names:' colon in map gen GUI (#8986)
-Fix: Sorting and filtering industries that produce/accept many cargoes (#8468)
-Remove: [Network] COMPANY_INFO packets (#9475)
-Remove: [Network] A server can no longer set a limit to the amount of spectators allowed (#9466)
-Remove: Arbitrary limit on number of statically loaded NewGRFs (#9431)
-Remove: [Network] Language and map-name from server information (#9070)
-
-
-1.11.2 (2021-05-03)
-------------------------------------------------------------------------
-Change: [Win32] Limit hardware accelerated video driver to OpenGL 3.2 or higher (#9077)
-Change: More improvements to the GUI at different scales (#9075, #9102, #9107, #9133, #9174, #9183)
-Fix: Query windows could be partially drawn (#9184)
-Fix #9113: Crash when removing an airport that exists in an aircraft's orders (#9182)
-Fix #9117: [Fluidsynth] Hang when changing song (#9181)
-Fix: String validation could leave invalid UTF-8 encoded strings (#9096)
-Fix: [Network] Out-of-bounds memory access with modified servers sending too short password salts (#9176)
-Fix: Crash when extra viewport with zero height has sign in view (#9175)
-Fix #9147: Crash when taking screenshots (#9169)
-Fix #6598: [Network] Prevent crashes when (re)joining network game by falling back to main menu first (#9163)
-Fix #9152: Screenshot success popup window was treated as an error (#9159)
-Fix: Fast-forward stuttering when vsync is enabled (#9140)
-Fix: [Network, Win32] Network errors were handled badly (#9116)
-Fix: [Network] Savegame transfer could stall in rare cases (#9106)
-Fix #9097: [NewGRF] Cargo initial payment variable was being truncated (#9098)
-Fix: [NewGRF] Industry variable 66 and object variable 46 erroneously truncated the distance (#9088)
-Fix: [NewGRF] Industry variables 65 and 66 ignored the parameter, and always used the north tile (#9088)
-Fix: Do not include regression test AI in bundle (#9068, #9164)
-Fix #9062: [Win32] Version in executable was not set to current release version (#9066, #9154)
-
-
 1.11.1 (2021-04-18)
 ------------------------------------------------------------------------
 Feature: Toggle to enable/disable vsync (#8997)
@@ -2495,7 +2271,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: [NewGRF] Additional text in fund industry window is NewGRF supplied and thus should have a default colour (r22631)
 - Fix: Also initialise _old_vds with newgame settings; TTD savegames do not contain these settings [FS#4622] (r22626)
 - Fix: Do not zero the orders of disaster vehicles when converting savegames [FS#4642] (r22625)
-- Fix: When closing an AI company the local player cheated to, we need to cheat them to another company [FS#4654] (r22624, r22623)
+- Fix: When closing an AI company the local player cheated to, we need to cheat him to another company [FS#4654] (r22624, r22623)
 - Fix: When closing down companies their shares in other companies must be sold even if share trading is disabled at that point of time (r22622)
 - Fix: When asking the user to confirm an unsafe unpausing, there is no need to execute a command if 'no' is chosen. This also prevents crashing when clicking unpause while the confirm window is shown (r22621)
 - Fix: Enforce refit orders to be 'always go to depot' orders; service-only and stop-in-depot orders make no sense with refitting [FS#4651] (r22620)
@@ -3217,7 +2993,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Chat message caused glitch when rejoining a network game [FS#3757] (r19629)
 - Fix: Desync when a command is received and in the queue while a client starts joining, i.e. save the game state. This can happen in two ways: with frame_freq > 1 a command received in a previous frame might not be executed yet or when a command is received in the same frame as the join but before the savegame is made. In both cases the joining client would not get all commands to get in-sync with the server (and the other clients) (r19620)
 - Fix: Company related graphs were not updated correctly after changing the company colour [FS#3763] (r19615)
-- Fix: Possible invalid read when server moves client to spectators before they finish joining [FS#3755] (r19613)
+- Fix: Possible invalid read when server moves client to spectators before he finishes joining [FS#3755] (r19613)
 - Fix: Crash when opening a savegame with a waypoint from around 0.4.0 [FS#3756] (r19612)
 - Fix: Improve joining behaviour; kicking clients when entering passwords that was just cleared, 'connection lost' for people failing the password, access restriction circumvention [CVE-2010-0401] [FS#3754] (r19610, r19609, r19608, r19607, r19606)
 - Fix: Desync debugging; false positives in the cache validity checks and saving/loading the command stream (r19619, r19617, r19602, r19601, r19600, r19596, r19593, r19592, r19589, r19587, r19586)
@@ -3572,7 +3348,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Do not account for path reservation costs when entering a signal block via a 'block' signal. This way you will not get double penalties, both red signals and reservation costs, for the block signalled tracks [FS#2722] (r18535)
 - Fix: [NewGRF] An industry NewGRF that defined a too small size for action0 prop 0A could cause a crash (r18527)
 - Fix: Allegro does not like to work with extmidi, so warn the user about that [FS#3272] (r18520)
-- Fix: When you pass a signal at danger, in a PBS controlled area, do not try to do the 'safe' thing and stop, but continue going; the user wanted the train to pass the signal at danger so they have to suffer the consequences. Of course one can always stop the train manually [FS#2891] (r18515)
+- Fix: When you pass a signal at danger, in a PBS controlled area, do not try to do the 'safe' thing and stop, but continue going; the user wanted the train to pass the signal at danger so (s)he has to suffer the consequences. Of course one can always stop the train manually [FS#2891] (r18515)
 - Fix: No error message was created for the first fatal NewGRF error [FS#3368] (r18506)
 - Fix: Improve airport movement on several airports [FS#3169] (r18505)
 - Fix: Autoreplace and autorenew always reset their cargo sub type to 0. Now find a sub cargo type with the exact same name and use that, otherwise fallback to 0. So cargo sub types can be maintained via autoreplace *if* the new vehicle supports the same cargo sub type [FS#3159] (r18499)
@@ -4055,7 +3831,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Make the join/spectate command require to be connected to a network game; in SP it could lead to crashes (r15514)
 - Fix: Generating a map with the original map generator with freeform edges on resulted in a crash [FS#2641] (r15511)
 - Fix: Pre-0.5 OpenTTD stored new_nonstop and full_load_any in a different way, savegame conversion was not working for them (r15500)
-- Fix: Crash when opening the game options when the currently loaded base graphics pack has less than 2 valid graphics files. For example when someone replaces all their original base graphics with custom work (but keeps the name) or renames the dos ones to windows or vice versa [FS#2630] (r15476)
+- Fix: Crash when opening the game options when the currently loaded base graphics pack has less than 2 valid graphics files. For example when someone replaces all his/her original base graphics with custom work (but keeps the name) or renames the dos ones to windows or vice versa [FS#2630] (r15476)
 
 
 0.7.0-beta1 (2009-02-16)
@@ -4817,7 +4593,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Switching players (using the cheat) crashed on Big Endian machines [FS#1150] (r11023)
 - Fix: The canal border determination did not take oil rigs into consideration (r11022)
 - Fix: Do not display income/expenses when they do not belong to a 'valid' tile, like the money cheat/giving money [FS#1175] (r11021)
-- Fix: One could not give money when they had too much money or rather: when casting the amount of money to an int32 becomes negative [FS#1174] (r11020)
+- Fix: One could not give money when (s)he had too much money or rather: when casting the amount of money to an int32 becomes negative [FS#1174] (r11020)
 - Fix: When determining the gender of a string, do not assume that the gender is in the front of the string when there can be case switching code at that location [FS#1104] (r10792)
 - Fix: Determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis) [FS#1058] (r10686)
 - Fix: Graphical glitches when the 'link landscape toolbar' patch is turned on when opening one of the construction toolbars [FS#1076] (r10685)
@@ -4878,7 +4654,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Do not unconditionally assume that a tile has a depot (r11027)
 - Fix: Give a more correct error when building some things on tile 0 [FS#1173] (r11024)
 - Fix: Do not display income/expenses when they do not belong to a 'valid' tile, like the money cheat and giving money [FS#1175] (r11021)
-- Fix: One could not give money when they had too much money [FS#1174] (r11020)
+- Fix: One could not give money when (s)he had too much money [FS#1174] (r11020)
 - Fix: Disallow buying/selling shares in your own company or a bankrupt company [FS#1169] (r11018)
 - Fix: Crash when quitting the game in one of the end score windows [FS#1218] (r11071)
 
@@ -5838,7 +5614,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Vehicles slow down under bridge if the track is on a foundation
 - Fix: You can no longer change name of waypoints whom are owned by somebody else
 - Fix: Shares are now also sold when a company goes bankrupt [SF#1090313]
-- Fix: It is no longer possible to crash trains of other companies by building a depot close to a station; trains do no longer enter tiles that do not belong to their owner [SF#1087701]
+- Fix: It is no longer possible to crash trains of other companies by building a depot close to a station; trains do no longer enter tiles that do not belong to his owner [SF#1087701]
 - Fix: Crashed trains are not reported to have too few orders any more [SF#1087403]
 - Fix: Backup-order-list was not closed with an OT_NOTHING, [SF#1086375]
 - Fix: Docks now have a button to display the catchment area [SF#1085255]

cmake/CompileFlags.cmake

@@ -26,10 +26,8 @@ macro(compile_flags)
         add_compile_options(/Zc:rvalueCast)
 
         if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-            add_compile_options(
-                /MP # Enable multi-threaded compilation.
-                /FC # Display the full path of source code files passed to the compiler in diagnostics.
-            )
+            # Enable multi-threaded compilation.
+            add_compile_options(/MP)
         endif()
     endif()
 
@@ -43,11 +41,6 @@ macro(compile_flags)
         add_link_options(
             "$<$<NOT:$<CONFIG:Debug>>:-fstack-protector>" # Prevent undefined references when _FORTIFY_SOURCE > 0
         )
-        if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-            add_link_options(
-                "$<$<CONFIG:Debug>:-Wl,--disable-dynamicbase,--disable-high-entropy-va,--default-image-base-low>" # ASLR somehow breaks linking for x64 Debug builds
-            )
-        endif()
     endif()
 
     # Prepare a generator that checks if we are not a debug, and don't have asserts
@@ -163,7 +156,7 @@ macro(compile_flags)
         message(FATAL_ERROR "No warning flags are set for this compiler yet; please consider creating a Pull Request to add support for this compiler.")
     endif()
 
-    if(NOT WIN32 AND NOT HAIKU)
+    if(NOT WIN32)
         # rdynamic is used to get useful stack traces from crash reports.
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
     endif()

cmake/CreateGrfCommand.cmake

@@ -35,9 +35,9 @@ function(create_grf_command)
                     -DNFORENUM_EXECUTABLE=${NFORENUM_EXECUTABLE}
                     -DGRFCODEC_EXECUTABLE=${GRFCODEC_EXECUTABLE}
                     -P ${CMAKE_SOURCE_DIR}/cmake/scripts/CreateGRF.cmake
-            MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/cmake/scripts/CreateGRF.cmake
+            MAIN_DEPENDENCY ${GRF_NFO_SOURCE_FILES}
             DEPENDS ${GRF_PNG_BINARY_FILES}
-                    ${GRF_NFO_SOURCE_FILES}
+                    ${CMAKE_SOURCE_DIR}/cmake/scripts/CreateGRF.cmake
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
             COMMENT "Generating ${GRF_SOURCE_FOLDER_NAME}.grf"
     )

cmake/InstallAndPackage.cmake

@@ -30,9 +30,7 @@ install(DIRECTORY
                 ${CMAKE_BINARY_DIR}/game
                 ${CMAKE_SOURCE_DIR}/bin/scripts
         DESTINATION ${DATA_DESTINATION_DIR}
-        COMPONENT language_files
-        REGEX "ai/[^\.]+$" EXCLUDE # Ignore subdirs in ai dir
-)
+        COMPONENT language_files)
 
 install(FILES
                 ${CMAKE_SOURCE_DIR}/COPYING.md
@@ -138,13 +136,6 @@ elseif(WIN32)
     endif()
 
     set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-windows-${CPACK_SYSTEM_NAME}")
-
-    if(WINDOWS_CERTIFICATE_COMMON_NAME)
-      add_custom_command(TARGET openttd
-        POST_BUILD
-        COMMAND "${CMAKE_SOURCE_DIR}/os/windows/sign.bat" "$<TARGET_FILE:openttd>" "${WINDOWS_CERTIFICATE_COMMON_NAME}"
-      )
-    endif()
 elseif(UNIX)
     # With FHS, we can create deb/rpm/... Without it, they would be horribly broken
     # and not work. The other way around is also true; with FHS they are not

cmake/MSVCFilters.cmake

@@ -11,13 +11,12 @@ source_group("Network Core" REGULAR_EXPRESSION "src/network/core/")
 source_group("OSX" REGULAR_EXPRESSION "src/os/macosx/")
 source_group("Pathfinder" REGULAR_EXPRESSION "src/pathfinder/")
 source_group("Save/Load handlers" REGULAR_EXPRESSION "src/saveload/")
-source_group("Save/Load handlers\\Compat" REGULAR_EXPRESSION "src/saveload/compat/")
 source_group("Sound" REGULAR_EXPRESSION "src/sound/")
 source_group("Sprite loaders" REGULAR_EXPRESSION "src/spriteloader/")
 source_group("Squirrel" REGULAR_EXPRESSION "src/3rdparty/squirrel/squirrel/")
 source_group("Tables" REGULAR_EXPRESSION "src/table/")
 source_group("Video" REGULAR_EXPRESSION "src/video/")
-source_group("Video\\GL" REGULAR_EXPRESSION "src/3rdparty/opengl/")
+source_group("Video/GL" REGULAR_EXPRESSION "src/3rdparty/opengl/")
 source_group("Widgets" REGULAR_EXPRESSION "src/widgets/")
 source_group("Windows files" REGULAR_EXPRESSION "src/os/windows/|\.rc$")
 

cmake/scripts/CreateGRF.cmake

@@ -39,20 +39,6 @@ foreach(NFO_LINE IN LISTS NFO_LINES)
     endif()
 endforeach()
 
-execute_process(COMMAND ${NFORENUM_EXECUTABLE} -s sprites/${GRF_SOURCE_FOLDER_NAME}.nfo RESULT_VARIABLE RESULT)
-if(RESULT)
-    if(NOT RESULT MATCHES "^[0-9]*$")
-        message(FATAL_ERROR "Failed to run NFORenum (${RESULT}), please check NFORENUM_EXECUTABLE variable")
-    endif()
-    message(FATAL_ERROR "NFORenum failed")
-endif()
-
-execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -p1 ${GRF_SOURCE_FOLDER_NAME}.grf RESULT_VARIABLE RESULT)
-if(RESULT)
-    if(NOT RESULT MATCHES "^[0-9]*$")
-        message(FATAL_ERROR "Failed to run GRFCodec (${RESULT}), please check GRFCODEC_EXECUTABLE variable")
-    endif()
-    message(FATAL_ERROR "GRFCodec failed")
-endif()
-
+execute_process(COMMAND ${NFORENUM_EXECUTABLE} -s sprites/${GRF_SOURCE_FOLDER_NAME}.nfo)
+execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -p1 ${GRF_SOURCE_FOLDER_NAME}.grf)
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${GRF_SOURCE_FOLDER_NAME}.grf ${GRF_BINARY_FILE})

cmake/scripts/FindVersion.cmake

@@ -1,12 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
 
-if(NOT REV_MAJOR)
-    set(REV_MAJOR 0)
-endif()
-if(NOT REV_MINOR)
-    set(REV_MINOR 0)
-endif()
-
 #
 # Finds the current version of the current folder.
 #
@@ -135,7 +128,7 @@ else()
     configure_file("${CMAKE_SOURCE_DIR}/src/rev.cpp.in"
             "${FIND_VERSION_BINARY_DIR}/rev.cpp")
 
-    if(WINDOWS)
+    if(WIN32)
         message(STATUS "Generating ottdres.rc")
         configure_file("${CMAKE_SOURCE_DIR}/src/os/windows/ottdres.rc.in"
                 "${FIND_VERSION_BINARY_DIR}/ottdres.rc")

cmake/scripts/SquirrelExport.cmake

@@ -28,10 +28,10 @@ endmacro()
 macro(dump_class_templates NAME)
     string(REGEX REPLACE "^Script" "" REALNAME ${NAME})
 
-    string(APPEND SQUIRREL_EXPORT "\n	template <> inline ${NAME} *GetParam(ForceType<${NAME} *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, nullptr); return  (${NAME} *)instance; }")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> inline ${NAME} &GetParam(ForceType<${NAME} &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, nullptr); return *(${NAME} *)instance; }")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> inline const ${NAME} *GetParam(ForceType<const ${NAME} *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, nullptr); return  (${NAME} *)instance; }")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> inline const ${NAME} &GetParam(ForceType<const ${NAME} &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, nullptr); return *(${NAME} *)instance; }")
+    string(APPEND SQUIRREL_EXPORT "\n	template <> inline ${NAME} *GetParam(ForceType<${NAME} *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (${NAME} *)instance; }")
+    string(APPEND SQUIRREL_EXPORT "\n	template <> inline ${NAME} &GetParam(ForceType<${NAME} &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(${NAME} *)instance; }")
+    string(APPEND SQUIRREL_EXPORT "\n	template <> inline const ${NAME} *GetParam(ForceType<const ${NAME} *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (${NAME} *)instance; }")
+    string(APPEND SQUIRREL_EXPORT "\n	template <> inline const ${NAME} &GetParam(ForceType<const ${NAME} &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(${NAME} *)instance; }")
     if("${NAME}" STREQUAL "ScriptEvent")
         string(APPEND SQUIRREL_EXPORT "\n	template <> inline int Return<${NAME} *>(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; }")
     elseif("${NAME}" STREQUAL "ScriptText")

docs/company_colour_indexes.html

@@ -1,557 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-<!-- derived from Iron Horse branch at https://github.com/andythenorth/iron-horse/tree/company_colour_indexes -->
-<head>
-	<title>OpenTTD Company Colour Indexes</title>
-	<meta charset="UTF-8" />
-<style>
-th { 
-	vertical-align: top; 
-	border-bottom:  solid 1px #ddd; 
-	padding-top:    30px; 
-	padding-right:  15px; 
-	text-align:     right;
-}
-tr.top td {
-	padding-top:    20px;
-}
-tr.bottom td {
-	border-bottom:  solid 1px #ddd; 
-	padding-bottom: 10px;
-}
-td {
-	text-align:     right;
-}
-span {
-	border:         solid 1px #000;
-	width:          32px;
-	height:         32px;
-	display:        inline-block;
-	vertical-align: top;
-	margin-left:    0px;
-}
-</style>
-</head>
-<body>
-	<h1>Company Colour Indexes</h1>
-	<p>Hex / dec indexes into the DOS palette</p>
-	<p>
-		Visual representation of values derived from <a href="https://github.com/frosch123/TTDViewer/blob/master/src/recolor.xml#L186">https://github.com/frosch123/TTDViewer/blob/master/src/recolor.xml#L186</a>
-	</p>
-	<table style="margin-top:30px;">
-		<tbody>
-			<tr class="top">
-				<th rowspan="3">COLOUR_DARK_BLUE</th>
-				<td><span style="background-color:rgb(  8,  24,  88)"></span></td>
-				<td><span style="background-color:rgb( 12,  36, 104)"></span></td>
-				<td><span style="background-color:rgb( 20,  52, 124)"></span></td>
-				<td><span style="background-color:rgb( 28,  68, 140)"></span></td>
-				<td><span style="background-color:rgb( 40,  92, 164)"></span></td>
-				<td><span style="background-color:rgb( 56, 120, 188)"></span></td>
-				<td><span style="background-color:rgb( 72, 152, 216)"></span></td>
-				<td><span style="background-color:rgb(100, 172, 224)"></span></td>
-			</tr>
-			<tr>
-				<td>0xc6</td>
-				<td>0xc7</td>
-				<td>0xc8</td>
-				<td>0xc9</td>
-				<td>0xca</td>
-				<td>0xcb</td>
-				<td>0xcc</td>
-				<td>0xcd</td>
-			</tr>
-			<tr class="bottom">
-				<td>198</td>
-				<td>199</td>
-				<td>200</td>
-				<td>201</td>
-				<td>202</td>
-				<td>203</td>
-				<td>204</td>
-				<td>205</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_PALE_GREEN</th>
-				<td><span style="background-color:rgb( 16,  52,  24)"></span></td>
-				<td><span style="background-color:rgb( 32,  72,  44)"></span></td>
-				<td><span style="background-color:rgb( 56,  96,  72)"></span></td>
-				<td><span style="background-color:rgb( 76, 116,  88)"></span></td>
-				<td><span style="background-color:rgb( 96, 136, 108)"></span></td>
-				<td><span style="background-color:rgb(120, 164, 136)"></span></td>
-				<td><span style="background-color:rgb(152, 192, 168)"></span></td>
-				<td><span style="background-color:rgb(184, 220, 200)"></span></td>
-			</tr>
-			<tr>
-				<td>0x60</td>
-				<td>0x61</td>
-				<td>0x62</td>
-				<td>0x63</td>
-				<td>0x64</td>
-				<td>0x65</td>
-				<td>0x66</td>
-				<td>0x67</td>
-			</tr>
-			<tr class="bottom">
-				<td>96</td>
-				<td>97</td>
-				<td>98</td>
-				<td>99</td>
-				<td>100</td>
-				<td>101</td>
-				<td>102</td>
-				<td>103</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_PINK</th>
-				<td><span style="background-color:rgb(112,  16,  32)"></span></td>
-				<td><span style="background-color:rgb(136,  32,  52)"></span></td>
-				<td><span style="background-color:rgb(160,  56,  76)"></span></td>
-				<td><span style="background-color:rgb(188,  84, 108)"></span></td>
-				<td><span style="background-color:rgb(204, 104, 124)"></span></td>
-				<td><span style="background-color:rgb(220, 132, 144)"></span></td>
-				<td><span style="background-color:rgb(236, 156, 164)"></span></td>
-				<td><span style="background-color:rgb(252, 188, 192)"></span></td>
-			</tr>
-			<tr>
-				<td>0x2a</td>
-				<td>0x2b</td>
-				<td>0x2c</td>
-				<td>0x2d</td>
-				<td>0x2e</td>
-				<td>0x2f</td>
-				<td>0x30</td>
-				<td>0x31</td>
-			</tr>
-			<tr class="bottom">
-				<td>42</td>
-				<td>43</td>
-				<td>44</td>
-				<td>45</td>
-				<td>46</td>
-				<td>47</td>
-				<td>48</td>
-				<td>49</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_YELLOW</th>
-				<td><span style="background-color:rgb(128,  68,   8)"></span></td>
-				<td><span style="background-color:rgb(156,  96,  16)"></span></td>
-				<td><span style="background-color:rgb(184, 120,  24)"></span></td>
-				<td><span style="background-color:rgb(212, 156,  32)"></span></td>
-				<td><span style="background-color:rgb(232, 184,  16)"></span></td>
-				<td><span style="background-color:rgb(252, 212,   0)"></span></td>
-				<td><span style="background-color:rgb(252, 248, 128)"></span></td>
-				<td><span style="background-color:rgb(252, 252, 192)"></span></td>
-			</tr>
-			<tr>
-				<td>0x3e</td>
-				<td>0x3f</td>
-				<td>0x40</td>
-				<td>0x41</td>
-				<td>0x42</td>
-				<td>0x43</td>
-				<td>0x44</td>
-				<td>0x45</td>
-			</tr>
-			<tr class="bottom">
-				<td>62</td>
-				<td>63</td>
-				<td>64</td>
-				<td>65</td>
-				<td>66</td>
-				<td>67</td>
-				<td>68</td>
-				<td>69</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_RED</th>
-				<td><span style="background-color:rgb( 92,   0,   0)"></span></td>
-				<td><span style="background-color:rgb(128,   0,   0)"></span></td>
-				<td><span style="background-color:rgb(160,   0,   0)"></span></td>
-				<td><span style="background-color:rgb(196,   0,   0)"></span></td>
-				<td><span style="background-color:rgb(224,   0,   0)"></span></td>
-				<td><span style="background-color:rgb(252,  52,  52)"></span></td>
-				<td><span style="background-color:rgb(252, 100,  88)"></span></td>
-				<td><span style="background-color:rgb(252, 144, 124)"></span></td>
-			</tr>
-			<tr>
-				<td>0xb3</td>
-				<td>0xb4</td>
-				<td>0xb5</td>
-				<td>0xb6</td>
-				<td>0xb7</td>
-				<td>0xa4</td>
-				<td>0xa5</td>
-				<td>0xa6</td>
-			</tr>
-			<tr class="bottom">
-				<td>179</td>
-				<td>180</td>
-				<td>181</td>
-				<td>182</td>
-				<td>183</td>
-				<td>164</td>
-				<td>165</td>
-				<td>166</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_LIGHT_BLUE</th>
-				<td><span style="background-color:rgb( 16,  64,  96)"></span></td>
-				<td><span style="background-color:rgb( 24,  80, 108)"></span></td>
-				<td><span style="background-color:rgb( 40,  96, 120)"></span></td>
-				<td><span style="background-color:rgb( 52, 112, 132)"></span></td>
-				<td><span style="background-color:rgb( 80, 140, 160)"></span></td>
-				<td><span style="background-color:rgb(116, 172, 192)"></span></td>
-				<td><span style="background-color:rgb(156, 204, 220)"></span></td>
-				<td><span style="background-color:rgb(204, 240, 252)"></span></td>
-			</tr>
-			<tr>
-				<td>0x9a</td>
-				<td>0x9b</td>
-				<td>0x9c</td>
-				<td>0x9d</td>
-				<td>0x9e</td>
-				<td>0x9f</td>
-				<td>0xa0</td>
-				<td>0xa1</td>
-			</tr>
-			<tr class="bottom">
-				<td>154</td>
-				<td>155</td>
-				<td>156</td>
-				<td>157</td>
-				<td>158</td>
-				<td>159</td>
-				<td>160</td>
-				<td>161</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_GREEN</th>
-				<td><span style="background-color:rgb( 32,  80,   4)"></span></td>
-				<td><span style="background-color:rgb( 48,  96,   4)"></span></td>
-				<td><span style="background-color:rgb( 64, 112,  12)"></span></td>
-				<td><span style="background-color:rgb( 84, 132,  20)"></span></td>
-				<td><span style="background-color:rgb( 92, 156,  52)"></span></td>
-				<td><span style="background-color:rgb(108, 176,  64)"></span></td>
-				<td><span style="background-color:rgb(124, 200,  76)"></span></td>
-				<td><span style="background-color:rgb(144, 224,  92)"></span></td>
-			</tr>
-			<tr>
-				<td>0x52</td>
-				<td>0x53</td>
-				<td>0x54</td>
-				<td>0x55</td>
-				<td>0xce</td>
-				<td>0xcf</td>
-				<td>0xd0</td>
-				<td>0xd1</td>
-			</tr>
-			<tr class="bottom">
-				<td>82</td>
-				<td>83</td>
-				<td>84</td>
-				<td>85</td>
-				<td>206</td>
-				<td>207</td>
-				<td>208</td>
-				<td>209</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_DARK_GREEN</th>
-				<td><span style="background-color:rgb( 28,  52,  24)"></span></td>
-				<td><span style="background-color:rgb( 44,  68,  32)"></span></td>
-				<td><span style="background-color:rgb( 60,  88,  48)"></span></td>
-				<td><span style="background-color:rgb( 80, 104,  60)"></span></td>
-				<td><span style="background-color:rgb(104, 124,  76)"></span></td>
-				<td><span style="background-color:rgb(128, 148,  92)"></span></td>
-				<td><span style="background-color:rgb(152, 176, 108)"></span></td>
-				<td><span style="background-color:rgb(180, 204, 124)"></span></td>
-			</tr>
-			<tr>
-				<td>0x58</td>
-				<td>0x59</td>
-				<td>0x5a</td>
-				<td>0x5b</td>
-				<td>0x5c</td>
-				<td>0x5d</td>
-				<td>0x5e</td>
-				<td>0x5f</td>
-			</tr>
-			<tr class="bottom">
-				<td>88</td>
-				<td>89</td>
-				<td>90</td>
-				<td>91</td>
-				<td>92</td>
-				<td>93</td>
-				<td>94</td>
-				<td>95</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_BLUE</th>
-				<td><span style="background-color:rgb(  0,  52, 160)"></span></td>
-				<td><span style="background-color:rgb(  0,  72, 184)"></span></td>
-				<td><span style="background-color:rgb(  0,  96, 212)"></span></td>
-				<td><span style="background-color:rgb( 24, 120, 220)"></span></td>
-				<td><span style="background-color:rgb( 56, 144, 232)"></span></td>
-				<td><span style="background-color:rgb( 88, 168, 240)"></span></td>
-				<td><span style="background-color:rgb(128, 196, 252)"></span></td>
-				<td><span style="background-color:rgb(188, 224, 252)"></span></td>
-			</tr>
-			<tr>
-				<td>0x92</td>
-				<td>0x93</td>
-				<td>0x94</td>
-				<td>0x95</td>
-				<td>0x96</td>
-				<td>0x97</td>
-				<td>0x98</td>
-				<td>0x99</td>
-			</tr>
-			<tr class="bottom">
-				<td>146</td>
-				<td>147</td>
-				<td>148</td>
-				<td>149</td>
-				<td>150</td>
-				<td>151</td>
-				<td>152</td>
-				<td>153</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_CREAM</th>
-				<td><span style="background-color:rgb(116,  68,  40)"></span></td>
-				<td><span style="background-color:rgb(136,  84,  56)"></span></td>
-				<td><span style="background-color:rgb(164,  96,  64)"></span></td>
-				<td><span style="background-color:rgb(184, 112,  80)"></span></td>
-				<td><span style="background-color:rgb(204, 128,  96)"></span></td>
-				<td><span style="background-color:rgb(212, 148, 112)"></span></td>
-				<td><span style="background-color:rgb(224, 168, 128)"></span></td>
-				<td><span style="background-color:rgb(236, 188, 148)"></span></td>
-			</tr>
-			<tr>
-				<td>0x72</td>
-				<td>0x73</td>
-				<td>0x74</td>
-				<td>0x75</td>
-				<td>0x76</td>
-				<td>0x77</td>
-				<td>0x78</td>
-				<td>0x79</td>
-			</tr>
-			<tr class="bottom">
-				<td>114</td>
-				<td>115</td>
-				<td>116</td>
-				<td>117</td>
-				<td>118</td>
-				<td>119</td>
-				<td>120</td>
-				<td>121</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_MAUVE</th>
-				<td><span style="background-color:rgb( 36,  40,  68)"></span></td>
-				<td><span style="background-color:rgb( 48,  52,  84)"></span></td>
-				<td><span style="background-color:rgb( 64,  64, 100)"></span></td>
-				<td><span style="background-color:rgb( 80,  80, 116)"></span></td>
-				<td><span style="background-color:rgb(100, 100, 136)"></span></td>
-				<td><span style="background-color:rgb(132, 132, 164)"></span></td>
-				<td><span style="background-color:rgb(172, 172, 192)"></span></td>
-				<td><span style="background-color:rgb(212, 212, 224)"></span></td>
-			</tr>
-			<tr>
-				<td>0x80</td>
-				<td>0x81</td>
-				<td>0x82</td>
-				<td>0x83</td>
-				<td>0x84</td>
-				<td>0x85</td>
-				<td>0x86</td>
-				<td>0x87</td>
-			</tr>
-			<tr class="bottom">
-				<td>128</td>
-				<td>129</td>
-				<td>130</td>
-				<td>131</td>
-				<td>132</td>
-				<td>133</td>
-				<td>134</td>
-				<td>135</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_PURPLE</th>
-				<td><span style="background-color:rgb( 40,  20, 112)"></span></td>
-				<td><span style="background-color:rgb( 64,  44, 144)"></span></td>
-				<td><span style="background-color:rgb( 88,  64, 172)"></span></td>
-				<td><span style="background-color:rgb(104,  76, 196)"></span></td>
-				<td><span style="background-color:rgb(120,  88, 224)"></span></td>
-				<td><span style="background-color:rgb(140, 104, 252)"></span></td>
-				<td><span style="background-color:rgb(160, 136, 252)"></span></td>
-				<td><span style="background-color:rgb(188, 168, 252)"></span></td>
-			</tr>
-			<tr>
-				<td>0x88</td>
-				<td>0x89</td>
-				<td>0x8a</td>
-				<td>0x8b</td>
-				<td>0x8c</td>
-				<td>0x8d</td>
-				<td>0x8e</td>
-				<td>0x8f</td>
-			</tr>
-			<tr class="bottom">
-				<td>136</td>
-				<td>137</td>
-				<td>138</td>
-				<td>139</td>
-				<td>140</td>
-				<td>141</td>
-				<td>142</td>
-				<td>143</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_ORANGE</th>
-				<td><span style="background-color:rgb(184, 120,  24)"></span></td>
-				<td><span style="background-color:rgb(204, 136,   8)"></span></td>
-				<td><span style="background-color:rgb(228, 144,   4)"></span></td>
-				<td><span style="background-color:rgb(252, 156,   0)"></span></td>
-				<td><span style="background-color:rgb(252, 176,  48)"></span></td>
-				<td><span style="background-color:rgb(252, 196, 100)"></span></td>
-				<td><span style="background-color:rgb(252, 216, 152)"></span></td>
-				<td><span style="background-color:rgb(244, 220, 176)"></span></td>
-			</tr>
-			<tr>
-				<td>0x40</td>
-				<td>0xc0</td>
-				<td>0xc1</td>
-				<td>0xc2</td>
-				<td>0xc3</td>
-				<td>0xc4</td>
-				<td>0xc5</td>
-				<td>0x27</td>
-			</tr>
-			<tr class="bottom">
-				<td>64</td>
-				<td>192</td>
-				<td>193</td>
-				<td>194</td>
-				<td>195</td>
-				<td>196</td>
-				<td>197</td>
-				<td>39</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_BROWN</th>
-				<td><span style="background-color:rgb( 72,  44,   4)"></span></td>
-				<td><span style="background-color:rgb( 88,  60,  20)"></span></td>
-				<td><span style="background-color:rgb(104,  80,  44)"></span></td>
-				<td><span style="background-color:rgb(124, 104,  72)"></span></td>
-				<td><span style="background-color:rgb(152, 132,  92)"></span></td>
-				<td><span style="background-color:rgb(184, 160, 120)"></span></td>
-				<td><span style="background-color:rgb(212, 188, 148)"></span></td>
-				<td><span style="background-color:rgb(244, 220, 176)"></span></td>
-			</tr>
-			<tr>
-				<td>0x20</td>
-				<td>0x21</td>
-				<td>0x22</td>
-				<td>0x23</td>
-				<td>0x24</td>
-				<td>0x25</td>
-				<td>0x26</td>
-				<td>0x27</td>
-			</tr>
-			<tr class="bottom">
-				<td>32</td>
-				<td>33</td>
-				<td>34</td>
-				<td>35</td>
-				<td>36</td>
-				<td>37</td>
-				<td>38</td>
-				<td>39</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_GREY</th>
-				<td><span style="background-color:rgb( 64,  64,  64)"></span></td>
-				<td><span style="background-color:rgb( 80,  80,  80)"></span></td>
-				<td><span style="background-color:rgb(100, 100, 100)"></span></td>
-				<td><span style="background-color:rgb(116, 116, 116)"></span></td>
-				<td><span style="background-color:rgb(132, 132, 132)"></span></td>
-				<td><span style="background-color:rgb(148, 148, 148)"></span></td>
-				<td><span style="background-color:rgb(168, 168, 168)"></span></td>
-				<td><span style="background-color:rgb(184, 184, 184)"></span></td>
-			</tr>
-			<tr>
-				<td>0x4</td>
-				<td>0x5</td>
-				<td>0x6</td>
-				<td>0x7</td>
-				<td>0x8</td>
-				<td>0x9</td>
-				<td>0xa</td>
-				<td>0xb</td>
-			</tr>
-			<tr class="bottom">
-				<td>4</td>
-				<td>5</td>
-				<td>6</td>
-				<td>7</td>
-				<td>8</td>
-				<td>9</td>
-				<td>10</td>
-				<td>11</td>
-			</tr>
-			
-			<tr class="top">
-				<th rowspan="3">COLOUR_WHITE</th>
-				<td><span style="background-color:rgb(132, 132, 132)"></span></td>
-				<td><span style="background-color:rgb(148, 148, 148)"></span></td>
-				<td><span style="background-color:rgb(168, 168, 168)"></span></td>
-				<td><span style="background-color:rgb(184, 184, 184)"></span></td>
-				<td><span style="background-color:rgb(200, 200, 200)"></span></td>
-				<td><span style="background-color:rgb(216, 216, 216)"></span></td>
-				<td><span style="background-color:rgb(232, 232, 232)"></span></td>
-				<td><span style="background-color:rgb(252, 252, 252)"></span></td>
-			</tr>
-			<tr>
-				<td>0x8</td>
-				<td>0x9</td>
-				<td>0xa</td>
-				<td>0xb</td>
-				<td>0xc</td>
-				<td>0xd</td>
-				<td>0xe</td>
-				<td>0xf</td>
-			</tr>
-			<tr class="bottom">
-				<td>8</td>
-				<td>9</td>
-				<td>10</td>
-				<td>11</td>
-				<td>12</td>
-				<td>13</td>
-				<td>14</td>
-				<td>15</td>
-			</tr>
-		</tbody>
-	</table>
-</body>
-</html>

docs/eints.md

@@ -1,117 +0,0 @@
-# Translations for OpenTTD
-
-Eints is [OpenTTD's WebTranslator](https://translator.openttd.org/).
-
-- Registered translators translate from English to their language.
-- Eints validates the translations syntactically and that parameter usage matches the English base language.
-- Eints synchronises translations to OpenTTD's repository every day, shortly before the nightly build.
-
-When adding or altering strings in english.txt, you should stick to some rules, so translations are handled smoothly by Eints and translators.
-This document gives some guidelines.
-
-
-## I want to change a translation.
-
-### I want to become a regular translator.
-
-Just [sign up](https://github.com/OpenTTD/team/issues/new/choose) as a translator.
-
-### I only want to point out some issues / typos in the current translation, or suggest a change.
-
-[Open an issue](https://github.com/OpenTTD/OpenTTD/issues/new/choose), so it can be assigned to the translation team of the language.
-The translators will decide whether, where and how to apply your suggestion.
-
-### I want to submit translations via PR.
-
-Sorry, we don't offer this option.
-
-### I want to change the language definition (plural form, genders, cases) of a translation.
-
-Please [create an issue](https://github.com/OpenTTD/OpenTTD/issues/new/choose) for this.
-
-### I want to add an entirely new translation language.
-
-OpenTTD has more than 4000 strings, translating all of them is a lot of work.
-Despite the initial enthusiasm, only few people have the endurance to get to even 20% translation progress.
-
-As such, starting a new translation requires the prospect that there is also translation interest in the future.
-And, frankly, OpenTTD probably already covers all languages to which this applies, and a few more.
-
-If you still want to make the case, that your language is spoken by several 100 million people, please [create an issue](https://github.com/OpenTTD/OpenTTD/issues/new/choose) for adding a new language.
-
-
-## I want to change the English base language (english.txt).
-
-### I want to change the wording / fix a typo in an English string, without changing the meaning (drastically).
-
-Just change it in your PR.
-
-Translators will be notified that their translation became "outdated", so they can double-check whether the translation needs updating.
-
-### I want to add/change/remove parameters from an English string.
-
-Just change the parameters in english.txt in your PR.
-Don't touch the translations, please ignore compile warnings about them.
-
-Translators will be notified that their translation became "invalid", so they can adjust the translation.
-Eints will remember the old translations for translators to view, but remove them from the git repository, while they are "invalid"; so there won't be any compile warnings after the nightly sync.
-
-### I want to change the meaning of an English string, so that no existing translation makes any sense anymore.
-
-In this case, please change the STR_xxx string identifier of the string; basically: remove the old string, add a new one.
-Don't touch the translations, please ignore compile warnings about them.
-
-Eints will discard all memory of the old strings in the nightly sync, and translators can start fresh with a new string.
-
-### I want to add a new string.
-
-Add the new string somewhere in english.txt, where it fits with the neighbouring strings.
-Don't touch the translations, even if you can speak some of the languages.
-
-### I want to remove an unused string.
-
-Remove the string from english.txt.
-Don't touch the translations, please ignore compile warnings about them.
-
-Eints will remove the translations from the git repository in the nightly sync.
-
-### I want to reorder strings in english.txt without changing them.
-
-Reorder english.txt as you like. Don't touch the translations.
-
-Eints will reorder all translations to match english.txt in the nightly sync.
-
-### I want to add/change '#' comments.
-
-Change comments in english.txt as you like. Don't touch the translations.
-
-Eints will replicate comments into all translations in the nightly sync. Comments are not translated.
-
-### I want to change the STR_xxx string identifier for code style reasons, without changing the English text.
-
-This is the only case, where your PR should also edit translations.
-The STR_xxx string identifier is used by Eints as key value to track strings and translations. If you change it, that's the same as deleting a string and adding an unrelated new one.
-So, to keep translations, you have to replace the STR_xxx for all translations in the PR as well.
-
-However, you will only be able to keep the translations which are part of the git repository.
-Translation history and information about translations being "outdated" will be lost.
-So, keep your code style OCD to a minimum :)
-
-
-## I want to fight a bot and lose.
-
-Here are some things, people sometimes want to do, but which won't work.
-
-### I want to enforce re-translation by clearing current translations.
-
-You have to change the STR_xxx string identifier, that's the only option.
-
-You cannot "clear" translations by removing them via PR; eints will reinstall the previous "syntactically perfect valid" translation.
-
-### I want to revert a broken change, some translator just did via eints.
-
-You have to revert the translations via the WebTranslator interface.
-If there are many changes, ask someone with Admin access to eints, so they can manually upload a fixed translation file to eints.
-
-You cannot revert translations changes via PR. Eints merges translations from git and from web by keeping a translation history, and committing the newest translation to git.
-If you revert to an old translation in git, eints will simply think git did not yet get the newer translation, and commit it again.

docs/game_coordinator.md

@@ -1,83 +0,0 @@
-# Game Coordinator
-
-To allow two players to play together, OpenTTD uses a Game Coordinator to
-facilitate this.
-
-When a server starts, it can register itself to the Game Coordinator. This
-happens when `server_game_type` is set to either `invite-only` or `public`.
-Upon registration, the Game Coordinator probes the network of the server, and
-assigns the server an unique code, called an `invite code`.
-
-When a client wants to join a server, it asks the Game Coordinator to help
-with this by giving it the `invite code` of the server. The Game Coordinator
-will, in this order, attempt several ways to connect the client and server
-together:
-
-## 1) Via direct IPv4 / IPv6
-
-Upon registration, the Game Coordinator probes the server to see if a
-direction connection to the server is possible based on the game port. It
-tries this over the public IPv4 and IPv6, as announced by the server.
-If either (or both) are successful, a client will always be asked to try
-these direct IPs first when it wants to connect to this server.
-
-- If the server is IPv4 only, the client is only asked to connect via IPv4.
-- If the server is IPv6 only, the client is only asked to connect via IPv6.
-- If the server is both IPv4 and IPv6, the client is asked to connect to to
-  one of those first. If that fails, it is asked to connect to the other.
-  Whether it tries IPv4 or IPv6 first, strongly depends on several network
-  infrastructure related events. The biggest influence is the network
-  latency over both protocols to the OpenTTD infrastructure.
-
-In the end, if either the server is not reachable directly from the Internet
-or the client fails to connect to either one of them, the connection attempt
-continues with the next available method.
-
-## 2) Via STUN
-
-When a client wants to join a server via STUN, both the client and server
-are asked to create a connection to the STUN server (normally
-`stun.openttd.org`) via both IPv4 and IPv6. If the client or server has no
-IPv4 or IPv6, it will not make a connection attempt via that protocol.
-
-The STUN server collects the public IPv4 and/or IPv6 of the client and server,
-together with the port the connection came in from. For most NAT gateways it
-holds true that as long as you use the same local IP + port, your public
-IP + port will remain the same, and allow for bi-directional communication.
-And this fact is used to later on pair the client and server.
-
-The STUN server reports this information directly to the Game Coordinator
-(this in contrast to most STUN implementation, where this information is
-first reported back to the peer itself, which has to relay it back to the
-coordinator. OpenTTD skips this step, as the STUN server can directly talk to
-the Game Coordinator). When the Game Coordinator sees a matching pair (in
-terms of IPv4 / IPv6), it will ask both the client and server to connect to
-their peer based on this public IP + port.
-
-As the NAT gateway forwards the traffic on the public IP + port to the local
-port, this creates a bi-directional socket between client and server. The
-connection to the STUN server can now safely be closed, and the client and
-server can continue to talk to each other.
-
-Some NAT gateways do not allow this method; for those this attempt will fail,
-and this also means that it is not possible to create a connection between
-the client and server.
-
-## 3) Via TURN
-
-As a last resort, the Game Coordinator can decide to connect the client and
-server together via TURN. TURN is a relay service, relaying the messages
-between client and server.
-
-As the client and server can already connect to the Game Coordinator, it is
-very likely this is successful.
-
-It is important to note that a relay service has full view of the traffic
-send between client and server, and as such it is important that you trust
-the relay service used.
-For official binaries, this relay service is hosted by openttd.org. The relay
-service as hosted by openttd.org only validates it is relaying valid OpenTTD
-packets and does no further inspection of the payload itself.
-Although in our experience most patch-packs also use the services as offered
-by openttd.org, it is possible they use different services. Please be mindful
-about this.

docs/landscape_grid.html

@@ -79,7 +79,7 @@ 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=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 type">XXXX</span> <span class="used" title="Presence and direction of bridge above">XX</span> <span class="used" title="Tropic Zone: only meaningfull 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>

docs/multiplayer.md

@@ -1,207 +1,220 @@
 # Multiplayer manual for OpenTTD
 
+Last updated:    2011-02-16
+
+
 ## Table of contents
 
 - 1.0) [Starting a server](#10-starting-a-server)
 - 2.0) [Connecting to a server](#20-connecting-to-a-server)
-  - 2.1) [Connecting to a server over the console](#21-connecting-to-a-server-over-the-console)
+    - 2.1) [Connecting to a server over the console](#21-connecting-to-a-server-over-the-console)
 - 3.0) [Playing internet games](#30-playing-internet-games)
 - 4.0) [Tips for servers](#40-tips-for-servers)
-  - 4.1)[Imposing landscaping limits](#41-imposing-landscaping-limits)
+    - 4.1)[Imposing landscaping limits](#41-imposing-landscaping-limits)
 - 5.0) [Some useful things](#50-some-useful-things)
 - 6.0) [Troubleshooting](#60-troubleshooting)
 
 
 ## 1.0) Starting a server
 
-- Click on "Multiplayer" in the Start Menu.
-- Click on "Start Server".
-- Give your server a name.
-- Select the visibility of your server:
-  - "Public": your server will be publicly listed.
-  - "Invite Only": only players who have the invite code for your server can
-    join.
-  - "Local": only players on your local network can join.
-- (optional) Set a password for your server.
-- Click "New Game", "Load Game", or "Play Scenario".
-- Start playing.
+ - Make sure that you have your firewall of the computer as well as possible
+   routers or modems of the server configured such that:
+    - port 3979 is free for both UDP and TCP connections in- and outgoing
+    - port 3978 is free outbound for UDP in order to advertise with the master
+     server (if desired). Otherwise you'll have to tell players your IP.
+    - port 3977 if use of the admin interface is desired (see admin_network.txt)
+ - Click "multiplayer" on the startup screen
+ - Click "start server"
+ - Type in a game name
+ - Select the type of game ('LAN/Internet' or 'Internet (advertise)'. With the
+   last one other people are able to see you online. Else they need your IP and
+   port to join)
+ - Click "start game", "load game" or "load scenario"
+ - Start playing
+
 
 ## 2.0) Connecting to a server
 
-- Click on "Multiplayer" in the Start Menu.
-- There are three ways to join a server:
-  - If you want to connect to a local server, click "Search LAN".
-  - If you want to connect to a public game, click "Search internet".
-  - If the server-owner shared an invite code with you:
-    - Click "Add Server".
-    - Fill in the invite code, which always starts with a `+`.
-    - Click "OK".
-- Click on the server you want to join.
-- Click "Join Game".
-- If the server has a password, it will ask you for this.
-- You see a progressbar how far you are with joining the server.
-- Happy playing.
+ - Click "multiplayer" on the startup screen
+ - If you want to connect to any network game in your LAN click on 'LAN', then
+   on 'Find Server'
+ - If you want to see which servers all online on the Internet, click on
+   'Internet' and 'Find Server'
+ - If there were more than one server
+    - select one in the list below the buttons
+    - click on 'join game'
+ - If you want to play and you have the ip or hostname of the game server you
+   want connect to.
+    - click add server
+    - type in the ip address or hostname
+    - if you want to add a port use :<port>
+ - Now you can select a company and press: "Join company", to help that company
+    - Or you can press "Spectate game", to spectate the game
+    - Or you can press "New company", and start your own company (if there are
+   slots free)
+ - You see a progressbar how far you are with joining the server.
+ - Happy playing
 
 ## 2.1) Connecting to a server over the console
 
-- Open the console and type `connect` for help how to connect via the console.
+ - Open the console and type in the following command:
+    connect `<ip/host>:<port>#<company-no>`
+
 
 ## 3.0) Playing internet games
 
-- Servers with a red dot behind it have a different version then you have. You
-  will not be able to join those servers.
+ - Servers with a red dot behind it have a different version then you have. You
+   will not be able to join those servers.
 
-- Servers with a yellow dot behind it have NewGRFs that you do not have. You
-  will not be able to join those servers. However, via "NewGRF Settings" and
-  "Find missing content online" you might be able to download the needed
-  NewGRFs after which you can join the server.
+ - Servers with a yellow dot behind it have NewGRFs that you do not have. You
+   will not be able to join those servers. However, via "NewGRF Settings" and
+   "Find missing content online" you might be able to download the needed
+   NewGRFs after which you can join the server.
 
-- It can happen that a connection is that slow, or you have that many clients
-  connected to your server, that your clients start to loose their connection.
-  Some things you can do about it:
-  - `[network] frame_freq`:
-    change it in console with: `set network.frame_freq <number>`
-    the number should be between the 0 and 10, not much higher. It indicates
-    the delay between clicking and showing up. The higher, the more you notice
-    it, but the less bandwidth you use.
-    A good value for Internet-games is 2 or 3.
+ - It can happen that a connection is that slow, or you have that many clients
+   connected to your server, that your clients start to loose their connection.
+   Some things you can do about it:
+   - [network] frame_freq:
+     change it in console with: 'set network.frame_freq <number>'
+     the number should be between the 0 and 10, not much higher. It indicates
+     the delay between clicking and showing up. The higher, the more you notice
+     it, but the less bandwidth you use.
+     A good value for Internet-games is 2 or 3.
 
-  - `[network] sync_freq`:
-    change it in console with: `set network.sync_freq <number>`
-    the number should be between the 50 and 1000, not much lower, not much
-    higher. It indicates the time between sync-frames. A sync-frame is a frame
-    which checks if all clients are still in sync. When the value it too high,
-    clients can desync in 1960, but the server detects it in 1970. Not really
-    handy. The lower the value, the more bandwidth it uses.
+   - [network] sync_freq:
+     change it in console with: 'set network.sync_freq <number>'
+     the number should be between the 50 and 1000, not much lower, not much
+     higher. It indicates the time between sync-frames. A sync-frame is a frame
+     which checks if all clients are still in sync. When the value it too high,
+     clients can desync in 1960, but the server detects it in 1970. Not really
+     handy. The lower the value, the more bandwidth it uses.
+
+   NB: changing frame_freq has more effect on the bandwidth then sync_freq.
 
-   NB: changing `frame_freq` has more effect on the bandwidth then `sync_freq`.
 
 ## 4.0) Tips for servers
 
-- You can launch a dedicated server by adding `-D` as parameter.
-- In UNIX like systems, you can fork your dedicated server by adding `-f` as
-  parameter.
+ - You can launch a dedicated server by adding -D as parameter.
+ - In UNIX like systems, you can fork your dedicated server by adding -f as
+   parameter.
 
-- You can automatically clean companies that do not have a client connected to
-  them, for, let's say, 3 years. You can do this via: `set autoclean_companies`
-  and `set autoclean_protected` and `set autoclean_unprotected`. Unprotected
-  removes a password from a company when it is not used for more then the
-  defined amount of months. `set autoclean_novehicles` can be used to remove
-  companies without any vehicles quickly.
+ - You can automatically clean companies that do not have a client connected to
+   them, for, let's say, 3 years. You can do this via: 'set autoclean_companies'
+   and 'set autoclean_protected' and 'set autoclean_unprotected'. Unprotected
+   removes a password from a company when it is not used for more then the
+   defined amount of months. 'set autoclean_novehicles' can be used to remove
+   companies without any vehicles quickly.
 
-- You can also do this manually via the console: `reset_company`.
+ - You can also do this manually via the console: 'reset_company'.
 
-- You can let your server automatically restart a map when, let's say,
-  year 2030 is reached. See `set restart_game_date` for detail.
+ - You can let your server automatically restart a map when, let's say, year 2030
+   is reached. See 'set restart_game_date' for detail.
 
-- If you want to be on the server-list, make your server public. You can do
-  this either from the Start Server window, via the in-game Online Players
-  window, or by typing in the console: `set server_game_type public`.
+ - If you want to be on the server-list, enable Advertising. To do this, select
+   'Internet (advertise)' in the Start Server menu, or type in console:
+   'set server_advertise 1'.
 
-- You can protect your server with a password via the console: `set server_pw`,
-  or via the Start Server menu.
+ - You can protect your server with a password via the console: 'set server_pw',
+   or via the Start Server menu.
 
-- When you have many clients connected to your server via Internet, watch your
-  bandwidth (if you have any limit on it, set by your ISP). One client uses
-  about 1.5 kilobytes per second up and down. To decrease this amount, setting
-  `frame_freq` to 1 will reduce it to roughly 1 kilobyte per second per client.
+ - When you have many clients connected to your server via Internet, watch your
+   bandwidth (if you have any limit on it, set by your ISP). One client uses
+   about 1.5 kilobytes per second up and down. To decrease this amount, setting
+   'frame_freq' to 1 will reduce it to roughly 1 kilobyte per second per client.
 
-- OpenTTD's default settings for maximum number of clients, and amount of data
-  from clients to process are chosen to not influence the normal playing of
-  people, but to prevent or at least make it less likely that someone can
-  perform a (distributed) denial-of-service attack on your server by causing
-  an out-of-memory event by flooding the server with data to send to all
-  clients. The major factor in this is the maximum number of clients; with
-  32 clients "only" sending one chat message causes 1024 messages to be
-  distributed in total, with 64 clients that already quadruples to 4096. Given
-  that upstream bandwidth is usually the limiting factor, a queue of packets
-  that need to be sent will be created.
-  To prevent clients from exploiting this "explosion" of packets to send we
-  limit the number of incoming data, resulting in effectively limiting the
-  amount of data that OpenTTD will send to the clients. Even with the default
-  limits it is possible to generate about 70.000 packets per second, or about
-  7 megabit per second of traffic.
-  Given that OpenTTD kicks clients after they have not reacted within about 9
-  seconds from sending a frame update packet it would be possible that OpenTTD
-  keeps about 600.000 packets in memory, using about 50 megabytes of memory.
-  Given that OpenTTD allows short bursts of packets, you can have slightly
-  more packets in memory in case of a distributed denial of service attack.
-  When increasing the amount of incoming data, or the maximum number of
-  clients the amount of memory OpenTTD needs in case of a distributed denial
-  of service attack is linearly related to the amount of incoming data and
-  quadratic to the amount of clients. In short, a rule of thumb for, the
-  maximum memory usage for packets is:
-  `#max_clients * #max_clients * bytes_per_frame * 10 KiB`.
+ - OpenTTD's default settings for maximum number of clients, and amount of data
+   from clients to process are chosen to not influence the normal playing of
+   people, but to prevent or at least make it less likely that someone can
+   perform a (distributed) denial-of-service attack on your server by causing
+   an out-of-memory event by flooding the server with data to send to all
+   clients. The major factor in this is the maximum number of clients; with
+   32 clients "only" sending one chat message causes 1024 messages to be
+   distributed in total, with 64 clients that already quadruples to 4096. Given
+   that upstream bandwidth is usually the limiting factor, a queue of packets
+   that need to be sent will be created.
+   To prevent clients from exploiting this "explosion" of packets to send we
+   limit the number of incoming data, resulting in effectively limiting the
+   amount of data that OpenTTD will send to the clients. Even with the default
+   limits it is possible to generate about 70.000 packets per second, or about
+   7 megabit per second of traffic.
+   Given that OpenTTD kicks clients after they have not reacted within about 9
+   seconds from sending a frame update packet it would be possible that OpenTTD
+   keeps about 600.000 packets in memory, using about 50 megabytes of memory.
+   Given that OpenTTD allows short bursts of packets, you can have slightly
+   more packets in memory in case of a distributed denial of service attack.
+   When increasing the amount of incoming data, or the maximum number of
+   clients the amount of memory OpenTTD needs in case of a distributed denial
+   of service attack is linearly related to the amount of incoming data and
+   quadratic to the amount of clients. In short, a rule of thumb for, the
+   maximum memory usage for packets is:
+       #max_clients * #max_clients * bytes_per_frame * 10 KiB.
 
 ### 4.1) Imposing landscaping limits
 
-- You can impose limits on companies by the following 4 settings:
-  - `terraform_per_64k_frames`
-  - `terraform_frame_burst`
-  - `clear_per_64k_frames`
-  - `clear_frame_burst`
+ - You can impose limits on companies by the following 4 settings:
+   - terraform_per_64k_frames
+   - terraform_frame_burst
+   - clear_per_64k_frames
+   - clear_frame_burst
 
-- Explaining `NNN_burst` and `NNN_per_64K_frames`
-  - `NNN_burst` defines 3 things, the maximum limit, the limit of a single
-    action, and the initial value for the limit assigned to a new company.
-    This setting is fairly simple and requires no math.
+ - Explaining 'per_64K_frames' and 'burst'
+    - 'burst' defines 3 things, the maximum limit, the limit of a single action,
+      and the initial value for the limit assigned to a new company.
+      This setting is fairly simple and requires no math.
 
-    A value of 1 means a single tile can be affected by a single action.
-    This results in having to click 400 times when wanting to cover an area
-    of 20 x 20 tiles.
+      A value of 1 means a single tile can be affected by a single action.
+      This results in having to click 400 times when wanting to cover an area
+      of 20 x 20 tiles.
 
-    The default value 4096 covers an area of 64 x 64 tiles.
+      The default value 4096 covers an area of 64 x 64 tiles.
 
-  - `NNN_per_64K_frames` defines the number of tiles added to each companies
-    limit per frame (however not past the possible maximum value,the
-    `NNN_burst`). 64k rather resembles the exact number of 65536 frames. So
-    setting this variable to 65536 means: `65536 / 65536 = 1 tile per frame`.
+    - 'per_64k_frames' defines the number of tiles added to each companies limit
+      per frame (however not past the possible maximum value,the 'burst').
+      64k rather resembles the exact number of 65536 frames. So setting this
+      variable to 65536 means: 65536 / 65536 = 1 tile per frame.
+      As a day consists of 74 frames, a company's limit is increased by 74
+      tiles during the course of a single day (2.22 seconds).
 
-    As a day consists of 74 frames, a company's limit is increased by 74
-    tiles during the course of a single day (2.22 seconds).
-    To achieve a 1 tile per day increase the following calculation is needed:
-    `1 / 74 (frames per day) * 65536 (per_64k_frames) = 885.62...`.
-    After rounding: a value of 886 means adding a bit over 1 tile per day.
+      To achieve a 1 tile per day increase the following calculation is needed:
+      1 / 74 (frames per day) * 65536 (per_64k_frames) = 885.62...
+      after rounding: a value of 886 means adding a bit over 1 tile per day.
 
-    There is still enough space to scale this value downwards:
-    decreasing this value to 127 results in a bit over 1 tile added to the
-    allowance per week (7 days).
+      There is still enough space to scale this value downwards:
+      decreasing this value to 127 results in a bit over 1 tile added to the
+      allowance per week (7 days).
 
-    To create a setup in which a company gets an initial allowance only,
-    set the value to 0 - no increase of the allowance per frame.
+      To create a setup in which a company gets an initial allowance only,
+      set the value to 0 - no increase of the allowance per frame.
+
+ - Even though construction actions include a clear tile action, they are not
+   affected by the above settings.
 
-- Even though construction actions include a clear tile action, they are not
-  affected by the above settings.
 
 ## 5.0) Some useful things
 
-- You can protect your company so nobody else can join uninvited. To do this,
-  set a password in your Company window.
+ - You can protect your company so nobody else can join uninvited. To do this,
+   set a password in your Company Screen
 
-- You can chat with other players via ENTER or via SHIFT+T or via the Online
-  Players window
+ - You can give other players some money via the ClientList (under the 'head'
+   in the mainbar).
+
+ - You can chat with other players via ENTER or via SHIFT+T or via the ClientList
+
+ - Servers can now kick players, so don't make them use it!
 
-- Servers can kick players, so don't make them use it!
 
 ## 6.0) Troubleshooting
 
-### My server does not show up in the serverlist
+ - My advertising server does not show up in list at servers.openttd.org
+     Run openttd with the '-d net=2' parameter. That will show which incoming
+     communication is received, whether the replies from the master server or
+     communication from an admin tool reach the programme. See section 1
+     'Starting a server' further up for the ports and protocols used by OpenTTD.
+     The ports can be configured in the config file.
 
-Check if the visibility of your server is set to `public`.
-
-If it is, and your server still isn't showing up, start OpenTTD with
-`-d net=4` as extra argument. This will show debug message related to the
-network, including communication to/from the Game Coordinator.
-
-### My server warns a lot about getaddrinfo taking N seconds
-
-This could be a transient issue with your (local) DNS server, but if the
-problem persists there is likely a configuration issue in DNS resolving on
-your computer.
-
-#### Running OpenTTD in a Docker container?
-
-This is an issue with dual-stack Docker containers. If there is no default
-IPv6 resolver and IPv6 traffic is preferred, DNS requests will time out after
-5 seconds. To resolve this, use an IPv4 DNS server for your Docker container,
-for example by adding `--dns 1.1.1.1` to your `docker run` command.
+ - My advertising server warns a lot about getaddrinfo taking N seconds
+     This could be a transient issue with your (local) DNS server, but if the
+     problem persists there is likely a configuration issue in DNS resolving
+     on your computer. This seems to be a common configuration issue for
+     Docker instances, where the DNS resolving waits for a time out of usually
+     5 seconds.

docs/savegame_format.md

@@ -1,214 +0,0 @@
-# OpenTTD's Savegame Format
-
-Last updated: 2021-06-15
-
-## Outer container
-
-Savegames for OpenTTD start with an outer container, to contain the compressed data for the rest of the savegame.
-
-`[0..3]` - The first four bytes indicate what compression is used.
-In ASCII, these values are possible:
-
-- `OTTD` - Compressed with LZO (deprecated, only really old savegames would use this).
-- `OTTN` - No compression.
-- `OTTZ` - Compressed with zlib.
-- `OTTX` - Compressed with LZMA.
-
-`[4..5]` - The next two bytes indicate which savegame version used.
-
-`[6..7]` - The next two bytes can be ignored, and were only used in really old savegames.
-
-`[8..N]` - Next follows a binary blob which is compressed with the indicated compression algorithm.
-
-The rest of this document talks about this decompressed blob of data.
-
-## Data types
-
-The savegame is written in Big Endian, so when we talk about a 16-bit unsigned integer (`uint16`), we mean it is stored in Big Endian.
-
-The following types are valid:
-
-- `1` - `int8` / `SLE_FILE_I8` -8-bit signed integer
-- `2` - `uint8` / `SLE_FILE_U8` - 8-bit unsigned integer
-- `3` - `int16` / `SLE_FILE_I16` - 16-bit signed integer
-- `4` - `uint16` / `SLE_FILE_U16` - 16-bit unsigned integer
-- `5` - `int32` / `SLE_FILE_I32` - 32-bit signed integer
-- `6` - `uint32` / `SLE_FILE_U32` - 32-bit unsigned integer
-- `7` - `int64` / `SLE_FILE_I64` - 64-bit signed integer
-- `8` - `uint64` / `SLE_FILE_U64` - 64-bit unsigned integer
-- `9` - `StringID` / `SLE_FILE_STRINGID` - a StringID inside the OpenTTD's string table
-- `10` - `str` / `SLE_FILE_STRING` - a string (prefixed with a length-field)
-- `11` - `struct` / `SLE_FILE_STRUCT` - a struct
-
-### Gamma value
-
-There is also a field-type called `gamma`.
-This is most often used for length-fields, and uses as few bytes as possible to store an integer.
-For values <= 127, it uses a single byte.
-For values > 127, it uses two bytes and sets the highest bit to high.
-For values > 32767, it uses three bytes and sets the two highest bits to high.
-And this continues till the value fits.
-In a more visual approach:
-```
-  0xxxxxxx
-  10xxxxxx xxxxxxxx
-  110xxxxx xxxxxxxx xxxxxxxx
-  1110xxxx xxxxxxxx xxxxxxxx xxxxxxxx
-  11110--- xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx
-```
-
-## Chunks
-
-Savegames for OpenTTD store their data in chunks.
-Each chunk contains data for a certain part of the game, for example "Companies", "Vehicles", etc.
-
-`[0..3]` - Each chunk starts with four bytes to indicate the tag.
-If the tag is `\x00\x00\x00\x00` it means the end of the savegame is reached.
-An example of a valid tag is `PLYR` when looking at it via ASCII, which contains the information of all the companies.
-
-`[4..4]` - Next follows a byte where the lower 4 bits contain the type.
-The possible valid types are:
-
-- `0` - `CH_RIFF` - This chunk is a binary blob.
-- `1` - `CH_ARRAY` - This chunk is a list of items.
-- `2` - `CH_SPARSE_ARRAY` - This chunk is a list of items.
-- `3` - `CH_TABLE` - This chunk is self-describing list of items.
-- `4` - `CH_SPARSE_TABLE` - This chunk is self-describing list of items.
-
-Now per type the format is (slightly) different.
-
-### CH_RIFF
-
-(since savegame version 295, this chunk type is only used for MAP-chunks, containing bit-information about each tile on the map)
-
-A `CH_RIFF` starts with an `uint24` which together with the upper-bits of the type defines the length of the chunk.
-In pseudo-code:
-
-```
-type = read uint8
-if type == 0
-    length = read uint24
-    length |= ((type >> 4) << 24)
-```
-
-The next `length` bytes are part of the chunk.
-What those bytes mean depends on the tag of the chunk; further details per chunk can be found in the source-code.
-
-### CH_ARRAY / CH_SPARSE_ARRAY
-
-(this chunk type is deprecated since savegame version 295 and is no longer in use)
-
-`[0..G1]` - A `CH_ARRAY` / `CH_SPARSE_ARRAY` starts with a `gamma`, indicating the size of the next item plus one.
-If this size value is zero, it indicates the end of the list.
-This indicates the full length of the next item minus one.
-In psuedo-code:
-
-```
-loop
-    size = read gamma - 1
-    if size == -1
-        break loop
-    read <size> bytes
-```
-
-`[]` - For `CH_ARRAY` there is an implicit index.
-The loop starts at zero, and every iteration adds one to the index.
-For entries in the game that were not allocated, the `size` will be zero.
-
-`[G1+1..G2]` - For `CH_SPARSE_ARRAY` there is an explicit index.
-The `gamma` following the size indicates the index.
-
-The content of the item is a binary blob, and similar to `CH_RIFF`, it depends on the tag of the chunk what it means.
-Please check the source-code for further details.
-
-### CH_TABLE / CH_SPARSE_TABLE
-
-(this chunk type only exists since savegame version 295)
-
-Both `CH_TABLE` and `CH_SPARSE_TABLE` are very similar to `CH_ARRAY` / `CH_SPARSE_ARRAY` respectively.
-The only change is that the chunk starts with a header.
-This header describes the chunk in details; with the header you know the meaning of each byte in the binary blob that follows.
-
-`[0..G]` - The header starts with a `gamma` to indicate the size of all the headers in this chunk plus one.
-If this size value is zero, it means there is no header, which should never be the case.
-
-Next follows a list of `(type, key)` pairs:
-
-- `[0..0]` - Type of the field.
-- `[1..G]` - `gamma` to indicate length of key.
-- `[G+1..N]` - Key (in UTF-8) of the field.
-
-If at any point `type` is zero, the list stops (and no `key` follows).
-
-The `type`'s lower 4 bits indicate the data-type (see chapter above).
-The `type`'s 5th bit (so `0x10`) indicates if the field is a list, and if this field in every record starts with a `gamma` to indicate how many times the `type` is repeated.
-
-If the `type` indicates either a `struct` or `str`, the `0x10` flag is also always set.
-
-As the savegame format allows (list of) structs in structs, if any `struct` type is found, this header will be followed by a header of that struct.
-This nesting of structs is stored depth-first, so given this table:
-
-```
-type   | key
------------------
-uint8  | counter
-struct | substruct1
-struct | substruct2
-```
-
-With `substruct1` being like:
-
-```
-type   | key
------------------
-uint8  | counter
-struct | substruct3
-```
-
-The headers will be, in order: `table`, `substruct1`, `substruct3`, `substruct2`, each ending with a `type` is zero field.
-
-After reading all the fields of all the headers, there is a list of records.
-To read this, see `CH_ARRAY` / `CH_SPARSE_ARRAY` for details.
-
-As each `type` has a well defined length, you can read the records even without knowing anything about the chunk-tag yourself.
-
-Do remember, that if the `type` had the `0x10` flag active, the field in the record first has a `gamma` to indicate how many times that `type` is repeated.
-
-#### Guidelines for network-compatible patch-packs
-
-For network-compatible patch-packs (client-side patches that can play together with unpatched clients) we advise to prefix the field-name with `__<shortname>` when introducing new fields to an existing chunk.
-
-Example: you have an extra setting called `auto_destroy_rivers` you want to store in the savegame for your patched client called `mypp`.
-We advise you to call this setting `__mypp_auto_destroy_rivers` in the settings chunk.
-
-Doing it this way ensures that a savegame created by these patch-packs can still safely be loaded by unpatched clients.
-They will simply ignore the field and continue loading the savegame as usual.
-The prefix is strongly advised to avoid conflicts with future-settings in an unpatched client or conflicts with other patch-packs.
-
-## Scripts custom data format
-
-Script chunks (`AIPL` and `GSDT`) use `CH_TABLE` chunk type.
-
-At the end of each record there's an `uint8` to indicate if there's custom data (1) or not (0).
-
-There are 6 data types for scripts, called `script-data-type`.
-When saving, each `script-data-type` starts with the type marker saved as `uint8` followed by the actual data.
-- `0` - `SQSL_INT`:
-  - an `int64` with the actual value (`int32` before savegame version 296).
-- `1` - `SQSL_STRING`:
-  - an `uint8` with the string length.
-  - a list of `int8` for the string itself.
-- `2` - `SQSL_ARRAY`:
-  - each element saved as `script-data-type`.
-  - an `SQSL_ARRAY_TABLE_END` (0xFF) marker (`uint8`).
-- `3` - `SQSL_TABLE`:
-  - for each element:
-    - key saved as `script-data-type`.
-    - value saved as `script-data-type`.
-  - an `SQSL_ARRAY_TABLE_END` (0xFF) marker (`uint8`).
-- `4` - `SQSL_BOOL`:
-  - an `uint8` with 0 (false) or 1 (true).
-- `5` - `SQSL_NULL`:
-  - (no data follows)
-
-The first data type is always a `SQSL_TABLE`.

known-bugs.txt

@@ -1,4 +1,6 @@
 OpenTTD's known bugs
+Last updated:    2021-04-01
+Release version: 1.11.0
 ------------------------------------------------------------------------
 
 

media/baseset/CMakeLists.txt

@@ -17,7 +17,6 @@ set(BASESET_OTHER_SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/openttd.grf
         ${CMAKE_CURRENT_SOURCE_DIR}/opntitle.dat
         ${CMAKE_CURRENT_SOURCE_DIR}/orig_extra.grf
-        ${CMAKE_CURRENT_SOURCE_DIR}/../openttd.32.bmp
 )
 
 # Done by the subdirectories, if nforenum / grfcodec is installed

media/baseset/openttd/openttdgui.nfo

@@ -4,7 +4,7 @@
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
    -1 * 0	 0C "OpenTTD GUI graphics"
-   -1 * 3	 05 15 \b 191 // OPENTTD_SPRITE_COUNT
+   -1 * 3	 05 15 \b 186 // OPENTTD_SPRITE_COUNT
    -1 sprites/openttdgui.png 8bpp  66    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 146    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 226    8  64  31 -31   7 normal
@@ -191,8 +191,3 @@
    -1 sprites/openttdgui_convert_tram.png 8bpp  24   0  32  32   0   0 normal
    -1 sprites/openttdgui.png 8bpp 513  440  10  10   0   0 normal
    -1 sprites/openttdgui.png 8bpp 526  440  10  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 539  440  12  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 553  440  12  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 567  440  12  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 581  440  10  10   0   0 normal
-   -1 sprites/openttdgui.png 8bpp 593  440  10  10   0   0 normal

os/emscripten/Dockerfile

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

os/emscripten/README.md

@@ -1,6 +1,6 @@
 ## How to build with Emscripten
 
-Building with Emscripten works with emsdk 2.0.31 and above.
+Building with Emscripten works with emsdk 2.0.10 and above.
 
 Currently there is no LibLZMA support upstream; for this we suggest to apply
 the provided patch in this folder to your emsdk installation.
@@ -24,7 +24,7 @@ Next, build the game with emscripten:
 
 ```
   mkdir build
-  docker run -it --rm -v $(pwd):$(pwd) -u $(id -u):$(id -g) --workdir $(pwd)/build emsdk-lzma emcmake cmake .. -DHOST_BINARY_DIR=../build-host -DCMAKE_BUILD_TYPE=Release -DOPTION_USE_ASSERTS=OFF
+  docker run -it --rm -v $(pwd):$(pwd) -u $(id -u):$(id -g) --workdir $(pwd)/build emsdk-lzma emcmake cmake .. -DHOST_BINARY_DIR=$(pwd)/build-host -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPTION_USE_ASSERTS=OFF
   docker run -it --rm -v $(pwd):$(pwd) -u $(id -u):$(id -g) --workdir $(pwd)/build emsdk-lzma emmake make -j5
 ```
 

os/emscripten/cmake/FindLibLZMA.cmake

@@ -1,5 +1,5 @@
 # LibLZMA is a recent addition to the emscripten SDK, so it is possible
-# someone hasn't updated their SDK yet. Test out if the SDK supports LibLZMA.
+# someone hasn't updated his SDK yet. Test out if the SDK supports LibLZMA.
 include(CheckCXXSourceCompiles)
 set(CMAKE_REQUIRED_FLAGS "-sUSE_LIBLZMA=1")
 

os/emscripten/emsdk-liblzma.patch

@@ -10,35 +10,44 @@ Modifed by OpenTTD to have the bare minimum needed to work. Otherwise there
 are constantly conflicts when trying to apply this patch to different versions
 of emsdk.
 
-diff --git a/tools/settings.py b/tools/settings.py
---- a/tools/settings.py
-+++ b/tools/settings.py
-@@ -38,6 +38,7 @@
-     'USE_SDL_NET',
-     'USE_SDL_GFX',
-     'USE_LIBJPEG',
-+    'USE_LIBLZMA',
-     'USE_OGG',
-     'USE_REGAL',
-     'USE_BOOST_HEADERS',
+diff --git a/embuilder.py b/embuilder.py
+index 818262190ed..ab7d5adb7b2 100755
+--- a/embuilder.py
++++ b/embuilder.py
+@@ -60,6 +60,7 @@
+     'harfbuzz',
+     'icu',
+     'libjpeg',
++    'liblzma',
+     'libpng',
+     'ogg',
+     'regal',
+@@ -197,6 +198,8 @@ def main():
+       build_port('ogg', libname('libogg'))
+     elif what == 'libjpeg':
+       build_port('libjpeg', libname('libjpeg'))
++    elif what == 'liblzma':
++      build_port('liblzma', libname('liblzma'))
+     elif what == 'libpng':
+       build_port('libpng', libname('libpng'))
+     elif what == 'sdl2':
 diff --git a/src/settings.js b/src/settings.js
+index 61cd98939ba..be6fcb678c6 100644
 --- a/src/settings.js
 +++ b/src/settings.js
-@@ -1382,8 +1382,12 @@ var USE_BZIP2 = 0;
+@@ -1197,6 +1197,9 @@ var USE_BZIP2 = 0;
  // 1 = use libjpeg from emscripten-ports
- // [link]
  var USE_LIBJPEG = 0;
 
 +// 1 = use liblzma from emscripten-ports
-+// [link]
 +var USE_LIBLZMA = 0;
 +
  // 1 = use libpng from emscripten-ports
- // [link]
  var USE_LIBPNG = 0;
 
 diff --git a/tools/ports/liblzma.py b/tools/ports/liblzma.py
 new file mode 100644
+index 00000000000..e9567ef36ff
 --- /dev/null
 +++ b/tools/ports/liblzma.py
 @@ -0,0 +1,160 @@
@@ -49,8 +58,6 @@ new file mode 100644
 +
 +import os
 +import shutil
-+import logging
-+from pathlib import Path
 +
 +VERSION = '5.2.5'
 +HASH = '7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce'
@@ -61,11 +68,10 @@ new file mode 100644
 +
 +
 +def get(ports, settings, shared):
++  libname = ports.get_lib_name('liblzma')
 +  ports.fetch_project('liblzma', 'https://tukaani.org/xz/xz-' + VERSION + '.tar.gz', 'xz-' + VERSION, sha512hash=HASH)
 +
-+  def create(final):
-+    logging.info('building port: liblzma')
-+
++  def create():
 +    ports.clear_project_build('liblzma')
 +
 +    source_path = os.path.join(ports.get_dir(), 'liblzma', 'xz-' + VERSION)
@@ -82,19 +88,22 @@ new file mode 100644
 +                     'tuklib_exit.c', 'tuklib_mbstr_fw.c', 'tuklib_mbstr_width.c', 'tuklib_open_stdxxx.c', 'tuklib_progname.c']
 +    include_dirs_rel = ['../common', 'api', 'common', 'check', 'lz', 'rangecoder', 'lzma', 'delta', 'simple']
 +
-+    Path(dest_path, os.path.join('src', 'config.h')).write_text(config_h)
++    open(os.path.join(dest_path, 'src', 'config.h'), 'w').write(config_h)
 +
++    final = os.path.join(dest_path, libname)
 +    include_dirs = [os.path.join(dest_path, 'src', 'liblzma', p) for p in include_dirs_rel]
 +    ports.build_port(os.path.join(dest_path, 'src'), final, flags=build_flags, exclude_dirs=exclude_dirs, exclude_files=exclude_files, includes=include_dirs)
 +
 +    ports.install_headers(os.path.join(dest_path, 'src', 'liblzma', 'api'), 'lzma.h')
 +    ports.install_headers(os.path.join(dest_path, 'src', 'liblzma', 'api', 'lzma'), '*.h', 'lzma')
 +
-+  return [shared.Cache.get_lib('liblzma.a', create, what='port')]
++    return final
++
++  return [shared.Cache.get(libname, create, what='port')]
 +
 +
 +def clear(ports, settings, shared):
-+  shared.Cache.erase_lib('liblzma.a')
++  shared.Cache.erase_file(ports.get_lib_name('liblzma'))
 +
 +
 +def process_args(ports):

os/emscripten/pre.js

@@ -9,15 +9,7 @@ Module['websocket'] = { url: function(host, port, proto) {
      * If you run your own server you can setup your own WebSocket proxy in
      * front of it and let people connect to your server via the proxy. You
      * are best to add another "if" statement as above for this. */
-
-    if (location.protocol === 'https:') {
-        /* Insecure WebSockets do not work over HTTPS, so we force
-         * secure ones. */
-        return 'wss://';
-    } else {
-        /* Use the default provided by Emscripten. */
-        return null;
-    }
+    return null;
 } };
 
 Module.preRun.push(function() {
@@ -73,14 +65,10 @@ Module.preRun.push(function() {
     }
 
     window.openttd_server_list = function() {
-        add_server = Module.cwrap("em_openttd_add_server", null, ["string"]);
+        add_server = Module.cwrap("em_openttd_add_server", null, ["string", "number"]);
 
-        /* Add servers that support WebSocket here. Examples:
-         *  add_server("localhost");
-         *  add_server("localhost:3979");
-         *  add_server("127.0.0.1:3979");
-         *  add_server("[::1]:3979");
-         */
+        /* Add servers that support WebSocket here. Example:
+         *  add_server("localhost", 3979); */
     }
 
     var leftButtonDown = false;

os/emscripten/shell.html

@@ -85,8 +85,6 @@
         position: absolute;
         width: 100%;
         z-index: 2;
-        /* OpenTTD draws the cursor itself */
-        cursor: none !important;
       }
     </style>
   </head>

os/macosx/Info.plist.in

@@ -31,7 +31,5 @@
         <string>NSApplication</string>
         <key>NSHighResolutionCapable</key>
         <string>True</string>
-        <key>LSMinimumSystemVersion</key>
-        <string>10.14.0</string>
 </dict>
 </plist>

os/windows/sign.bat

@@ -1,18 +0,0 @@
-@echo off
-REM Signing script
-REM Arguments: sign.bat exe_to_sign certificate_subject_name
-
-REM This is a loose wrapper around the Microsoft signtool application (included in the Windows SDK).
-REM See https://docs.microsoft.com/en-us/dotnet/framework/tools/signtool-exe for more details.
-
-REM Path to signtool.exe
-IF NOT DEFINED SIGNTOOL_PATH (SET SIGNTOOL_PATH=signtool)
-
-REM URL of the timestamp server
-IF NOT DEFINED SIGNTOOL_TIMESTAMP_URL (SET SIGNTOOL_TIMESTAMP_URL=http://timestamp.digicert.com)
-
-REM Sign with SHA-1 for Windows 7 and below
-"%SIGNTOOL_PATH%" sign -v -n %2 -t %SIGNTOOL_TIMESTAMP_URL% -fd sha1 %1
-
-REM Sign with SHA-256 for Windows 8 and above
-"%SIGNTOOL_PATH%" sign -v -n %2 -tr %SIGNTOOL_TIMESTAMP_URL% -fd sha256 -td sha256 -as %1

regression/regression/info.nut

@@ -4,10 +4,9 @@ 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 "12"; }
+	function GetAPIVersion()  { return "1.11"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
-	function UseAsRandomAI()  { return false; }
 }
 
 RegisterAI(Regression());

regression/regression/main.nut

@@ -547,8 +547,6 @@ function Regression::Prices()
 	print("  BT_DOCK:  " + AIMarine.GetBuildCost(AIMarine.BT_DOCK));
 	print("  BT_DEPOT: " + AIMarine.GetBuildCost(AIMarine.BT_DEPOT));
 	print("  BT_BUOY:  " + AIMarine.GetBuildCost(AIMarine.BT_BUOY));
-	print("  BT_LOCK:  " + AIMarine.GetBuildCost(AIMarine.BT_LOCK));
-	print("  BT_CANAL: " + AIMarine.GetBuildCost(AIMarine.BT_CANAL));
 	print(" -Tile-");
 	print("  BT_FOUNDATION:   " + AITile.GetBuildCost(AITile.BT_FOUNDATION));
 	print("  BT_TERRAFORM:    " + AITile.GetBuildCost(AITile.BT_TERRAFORM));
@@ -558,7 +556,6 @@ function Regression::Prices()
 	print("  BT_CLEAR_ROCKY:  " + AITile.GetBuildCost(AITile.BT_CLEAR_ROCKY));
 	print("  BT_CLEAR_FIELDS: " + AITile.GetBuildCost(AITile.BT_CLEAR_FIELDS));
 	print("  BT_CLEAR_HOUSE:  " + AITile.GetBuildCost(AITile.BT_CLEAR_HOUSE));
-	print("  BT_CLEAR_WATER:  " + AITile.GetBuildCost(AITile.BT_CLEAR_WATER));
 }
 
 function cost_callback(old_path, new_tile, new_direction, self) { if (old_path == null) return 0; return old_path.GetCost() + 1; }
@@ -922,9 +919,6 @@ function Regression::Marine()
 
 	print("  BuildWaterDepot():    " + AIMarine.BuildWaterDepot(28479, 28480));
 	print("  BuildDock():          " + AIMarine.BuildDock(29253, AIStation.STATION_JOIN_ADJACENT));
-	print("  BuildBuoy():          " + AIMarine.BuildBuoy(28481));
-	print("  BuildLock():          " + AIMarine.BuildLock(28487));
-	print("  BuildCanal():         " + AIMarine.BuildCanal(28744));
 }
 
 function Regression::Order()
@@ -1476,41 +1470,9 @@ function Regression::TileList()
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
-	list.AddRectangle(0x6F3F, 0x7248);
+	list.AddRectangle(54421 - 256 * 2, 256 * 2 + 54421 + 8);
 	list.Valuate(AITile.IsWaterTile);
-	print("  IsWaterTile():       done");
-	print("  Count():             " + list.Count());
-	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-
-	list.Valuate(AITile.IsSeaTile);
-	print("  IsSeaTile():         done");
-	print("  Count():             " + list.Count());
-	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-
-	list.Valuate(AITile.IsRiverTile);
-	print("  IsRiverTile()        done");
-	print("  Count():             " + list.Count());
-	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-
-	list.Valuate(AIMarine.IsCanalTile);
-	print("  IsCanalTile()        done");
-	print("  Count():             " + list.Count());
-	print("  ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-
-	list.Valuate(AITile.IsCoastTile);
-	print("  IsCoastTile()        done");
+	print("  Water():             done");
 	print("  Count():             " + list.Count());
 	print("  ListDump:");
 	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {

regression/regression/result.txt

@@ -639,7 +639,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetQuarterlyCompanyValue():      -1
   Quarter: 0
     GetQuarterlyIncome():            0
-    GetQuarterlyExpenses():          0
+    GetQuarterlyExpenses():          -210
     GetQuarterlyCargoDelivered():    0
     GetQuarterlyPerformanceRating(): -1
     GetQuarterlyCompanyValue():      1
@@ -7365,9 +7365,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
   GetBankBalance():     1999959285
   BuildWaterDepot():    true
   BuildDock():          true
-  BuildBuoy():          true
-  BuildLock():          true
-  BuildCanal():         true
 
 --Prices--
  -Rail-
@@ -7394,8 +7391,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
   BT_DOCK:  262
   BT_DEPOT: 525
   BT_BUOY:  262
-  BT_LOCK:  5625
-  BT_CANAL: 3750
  -Tile-
   BT_FOUNDATION:   187
   BT_TERRAFORM:    187
@@ -7405,7 +7400,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
   BT_CLEAR_ROCKY:  150
   BT_CLEAR_FIELDS: 375
   BT_CLEAR_HOUSE:  1200
-  BT_CLEAR_WATER:  7500
 
 --Rail--
     IsRailTile():                  false
@@ -8456,221 +8450,54 @@ ERROR: IsEnd() is invalid as Begin() is never called
   KeepValue(1):        done
   Count():             0
   ListDump:
-  IsWaterTile():       done
-  Count():             40
+  Water():             done
+  Count():             45
   ListDump:
-    29251 => 1
-    29250 => 1
-    29249 => 1
-    29248 => 1
-    29247 => 1
-    28996 => 1
-    28995 => 1
-    28994 => 1
-    28993 => 1
-    28992 => 1
-    28991 => 1
-    28744 => 1
-    28741 => 1
-    28740 => 1
-    28739 => 1
-    28738 => 1
-    28737 => 1
-    28736 => 1
-    28735 => 1
-    28488 => 1
-    28487 => 1
-    28486 => 1
-    28485 => 1
-    28484 => 1
-    28483 => 1
-    28482 => 1
-    28480 => 1
-    28479 => 1
-    29256 => 0
-    29255 => 0
-    29254 => 0
-    29253 => 0
-    29252 => 0
-    29000 => 0
-    28999 => 0
-    28998 => 0
-    28997 => 0
-    28743 => 0
-    28742 => 0
-    28481 => 0
-  IsSeaTile():         done
-  Count():             40
-  ListDump:
-    29251 => 1
-    29250 => 1
-    29249 => 1
-    29248 => 1
-    29247 => 1
-    28996 => 1
-    28995 => 1
-    28994 => 1
-    28993 => 1
-    28992 => 1
-    28991 => 1
-    28741 => 1
-    28740 => 1
-    28739 => 1
-    28738 => 1
-    28737 => 1
-    28736 => 1
-    28735 => 1
-    28485 => 1
-    28484 => 1
-    28483 => 1
-    28482 => 1
-    29256 => 0
-    29255 => 0
-    29254 => 0
-    29253 => 0
-    29252 => 0
-    29000 => 0
-    28999 => 0
-    28998 => 0
-    28997 => 0
-    28744 => 0
-    28743 => 0
-    28742 => 0
-    28488 => 0
-    28487 => 0
-    28486 => 0
-    28481 => 0
-    28480 => 0
-    28479 => 0
-  IsRiverTile()        done
-  Count():             40
-  ListDump:
-    29256 => 0
-    29255 => 0
-    29254 => 0
-    29253 => 0
-    29252 => 0
-    29251 => 0
-    29250 => 0
-    29249 => 0
-    29248 => 0
-    29247 => 0
-    29000 => 0
-    28999 => 0
-    28998 => 0
-    28997 => 0
-    28996 => 0
-    28995 => 0
-    28994 => 0
-    28993 => 0
-    28992 => 0
-    28991 => 0
-    28744 => 0
-    28743 => 0
-    28742 => 0
-    28741 => 0
-    28740 => 0
-    28739 => 0
-    28738 => 0
-    28737 => 0
-    28736 => 0
-    28735 => 0
-    28488 => 0
-    28487 => 0
-    28486 => 0
-    28485 => 0
-    28484 => 0
-    28483 => 0
-    28482 => 0
-    28481 => 0
-    28480 => 0
-    28479 => 0
-  IsCanalTile()        done
-  Count():             40
-  ListDump:
-    28744 => 1
-    29256 => 0
-    29255 => 0
-    29254 => 0
-    29253 => 0
-    29252 => 0
-    29251 => 0
-    29250 => 0
-    29249 => 0
-    29248 => 0
-    29247 => 0
-    29000 => 0
-    28999 => 0
-    28998 => 0
-    28997 => 0
-    28996 => 0
-    28995 => 0
-    28994 => 0
-    28993 => 0
-    28992 => 0
-    28991 => 0
-    28743 => 0
-    28742 => 0
-    28741 => 0
-    28740 => 0
-    28739 => 0
-    28738 => 0
-    28737 => 0
-    28736 => 0
-    28735 => 0
-    28488 => 0
-    28487 => 0
-    28486 => 0
-    28485 => 0
-    28484 => 0
-    28483 => 0
-    28482 => 0
-    28481 => 0
-    28480 => 0
-    28479 => 0
-  IsCoastTile()        done
-  Count():             40
-  ListDump:
-    28998 => 1
-    28997 => 1
-    28743 => 1
-    28742 => 1
-    29256 => 0
-    29255 => 0
-    29254 => 0
-    29253 => 0
-    29252 => 0
-    29251 => 0
-    29250 => 0
-    29249 => 0
-    29248 => 0
-    29247 => 0
-    29000 => 0
-    28999 => 0
-    28996 => 0
-    28995 => 0
-    28994 => 0
-    28993 => 0
-    28992 => 0
-    28991 => 0
-    28744 => 0
-    28741 => 0
-    28740 => 0
-    28739 => 0
-    28738 => 0
-    28737 => 0
-    28736 => 0
-    28735 => 0
-    28488 => 0
-    28487 => 0
-    28486 => 0
-    28485 => 0
-    28484 => 0
-    28483 => 0
-    28482 => 0
-    28481 => 0
-    28480 => 0
-    28479 => 0
+    54941 => 1
+    54940 => 1
+    54939 => 1
+    54938 => 1
+    54937 => 1
+    54936 => 1
+    54935 => 1
+    54934 => 1
+    54933 => 1
+    54685 => 1
+    54684 => 1
+    54683 => 1
+    54682 => 1
+    54681 => 1
+    54680 => 1
+    54679 => 1
+    54678 => 1
+    54677 => 1
+    54429 => 1
+    54428 => 1
+    54427 => 1
+    54426 => 1
+    54425 => 1
+    54424 => 1
+    54423 => 1
+    54422 => 1
+    54421 => 1
+    54173 => 1
+    54172 => 1
+    54171 => 1
+    54170 => 1
+    54169 => 1
+    54168 => 0
+    54167 => 0
+    54166 => 0
+    54165 => 0
+    53917 => 0
+    53916 => 0
+    53915 => 0
+    53914 => 0
+    53913 => 0
+    53912 => 0
+    53911 => 0
+    53910 => 0
+    53909 => 0
 
 --TileList_IndustryAccepting--
   Count():             47
@@ -9272,12 +9099,12 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetLocation():       33417
     GetEngineType():     153
     GetUnitNumber():     1
-    GetAge():            1
+    GetAge():            0
     GetMaxAge():         5490
-    GetAgeLeft():        5489
+    GetAgeLeft():        5490
     GetCurrentSpeed():   7
     GetRunningCost():    421
-    GetProfitThisYear(): -1
+    GetProfitThisYear(): 0
     GetProfitLastYear(): 0
     GetCurrentValue():   5947
     GetVehicleType():    1
@@ -9287,7 +9114,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
     IsInDepot():         false
     GetNumWagons():      1
     GetWagonEngineType(): 153
-    GetWagonAge():       1
+    GetWagonAge():       0
     GetLength():         8
   GetOwner():           1
   BuildVehicle():       14
@@ -9312,9 +9139,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
   GetNumWagons():       3
   GetLength():          24
   GetWagonEngineType(): 9
-  GetWagonAge():        0
+  GetWagonAge():        1
   GetWagonEngineType(): 27
-  GetWagonAge():        0
+  GetWagonAge():        1
   GetWagonEngineType(): 27
   GetWagonAge():        0
   GetWagonEngineType(): 65535
@@ -9360,11 +9187,11 @@ ERROR: IsEnd() is invalid as Begin() is never called
     14 => 1
     12 => 1
   Age ListDump:
+    17 => 1
+    16 => 1
+    14 => 1
     13 => 1
     12 => 1
-    17 => 0
-    16 => 0
-    14 => 0
   MaxAge ListDump:
     16 => 10980
     14 => 10980
@@ -9372,9 +9199,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
     13 => 5490
     12 => 5490
   AgeLeft ListDump:
-    16 => 10980
-    14 => 10980
-    17 => 7320
+    16 => 10979
+    14 => 10979
+    17 => 7319
     13 => 5489
     12 => 5489
   CurrentSpeed ListDump:

regression/stationlist/info.nut

@@ -4,10 +4,9 @@ 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 "12"; }
+	function GetAPIVersion()  { return "1.11"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "StationList"; }
-	function UseAsRandomAI()  { return false; }
 }
 
 RegisterAI(StationList());

src/3rdparty/CMakeLists.txt

@@ -1,4 +1,3 @@
-add_subdirectory(fmt)
 add_subdirectory(md5)
 add_subdirectory(squirrel)
 add_subdirectory(opengl)

src/3rdparty/fmt/CMakeLists.txt

@@ -1,5 +0,0 @@
-add_files(
-    core.h
-    format.h
-    format-inl.h
-)

src/3rdparty/fmt/LICENSE.rst

@@ -1,27 +0,0 @@
-Copyright (c) 2012 - present, Victor Zverovich
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in 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:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-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 AUTHORS 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 IN THE SOFTWARE.
-
---- Optional exception to the license ---
-
-As an exception, if, as a result of your compiling your source code, portions
-of this Software are embedded into a machine-executable object form of such
-source code, you may redistribute such embedded portions in such object form
-without including the above copyright and permission notices.

src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp

@@ -17,7 +17,7 @@ void sqstd_printcallstack(HSQUIRRELVM v)
 		SQFloat f;
 		const SQChar *s;
 		SQInteger level=1; //1 is to skip this function that is level 0
-		const SQChar *name=nullptr;
+		const SQChar *name=0;
 		SQInteger seq=0;
 		pf(v,"\nCALLSTACK\n");
 		while(SQ_SUCCEEDED(sq_stackinfos(v,level,&si)))
@@ -116,7 +116,7 @@ static SQInteger _sqstd_aux_printerror(HSQUIRRELVM v)
 {
 	SQPRINTFUNCTION pf = sq_getprintfunc(v);
 	if(pf) {
-		const SQChar *sErr = nullptr;
+		const SQChar *sErr = 0;
 		if(sq_gettop(v)>=1) {
 			if(SQ_SUCCEEDED(sq_getstring(v,2,&sErr)))	{
 				pf(v,"\nAN ERROR HAS OCCURRED [%s]\n",sErr);

src/3rdparty/squirrel/sqstdlib/sqstdmath.cpp

@@ -88,7 +88,7 @@ static SQRegFunction mathlib_funcs[] = {
 #endif /* EXPORT_DEFAULT_SQUIRREL_FUNCTIONS */
 	_DECL_FUNC(fabs,2,".n"),
 	_DECL_FUNC(abs,2,".n"),
-	{nullptr,nullptr,0,nullptr},
+	{0,0,0,0},
 };
 
 #ifndef M_PI
@@ -98,7 +98,7 @@ static SQRegFunction mathlib_funcs[] = {
 SQRESULT sqstd_register_mathlib(HSQUIRRELVM v)
 {
 	SQInteger i=0;
-	while(mathlib_funcs[i].name!=nullptr)	{
+	while(mathlib_funcs[i].name!=0)	{
 		sq_pushstring(v,mathlib_funcs[i].name,-1);
 		sq_newclosure(v,mathlib_funcs[i].f,0);
 		sq_setparamscheck(v,mathlib_funcs[i].nparamscheck,mathlib_funcs[i].typemask);

src/3rdparty/squirrel/squirrel/sqapi.cpp

@@ -60,11 +60,11 @@ HSQUIRRELVM sq_open(SQInteger initialstacksize)
 	v = (SQVM *)SQ_MALLOC(sizeof(SQVM));
 	new (v) SQVM(ss);
 	ss->_root_vm = v;
-	if(v->Init(nullptr, initialstacksize)) {
+	if(v->Init(NULL, initialstacksize)) {
 		return v;
 	} else {
 		sq_delete(v, SQVM);
-		return nullptr;
+		return NULL;
 	}
 	return v;
 }
@@ -83,7 +83,7 @@ HSQUIRRELVM sq_newthread(HSQUIRRELVM friendvm, SQInteger initialstacksize)
 		return v;
 	} else {
 		sq_delete(v, SQVM);
-		return nullptr;
+		return NULL;
 	}
 }
 
@@ -135,7 +135,7 @@ void sq_close(HSQUIRRELVM v)
 SQRESULT sq_compile(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,const SQChar *sourcename,SQBool raiseerror)
 {
 	SQObjectPtr o;
-	if(Compile(v, read, p, sourcename, o, raiseerror != 0, _ss(v)->_debuginfo)) {
+	if(Compile(v, read, p, sourcename, o, raiseerror?true:false, _ss(v)->_debuginfo)) {
 		v->Push(SQClosure::Create(_ss(v), _funcproto(o)));
 		return SQ_OK;
 	}
@@ -144,12 +144,12 @@ SQRESULT sq_compile(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,const SQCha
 
 void sq_enabledebuginfo(HSQUIRRELVM v, SQBool enable)
 {
-	_ss(v)->_debuginfo = enable != 0;
+	_ss(v)->_debuginfo = enable?true:false;
 }
 
 void sq_notifyallexceptions(HSQUIRRELVM v, SQBool enable)
 {
-	_ss(v)->_notifyallexceptions = enable != 0;
+	_ss(v)->_notifyallexceptions = enable?true:false;
 }
 
 void sq_addref(HSQUIRRELVM v,HSQOBJECT *po)
@@ -178,7 +178,7 @@ const SQChar *sq_objtostring(HSQOBJECT *o)
 	if(sq_type(*o) == OT_STRING) {
 		return _stringval(*o);
 	}
-	return nullptr;
+	return NULL;
 }
 
 SQInteger sq_objtointeger(HSQOBJECT *o)
@@ -224,7 +224,7 @@ void sq_pushinteger(HSQUIRRELVM v,SQInteger n)
 
 void sq_pushbool(HSQUIRRELVM v,SQBool b)
 {
-	v->Push(b != 0);
+	v->Push(b?true:false);
 }
 
 void sq_pushfloat(HSQUIRRELVM v,SQFloat n)
@@ -256,7 +256,7 @@ void sq_newarray(HSQUIRRELVM v,SQInteger size)
 
 SQRESULT sq_newclass(HSQUIRRELVM v,SQBool hasbase)
 {
-	SQClass *baseclass = nullptr;
+	SQClass *baseclass = NULL;
 	if(hasbase) {
 		SQObjectPtr &base = stack_get(v,-1);
 		if(type(base) != OT_CLASS)
@@ -555,7 +555,7 @@ SQRESULT sq_getbool(HSQUIRRELVM v,SQInteger idx,SQBool *b)
 
 SQRESULT sq_getstring(HSQUIRRELVM v,SQInteger idx,const SQChar **c)
 {
-	SQObjectPtr *o = nullptr;
+	SQObjectPtr *o = NULL;
 	_GETSAFE_OBJ(v, idx, OT_STRING,o);
 	*c = _stringval(*o);
 	return SQ_OK;
@@ -563,7 +563,7 @@ SQRESULT sq_getstring(HSQUIRRELVM v,SQInteger idx,const SQChar **c)
 
 SQRESULT sq_getthread(HSQUIRRELVM v,SQInteger idx,HSQUIRRELVM *thread)
 {
-	SQObjectPtr *o = nullptr;
+	SQObjectPtr *o = NULL;
 	_GETSAFE_OBJ(v, idx, OT_THREAD,o);
 	*thread = _thread(*o);
 	return SQ_OK;
@@ -598,7 +598,7 @@ SQInteger sq_getsize(HSQUIRRELVM v, SQInteger idx)
 
 SQRESULT sq_getuserdata(HSQUIRRELVM v,SQInteger idx,SQUserPointer *p,SQUserPointer *typetag)
 {
-	SQObjectPtr *o = nullptr;
+	SQObjectPtr *o = NULL;
 	_GETSAFE_OBJ(v, idx, OT_USERDATA,o);
 	(*p) = _userdataval(*o);
 	if(typetag) *typetag = _userdata(*o)->_typetag;
@@ -637,7 +637,7 @@ SQRESULT sq_gettypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer *typetag)
 
 SQRESULT sq_getuserpointer(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p)
 {
-	SQObjectPtr *o = nullptr;
+	SQObjectPtr *o = NULL;
 	_GETSAFE_OBJ(v, idx, OT_USERPOINTER,o);
 	(*p) = _userpointer(*o);
 	return SQ_OK;
@@ -666,13 +666,13 @@ SQRESULT sq_getinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserP
 	SQObjectPtr &o = stack_get(v,idx);
 	if(type(o) != OT_INSTANCE) return sq_throwerror(v,"the object is not a class instance");
 	(*p) = _instance(o)->_userpointer;
-	if(typetag != nullptr) {
+	if(typetag != 0) {
 		SQClass *cl = _instance(o)->_class;
 		do{
 			if(cl->_typetag == typetag)
 				return SQ_OK;
 			cl = cl->_base;
-		}while(cl != nullptr);
+		}while(cl != NULL);
 		return sq_throwerror(v,"invalid type tag");
 	}
 	return SQ_OK;
@@ -724,7 +724,7 @@ SQRESULT sq_newslot(HSQUIRRELVM v, SQInteger idx, SQBool bstatic)
 	if(type(self) == OT_TABLE || type(self) == OT_CLASS) {
 		SQObjectPtr &key = v->GetUp(-2);
 		if(type(key) == OT_NULL) return sq_throwerror(v, "null is not a valid key");
-		v->NewSlot(self, key, v->GetUp(-1),bstatic != 0);
+		v->NewSlot(self, key, v->GetUp(-1),bstatic?true:false);
 		v->Pop(2);
 	}
 	return SQ_OK;
@@ -801,14 +801,14 @@ SQRESULT sq_setdelegate(HSQUIRRELVM v,SQInteger idx)
 			if(!_table(self)->SetDelegate(_table(mt))) return sq_throwerror(v, "delagate cycle");
 			v->Pop();}
 		else if(type(mt)==OT_NULL) {
-			_table(self)->SetDelegate(nullptr); v->Pop(); }
+			_table(self)->SetDelegate(NULL); v->Pop(); }
 		else return sq_aux_invalidtype(v,type);
 		break;
 	case OT_USERDATA:
 		if(type(mt)==OT_TABLE) {
 			_userdata(self)->SetDelegate(_table(mt)); v->Pop(); }
 		else if(type(mt)==OT_NULL) {
-			_userdata(self)->SetDelegate(nullptr); v->Pop(); }
+			_userdata(self)->SetDelegate(NULL); v->Pop(); }
 		else return sq_aux_invalidtype(v, type);
 		break;
 	default:
@@ -909,7 +909,7 @@ const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedIntege
 		}
 		SQVM::CallInfo &ci=v->_callsstack[lvl];
 		if(type(ci._closure)!=OT_CLOSURE)
-			return nullptr;
+			return NULL;
 		SQClosure *c=_closure(ci._closure);
 		SQFunctionProto *func=_funcproto(c->_function);
 		if(func->_noutervalues > (SQInteger)idx) {
@@ -919,7 +919,7 @@ const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedIntege
 		idx -= func->_noutervalues;
 		return func->GetLocal(v,stackbase,idx,(SQInteger)(ci._ip-func->_instructions)-1);
 	}
-	return nullptr;
+	return NULL;
 }
 
 void sq_pushobject(HSQUIRRELVM v,HSQOBJECT obj)
@@ -929,7 +929,7 @@ void sq_pushobject(HSQUIRRELVM v,HSQOBJECT obj)
 
 void sq_resetobject(HSQOBJECT *po)
 {
-	po->_unVal.pUserPointer=nullptr;po->_type=OT_NULL;
+	po->_unVal.pUserPointer=NULL;po->_type=OT_NULL;
 }
 
 SQRESULT sq_throwerror(HSQUIRRELVM v,const SQChar *err)
@@ -975,7 +975,7 @@ SQRESULT sq_call(HSQUIRRELVM v,SQInteger params,SQBool retval,SQBool raiseerror,
 	v->_can_suspend = suspend >= 0;
 	if (v->_can_suspend) v->_ops_till_suspend = suspend;
 
-	if(v->Call(v->GetUp(-(params+1)),params,v->_top-params,res,raiseerror != 0,v->_can_suspend)){
+	if(v->Call(v->GetUp(-(params+1)),params,v->_top-params,res,raiseerror?true:false,v->_can_suspend)){
 		if(!v->_suspended) {
 			v->Pop(params);//pop closure and args
 		}
@@ -1051,7 +1051,7 @@ void sq_setcompilererrorhandler(HSQUIRRELVM v,SQCOMPILERERROR f)
 
 SQRESULT sq_writeclosure(HSQUIRRELVM v,SQWRITEFUNC w,SQUserPointer up)
 {
-	SQObjectPtr *o = nullptr;
+	SQObjectPtr *o = NULL;
 	_GETSAFE_OBJ(v, -1, OT_CLOSURE,o);
 	unsigned short tag = SQ_BYTECODE_STREAM_TAG;
 	if(w(up,&tag,2) != 2)
@@ -1093,7 +1093,7 @@ SQInteger sq_collectgarbage(HSQUIRRELVM v)
 const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)
 {
 	SQObjectPtr &self = stack_get(v,idx);
-	const SQChar *name = nullptr;
+	const SQChar *name = NULL;
 	if(type(self) == OT_CLOSURE) {
 		if(_closure(self)->_outervalues.size()>nval) {
 			v->Push(_closure(self)->_outervalues[nval]);
@@ -1131,7 +1131,7 @@ SQRESULT sq_setfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)
 
 SQRESULT sq_setattributes(HSQUIRRELVM v,SQInteger idx)
 {
-	SQObjectPtr *o = nullptr;
+	SQObjectPtr *o = NULL;
 	_GETSAFE_OBJ(v, idx, OT_CLASS,o);
 	SQObjectPtr &key = stack_get(v,-2);
 	SQObjectPtr &val = stack_get(v,-1);
@@ -1153,7 +1153,7 @@ SQRESULT sq_setattributes(HSQUIRRELVM v,SQInteger idx)
 
 SQRESULT sq_getattributes(HSQUIRRELVM v,SQInteger idx)
 {
-	SQObjectPtr *o = nullptr;
+	SQObjectPtr *o = NULL;
 	_GETSAFE_OBJ(v, idx, OT_CLASS,o);
 	SQObjectPtr &key = stack_get(v,-1);
 	SQObjectPtr attrs;
@@ -1173,7 +1173,7 @@ SQRESULT sq_getattributes(HSQUIRRELVM v,SQInteger idx)
 
 SQRESULT sq_getbase(HSQUIRRELVM v,SQInteger idx)
 {
-	SQObjectPtr *o = nullptr;
+	SQObjectPtr *o = NULL;
 	_GETSAFE_OBJ(v, idx, OT_CLASS,o);
 	if(_class(*o)->_base)
 		v->Push(SQObjectPtr(_class(*o)->_base));
@@ -1184,7 +1184,7 @@ SQRESULT sq_getbase(HSQUIRRELVM v,SQInteger idx)
 
 SQRESULT sq_getclass(HSQUIRRELVM v,SQInteger idx)
 {
-	SQObjectPtr *o = nullptr;
+	SQObjectPtr *o = NULL;
 	_GETSAFE_OBJ(v, idx, OT_INSTANCE,o);
 	v->Push(SQObjectPtr(_instance(*o)->_class));
 	return SQ_OK;
@@ -1192,7 +1192,7 @@ SQRESULT sq_getclass(HSQUIRRELVM v,SQInteger idx)
 
 SQRESULT sq_createinstance(HSQUIRRELVM v,SQInteger idx)
 {
-	SQObjectPtr *o = nullptr;
+	SQObjectPtr *o = NULL;
 	_GETSAFE_OBJ(v, idx, OT_CLASS,o);
 	v->Push(_class(*o)->CreateInstance());
 	return SQ_OK;

src/3rdparty/squirrel/squirrel/sqbaselib.cpp

@@ -248,29 +248,29 @@ static SQRegFunction base_funcs[]={
 	{"getconsttable",base_getconsttable,1, NULL},
 	{"setconsttable",base_setconsttable,2, NULL},
 #endif
-	{"assert",base_assert,2, nullptr},
-	{"print",base_print,2, nullptr},
+	{"assert",base_assert,2, NULL},
+	{"print",base_print,2, NULL},
 #ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
 	{"compilestring",base_compilestring,-2, ".ss"},
 	{"newthread",base_newthread,2, ".c"},
 	{"suspend",base_suspend,-1, NULL},
 #endif
 	{"array",base_array,-2, ".n"},
-	{"type",base_type,2, nullptr},
+	{"type",base_type,2, NULL},
 #ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
 	{"dummy",base_dummy,0,NULL},
 #ifndef NO_GARBAGE_COLLECTOR
 	{"collectgarbage",base_collectgarbage,1, "t"},
 #endif
 #endif
-	{nullptr,nullptr,0,nullptr}
+	{0,0,0,0}
 };
 
 void sq_base_register(HSQUIRRELVM v)
 {
 	SQInteger i=0;
 	sq_pushroottable(v);
-	while(base_funcs[i].name!=nullptr) {
+	while(base_funcs[i].name!=0) {
 		sq_pushstring(v,base_funcs[i].name,-1);
 		sq_newclosure(v,base_funcs[i].f,0);
 		sq_setnativeclosurename(v,-1,base_funcs[i].name);
@@ -415,10 +415,10 @@ SQRegFunction SQSharedState::_table_default_delegate_funcz[]={
 	{"rawset",table_rawset,3, "t"},
 	{"rawdelete",table_rawdelete,2, "t"},
 	{"rawin",container_rawexists,2, "t"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, NULL },
 	{"tostring",default_delegate_tostring,1, "."},
 	{"clear",obj_clear,1, "."},
-	{nullptr,nullptr,0,nullptr}
+	{0,0,0,0}
 };
 
 //ARRAY DEFAULT DELEGATE///////////////////////////////////////
@@ -624,10 +624,10 @@ SQRegFunction SQSharedState::_array_default_delegate_funcz[]={
 	{"reverse",array_reverse,1, "a"},
 	{"sort",array_sort,-1, "ac"},
 	{"slice",array_slice,-1, "ann"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, NULL },
 	{"tostring",default_delegate_tostring,1, "."},
 	{"clear",obj_clear,1, "."},
-	{nullptr,nullptr,0,nullptr}
+	{0,0,0,0}
 };
 
 //STRING DEFAULT DELEGATE//////////////////////////
@@ -687,8 +687,8 @@ SQRegFunction SQSharedState::_string_default_delegate_funcz[]={
 	{"find",string_find,-2, "s s n "},
 	{"tolower",string_tolower,1, "s"},
 	{"toupper",string_toupper,1, "s"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
-	{nullptr,nullptr,0,nullptr}
+	{"weakref",obj_delegate_weakref,1, NULL },
+	{0,0,0,0}
 };
 
 //INTEGER DEFAULT DELEGATE//////////////////////////
@@ -697,8 +697,8 @@ SQRegFunction SQSharedState::_number_default_delegate_funcz[]={
 	{"tofloat",default_delegate_tofloat,1, "n|b"},
 	{"tostring",default_delegate_tostring,1, "."},
 	{"tochar",number_delegate_tochar,1, "n|b"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
-	{nullptr,nullptr,0,nullptr}
+	{"weakref",obj_delegate_weakref,1, NULL },
+	{0,0,0,0}
 };
 
 //CLOSURE DEFAULT DELEGATE//////////////////////////
@@ -782,11 +782,11 @@ SQRegFunction SQSharedState::_closure_default_delegate_funcz[]={
 	{"pcall",closure_pcall,-1, "c"},
 	{"acall",closure_acall,2, "ca"},
 	{"pacall",closure_pacall,2, "ca"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, NULL },
 	{"tostring",default_delegate_tostring,1, "."},
 	{"bindenv",closure_bindenv,2, "c x|y|t"},
 	{"getinfos",closure_getinfos,1, "c"},
-	{nullptr,nullptr,0,nullptr}
+	{0,0,0,0}
 };
 
 //GENERATOR DEFAULT DELEGATE
@@ -803,9 +803,9 @@ static SQInteger generator_getstatus(HSQUIRRELVM v)
 
 SQRegFunction SQSharedState::_generator_default_delegate_funcz[]={
 	{"getstatus",generator_getstatus,1, "g"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, NULL },
 	{"tostring",default_delegate_tostring,1, "."},
-	{nullptr,nullptr,0,nullptr}
+	{0,0,0,0}
 };
 
 //THREAD DEFAULT DELEGATE
@@ -889,9 +889,9 @@ SQRegFunction SQSharedState::_thread_default_delegate_funcz[] = {
 	{"call", thread_call, -1, "v"},
 	{"wakeup", thread_wakeup, -1, "v"},
 	{"getstatus", thread_getstatus, 1, "v"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, NULL },
 	{"tostring",default_delegate_tostring,1, "."},
-	{nullptr,nullptr,0,nullptr},
+	{0,0,0,0},
 };
 
 static SQInteger class_getattributes(HSQUIRRELVM v)
@@ -919,10 +919,10 @@ SQRegFunction SQSharedState::_class_default_delegate_funcz[] = {
 	{"getattributes", class_getattributes, 2, "y."},
 	{"setattributes", class_setattributes, 3, "y.."},
 	{"rawin",container_rawexists,2, "y"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, NULL },
 	{"tostring",default_delegate_tostring,1, "."},
 	{"instance",class_instance,1, "y"},
-	{nullptr,nullptr,0,nullptr}
+	{0,0,0,0}
 };
 
 static SQInteger instance_getclass(HSQUIRRELVM v)
@@ -935,9 +935,9 @@ static SQInteger instance_getclass(HSQUIRRELVM v)
 SQRegFunction SQSharedState::_instance_default_delegate_funcz[] = {
 	{"getclass", instance_getclass, 1, "x"},
 	{"rawin",container_rawexists,2, "x"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, NULL },
 	{"tostring",default_delegate_tostring,1, "."},
-	{nullptr,nullptr,0,nullptr}
+	{0,0,0,0}
 };
 
 static SQInteger weakref_ref(HSQUIRRELVM v)
@@ -949,9 +949,9 @@ static SQInteger weakref_ref(HSQUIRRELVM v)
 
 SQRegFunction SQSharedState::_weakref_default_delegate_funcz[] = {
 	{"ref",weakref_ref,1, "r"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, NULL },
 	{"tostring",default_delegate_tostring,1, "."},
-	{nullptr,nullptr,0,nullptr}
+	{0,0,0,0}
 };
 
 

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

@@ -15,8 +15,8 @@
 SQClass::SQClass(SQSharedState *ss,SQClass *base)
 {
 	_base = base;
-	_typetag = nullptr;
-	_hook = nullptr;
+	_typetag = 0;
+	_hook = NULL;
 	_udsize = 0;
 	_metamethods.resize(MT_LAST); //size it to max size
 	if(_base) {
@@ -34,13 +34,7 @@ SQClass::SQClass(SQSharedState *ss,SQClass *base)
 
 void SQClass::Finalize() {
 	_attributes = _null_;
-	/* SQInstance's Finalize depends on the size of this sqvector, so instead of
-	 * resizing, all SQObjectPtrs are set to "null" so it holds no references to
-	 * other objects anymore. That way everything gets released properly. */
-	for (SQUnsignedInteger i = 0; i < _defaultvalues.size(); i++) {
-		_defaultvalues[i].val = _null_;
-		_defaultvalues[i].attrs = _null_;
-	}
+	_defaultvalues.resize(0);
 	_methods.resize(0);
 	_metamethods.resize(0);
 	__ObjRelease(_members);
@@ -139,8 +133,8 @@ bool SQClass::GetAttributes(const SQObjectPtr &key,SQObjectPtr &outval)
 ///////////////////////////////////////////////////////////////////////
 void SQInstance::Init(SQSharedState *ss)
 {
-	_userpointer = nullptr;
-	_hook = nullptr;
+	_userpointer = NULL;
+	_hook = NULL;
 	__ObjAddRef(_class);
 	_delegate = _class->_members;
 	INIT_CHAIN();
@@ -196,7 +190,7 @@ bool SQInstance::GetMetaMethod(SQVM *v,SQMetaMethod mm,SQObjectPtr &res)
 bool SQInstance::InstanceOf(SQClass *trg)
 {
 	SQClass *parent = _class;
-	while(parent != nullptr) {
+	while(parent != NULL) {
 		if(parent == trg)
 			return true;
 		parent = parent->_base;

src/3rdparty/squirrel/squirrel/sqclosure.h

@@ -45,7 +45,7 @@ struct SQGenerator : public CHAINABLE_OBJ
 {
 	enum SQGeneratorState{eRunning,eSuspended,eDead};
 private:
-	SQGenerator(SQSharedState *ss,SQClosure *closure){_closure=closure;_state=eRunning;_ci._generator=nullptr;INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this);}
+	SQGenerator(SQSharedState *ss,SQClosure *closure){_closure=closure;_state=eRunning;_ci._generator=NULL;INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this);}
 public:
 	static SQGenerator *Create(SQSharedState *ss,SQClosure *closure){
 		SQGenerator *nc=(SQGenerator*)SQ_MALLOC(sizeof(SQGenerator));

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

@@ -57,7 +57,7 @@ typedef sqvector<ExpState> ExpStateVec;
 class SQCompiler
 {
 public:
-	SQCompiler(SQVM *v, SQLEXREADFUNC rg, SQUserPointer up, const SQChar* sourcename, bool raiseerror, bool lineinfo) : _token(0), _fs(nullptr), _lex(_ss(v), rg, up, ThrowError, this), _debugline(0), _debugop(0)
+	SQCompiler(SQVM *v, SQLEXREADFUNC rg, SQUserPointer up, const SQChar* sourcename, bool raiseerror, bool lineinfo) : _token(0), _fs(NULL), _lex(_ss(v), rg, up, ThrowError, this), _debugline(0), _debugop(0)
 	{
 		_vm=v;
 		_sourcename = SQString::Create(_ss(v), sourcename);
@@ -164,7 +164,7 @@ public:
 		_debugline = 1;
 		_debugop = 0;
 
-		SQFuncState funcstate(_ss(_vm), nullptr,ThrowError,this);
+		SQFuncState funcstate(_ss(_vm), NULL,ThrowError,this);
 		funcstate._name = SQString::Create(_ss(_vm), "main");
 		_fs = &funcstate;
 		_fs->AddParameter(_fs->CreateString("this"));
@@ -835,7 +835,8 @@ public:
 			nkeys++;
 			SQInteger val = _fs->PopTarget();
 			SQInteger key = _fs->PopTarget();
-			[[maybe_unused]] SQInteger attrs = hasattrs ? _fs->PopTarget():-1;
+			SQInteger attrs = hasattrs ? _fs->PopTarget():-1;
+			(void)attrs; // assert only
 			assert((hasattrs && attrs == key-1) || !hasattrs);
 			unsigned char flags = (hasattrs?NEW_SLOT_ATTRIBUTES_FLAG:0)|(isstatic?NEW_SLOT_STATIC_FLAG:0);
 			SQInteger table = _fs->TopTarget(); //<<BECAUSE OF THIS NO COMMON EMIT FUNC IS POSSIBLE

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

@@ -79,7 +79,7 @@ SQInstructionDesc g_InstrDesc[]={
 	{"_OP_NEWSLOTA"},
 	{"_OP_SCOPE_END"}
 };
-
+#endif
 void DumpLiteral(SQObjectPtr &o)
 {
 	switch(type(o)){
@@ -90,7 +90,6 @@ void DumpLiteral(SQObjectPtr &o)
 		default: printf("(%s %p)",GetTypeName(o),(void*)_rawval(o));break; break; //shut up compiler
 	}
 }
-#endif
 
 SQFuncState::SQFuncState(SQSharedState *ss,SQFuncState *parent,CompilerErrorFunc efunc,void *ed)
 {

src/3rdparty/squirrel/squirrel/sqlexer.cpp

@@ -87,7 +87,7 @@ SQLexer::SQLexer(SQSharedState *ss, SQLEXREADFUNC rg, SQUserPointer up,CompilerE
 	_prevtoken = -1;
 	_curtoken = -1;
 
-	_svalue = nullptr;
+	_svalue = NULL;
 	_nvalue = 0;
 	_fvalue = 0;
 
@@ -119,7 +119,7 @@ const SQChar *SQLexer::Tok2Str(SQInteger tok)
 		if(((SQInteger)_integer(val)) == tok)
 			return _stringval(key);
 	}
-	return nullptr;
+	return NULL;
 }
 
 void SQLexer::LexBlockComment()

src/3rdparty/squirrel/squirrel/sqobject.cpp

@@ -41,7 +41,7 @@ const SQChar *IdType2Name(SQObjectType type)
 	case _RT_INSTANCE: return "instance";
 	case _RT_WEAKREF: return "weakref";
 	default:
-		return nullptr;
+		return NULL;
 	}
 }
 
@@ -101,13 +101,13 @@ SQRefCounted::~SQRefCounted()
 {
 	if(_weakref) {
 		_weakref->_obj._type = OT_NULL;
-		_weakref->_obj._unVal.pRefCounted = nullptr;
+		_weakref->_obj._unVal.pRefCounted = NULL;
 	}
 }
 
 void SQWeakRef::Release() {
 	if(ISREFCOUNTED(_obj._type)) {
-		_obj._unVal.pRefCounted->_weakref = nullptr;
+		_obj._unVal.pRefCounted->_weakref = NULL;
 	}
 	sq_delete(this,SQWeakRef);
 }
@@ -149,7 +149,7 @@ bool SQGenerator::Yield(SQVM *v)
 	for(SQInteger j = nvargs - 1; j >= 0; j--) {
 		_vargsstack.push_back(v->_vargsstack[vargsbase+j]);
 	}
-	_ci._generator=nullptr;
+	_ci._generator=NULL;
 	for(SQInteger i=0;i<_ci._etraps;i++) {
 		_etraps.push_back(v->_etraps.top());
 		v->_etraps.pop_back();
@@ -204,7 +204,7 @@ void SQArray::Extend(const SQArray *a){
 const SQChar* SQFunctionProto::GetLocal(SQVM *vm,SQUnsignedInteger stackbase,SQUnsignedInteger nseq,SQUnsignedInteger nop)
 {
 	SQUnsignedInteger nvars=_nlocalvarinfos;
-	const SQChar *res=nullptr;
+	const SQChar *res=NULL;
 	if(nvars>=nseq){
 		for(SQUnsignedInteger i=0;i<nvars;i++){
 			if(_localvarinfos[i]._start_op<=nop && _localvarinfos[i]._end_op>=nop)

src/3rdparty/squirrel/squirrel/sqobject.h

@@ -56,30 +56,12 @@ enum SQMetaMethod{
 
 struct SQRefCounted
 {
-	SQRefCounted() { _uiRef = 0; _weakref = nullptr; }
+	SQRefCounted() { _uiRef = 0; _weakref = NULL; }
 	virtual ~SQRefCounted();
 	SQWeakRef *GetWeakRef(SQObjectType type);
 	SQUnsignedInteger _uiRef;
 	struct SQWeakRef *_weakref;
 	virtual void Release()=0;
-
-	/* Placement new/delete to prevent memory leaks if constructor throws an exception. */
-	inline void *operator new(size_t size, SQRefCounted *place)
-	{
-		place->size = size;
-		return place;
-	}
-
-	inline void operator delete(void *ptr, SQRefCounted *place)
-	{
-		SQ_FREE(ptr, place->size);
-	}
-
-	/* Never used but required. */
-	inline void operator delete(void *ptr) { NOT_REACHED(); }
-
-private:
-	size_t size;
 };
 
 struct SQWeakRef : SQRefCounted
@@ -152,7 +134,7 @@ struct SQObjectPtr : public SQObject
 	{
 		SQ_OBJECT_RAWINIT()
 		_type=OT_NULL;
-		_unVal.pUserPointer=nullptr;
+		_unVal.pUserPointer=NULL;
 	}
 	SQObjectPtr(const SQObjectPtr &o)
 	{
@@ -299,7 +281,7 @@ struct SQObjectPtr : public SQObject
 		tOldType = _type;
 		unOldVal = _unVal;
 		_type = OT_NULL;
-		_unVal.pUserPointer = nullptr;
+		_unVal.pUserPointer = NULL;
 		__Release(tOldType,unOldVal);
 	}
 	inline SQObjectPtr& operator=(SQInteger i)

src/3rdparty/squirrel/squirrel/sqstate.cpp

@@ -79,12 +79,12 @@ SQTable *CreateDefaultDelegate(SQSharedState *ss,SQRegFunction *funcz)
 {
 	SQInteger i=0;
 	SQTable *t=SQTable::Create(ss,0);
-	while(funcz[i].name!=nullptr){
+	while(funcz[i].name!=0){
 		SQNativeClosure *nc = SQNativeClosure::Create(ss,funcz[i].f);
 		nc->_nparamscheck = funcz[i].nparamscheck;
 		nc->_name = SQString::Create(ss,funcz[i].name);
 		if(funcz[i].typemask && !CompileTypemask(nc->_typecheck,funcz[i].typemask))
-			return nullptr;
+			return NULL;
 		t->NewSlot(SQString::Create(ss,funcz[i].name),nc);
 		i++;
 	}
@@ -93,15 +93,15 @@ SQTable *CreateDefaultDelegate(SQSharedState *ss,SQRegFunction *funcz)
 
 SQSharedState::SQSharedState()
 {
-	_compilererrorhandler = nullptr;
-	_printfunc = nullptr;
+	_compilererrorhandler = NULL;
+	_printfunc = NULL;
 	_debuginfo = false;
 	_notifyallexceptions = false;
-	_scratchpad=nullptr;
+	_scratchpad=NULL;
 	_scratchpadsize=0;
 	_collectable_free_processing = false;
 #ifndef NO_GARBAGE_COLLECTOR
-	_gc_chain=nullptr;
+	_gc_chain=NULL;
 #endif
 	sq_new(_stringtable,SQStringTable);
 	sq_new(_metamethods,SQObjectPtrVec);
@@ -189,7 +189,7 @@ SQSharedState::~SQSharedState()
 	_refs_table.Finalize();
 #ifndef NO_GARBAGE_COLLECTOR
 	SQCollectable *t = _gc_chain;
-	SQCollectable *nx = nullptr;
+	SQCollectable *nx = NULL;
 	if(t) {
 		t->_uiRef++;
 		while(t) {
@@ -299,7 +299,7 @@ SQInteger SQSharedState::CollectGarbage(SQVM *vm)
 	EnqueueMarkObject(_instance_default_delegate,queue);
 	EnqueueMarkObject(_weakref_default_delegate,queue);
 
-	SQCollectable *tchain=nullptr;
+	SQCollectable *tchain=NULL;
 
 	while (!queue.IsEmpty()) {
 		SQCollectable *q = queue.Pop();
@@ -309,7 +309,7 @@ SQInteger SQSharedState::CollectGarbage(SQVM *vm)
 	}
 
 	SQCollectable *t = _gc_chain;
-	SQCollectable *nx = nullptr;
+	SQCollectable *nx = NULL;
 	if(t) {
 		t->_uiRef++;
 		while(t) {
@@ -340,7 +340,7 @@ SQInteger SQSharedState::CollectGarbage(SQVM *vm)
 #ifndef NO_GARBAGE_COLLECTOR
 void SQCollectable::AddToChain(SQCollectable **chain,SQCollectable *c)
 {
-    c->_prev = nullptr;
+    c->_prev = NULL;
 	c->_next = *chain;
 	if(*chain) (*chain)->_prev = c;
 	*chain = c;
@@ -352,8 +352,8 @@ void SQCollectable::RemoveFromChain(SQCollectable **chain,SQCollectable *c)
 	else *chain = c->_next;
 	if(c->_next)
 		c->_next->_prev = c->_prev;
-	c->_next = nullptr;
-	c->_prev = nullptr;
+	c->_next = NULL;
+	c->_prev = NULL;
 }
 #endif
 
@@ -483,16 +483,16 @@ RefTable::RefNode *RefTable::Get(SQObject &obj,SQHash &mainpos,RefNode **prev,bo
 {
 	RefNode *ref;
 	mainpos = ::HashObj(obj)&(_numofslots-1);
-	*prev = nullptr;
+	*prev = NULL;
 	for (ref = _buckets[mainpos]; ref; ) {
 		if(_rawval(ref->obj) == _rawval(obj) && type(ref->obj) == type(obj))
 			break;
 		*prev = ref;
 		ref = ref->next;
 	}
-	if(ref == nullptr && add) {
+	if(ref == NULL && add) {
 		if(_numofslots == _slotused) {
-			assert(_freelist == nullptr);
+			assert(_freelist == 0);
 			Resize(_numofslots*2);
 			mainpos = ::HashObj(obj)&(_numofslots-1);
 		}
@@ -510,16 +510,16 @@ void RefTable::AllocNodes(SQUnsignedInteger size)
 	RefNode *temp = nodes;
 	SQUnsignedInteger n;
 	for(n = 0; n < size - 1; n++) {
-		bucks[n] = nullptr;
+		bucks[n] = NULL;
 		temp->refs = 0;
 		new (&temp->obj) SQObjectPtr;
 		temp->next = temp+1;
 		temp++;
 	}
-	bucks[n] = nullptr;
+	bucks[n] = NULL;
 	temp->refs = 0;
 	new (&temp->obj) SQObjectPtr;
-	temp->next = nullptr;
+	temp->next = NULL;
 	_freelist = nodes;
 	_nodes = nodes;
 	_buckets = bucks;
@@ -543,7 +543,7 @@ SQStringTable::SQStringTable()
 SQStringTable::~SQStringTable()
 {
 	SQ_FREE(_strings,sizeof(SQString*)*_numofslots);
-	_strings = nullptr;
+	_strings = NULL;
 }
 
 void SQStringTable::AllocNodes(SQInteger size)
@@ -580,8 +580,8 @@ SQString::SQString(const SQChar *news, SQInteger len)
 	_val[len] = '\0';
 	_len = len;
 	_hash = ::_hashstr(news,(size_t)len);
-	_next = nullptr;
-	_sharedstate = nullptr;
+	_next = NULL;
+	_sharedstate = NULL;
 }
 
 void SQStringTable::Resize(SQInteger size)
@@ -605,7 +605,7 @@ void SQStringTable::Resize(SQInteger size)
 void SQStringTable::Remove(SQString *bs)
 {
 	SQString *s;
-	SQString *prev=nullptr;
+	SQString *prev=NULL;
 	SQHash h = bs->_hash&(_numofslots - 1);
 
 	for (s = _strings[h]; s; ){

src/3rdparty/squirrel/squirrel/sqtable.cpp

@@ -18,7 +18,7 @@ SQTable::SQTable(SQSharedState *ss,SQInteger nInitialSize)
 	while(nInitialSize>pow2size)pow2size=pow2size<<1;
 	AllocNodes(pow2size);
 	_usednodes = 0;
-	_delegate = nullptr;
+	_delegate = NULL;
 	INIT_CHAIN();
 	ADD_TO_CHAIN(&_sharedstate->_gc_chain,this);
 }
@@ -39,7 +39,7 @@ void SQTable::AllocNodes(SQInteger nSize)
 	_HashNode *nodes=(_HashNode *)SQ_MALLOC(sizeof(_HashNode)*nSize);
 	for(SQInteger i=0;i<nSize;i++){
 		new (&nodes[i]) _HashNode;
-		nodes[i].next=nullptr;
+		nodes[i].next=NULL;
 	}
 	_numofnodes=nSize;
 	_nodes=nodes;
@@ -120,7 +120,7 @@ bool SQTable::NewSlot(const SQObjectPtr &key,const SQObjectPtr &val)
 		if (mp > n && (othern = &_nodes[mph]) != mp){
 			/* yes; move colliding node into free position */
 			while (othern->next != mp){
-				assert(othern->next != nullptr);
+				assert(othern->next != NULL);
 				othern = othern->next;  /* find previous */
 			}
 			othern->next = n;  /* redo the chain with `n' in place of `mp' */
@@ -129,7 +129,7 @@ bool SQTable::NewSlot(const SQObjectPtr &key,const SQObjectPtr &val)
 			n->next = mp->next;
 			mp->key = _null_;
 			mp->val = _null_;
-			mp->next = nullptr;  /* now `mp' is free */
+			mp->next = NULL;  /* now `mp' is free */
 		}
 		else{
 			/* new node will go into free position */
@@ -141,7 +141,7 @@ bool SQTable::NewSlot(const SQObjectPtr &key,const SQObjectPtr &val)
 	mp->key = key;
 
 	for (;;) {  /* correct `firstfree' */
-		if (type(_firstfree->key) == OT_NULL && _firstfree->next == nullptr) {
+		if (type(_firstfree->key) == OT_NULL && _firstfree->next == NULL) {
 			mp->val = val;
 			_usednodes++;
 			return true;  /* OK; table still has a free place */
@@ -190,7 +190,7 @@ void SQTable::_ClearNodes()
 void SQTable::Finalize()
 {
 	_ClearNodes();
-	SetDelegate(nullptr);
+	SetDelegate(NULL);
 }
 
 void SQTable::Clear()

src/3rdparty/squirrel/squirrel/sqtable.h

@@ -27,7 +27,7 @@ struct SQTable : public SQDelegable
 private:
 	struct _HashNode
 	{
-		_HashNode() { next = nullptr; }
+		_HashNode() { next = NULL; }
 		SQObjectPtr val;
 		SQObjectPtr key;
 		_HashNode *next;
@@ -47,14 +47,14 @@ public:
 	{
 		SQTable *newtable = (SQTable*)SQ_MALLOC(sizeof(SQTable));
 		new (newtable) SQTable(ss, nInitialSize);
-		newtable->_delegate = nullptr;
+		newtable->_delegate = NULL;
 		return newtable;
 	}
 	void Finalize() override;
 	SQTable *Clone();
 	~SQTable()
 	{
-		SetDelegate(nullptr);
+		SetDelegate(NULL);
 		REMOVE_FROM_CHAIN(&_sharedstate->_gc_chain, this);
 		for (SQInteger i = 0; i < _numofnodes; i++) _nodes[i].~_HashNode();
 		SQ_FREE(_nodes, _numofnodes * sizeof(_HashNode));
@@ -70,7 +70,7 @@ public:
 				return n;
 			}
 		}while((n = n->next));
-		return nullptr;
+		return NULL;
 	}
 	bool Get(const SQObjectPtr &key,SQObjectPtr &val);
 	void Remove(const SQObjectPtr &key);

src/3rdparty/squirrel/squirrel/squserdata.h

@@ -4,12 +4,12 @@
 
 struct SQUserData : SQDelegable
 {
-	SQUserData(SQSharedState *ss, SQInteger size){ _delegate = nullptr; _hook = nullptr; INIT_CHAIN(); ADD_TO_CHAIN(&_ss(this)->_gc_chain, this); _size = size; _typetag = nullptr;
+	SQUserData(SQSharedState *ss, SQInteger size){ _delegate = 0; _hook = NULL; INIT_CHAIN(); ADD_TO_CHAIN(&_ss(this)->_gc_chain, this); _size = size; _typetag = 0;
 }
 	~SQUserData()
 	{
 		REMOVE_FROM_CHAIN(&_ss(this)->_gc_chain, this);
-		SetDelegate(nullptr);
+		SetDelegate(NULL);
 	}
 	static SQUserData* Create(SQSharedState *ss, SQInteger size)
 	{
@@ -19,7 +19,7 @@ struct SQUserData : SQDelegable
 	}
 #ifndef NO_GARBAGE_COLLECTOR
 	void EnqueueMarkObjectForChildren(SQGCMarkerQueue &queue);
-	void Finalize(){SetDelegate(nullptr);}
+	void Finalize(){SetDelegate(NULL);}
 #endif
 	void Release() {
 		if (_hook) _hook(_val,_size);

src/3rdparty/squirrel/squirrel/squtils.h

@@ -18,7 +18,7 @@ template<typename T> class sqvector
 public:
 	sqvector()
 	{
-		_vals = nullptr;
+		_vals = NULL;
 		_size = 0;
 		_allocated = 0;
 	}

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

@@ -33,7 +33,7 @@ void SQVM::ClearStack(SQInteger last_top)
 		tOldType = o._type;
 		unOldVal = o._unVal;
 		o._type = OT_NULL;
-		o._unVal.pUserPointer = nullptr;
+		o._unVal.pUserPointer = NULL;
 		__Release(tOldType,unOldVal);
 	}
 }
@@ -107,7 +107,7 @@ SQVM::SQVM(SQSharedState *ss)
 	_suspended_target=-1;
 	_suspended_root = SQFalse;
 	_suspended_traps=0;
-	_foreignptr=nullptr;
+	_foreignptr=NULL;
 	_nnativecalls=0;
 	_lasterror = _null_;
 	_errorhandler = _null_;
@@ -115,12 +115,12 @@ SQVM::SQVM(SQSharedState *ss)
 	_can_suspend = false;
 	_in_stackoverflow = false;
 	_ops_till_suspend = 0;
-	_callsstack = nullptr;
+	_callsstack = NULL;
 	_callsstacksize = 0;
 	_alloccallsstacksize = 0;
 	_top = 0;
 	_stackbase = 0;
-	ci = nullptr;
+	ci = NULL;
 	INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this);
 }
 
@@ -379,7 +379,7 @@ bool SQVM::StartCall(SQClosure *closure,SQInteger target,SQInteger args,SQIntege
 
 	if (!tailcall) {
 		CallInfo lc = {};
-		lc._generator = nullptr;
+		lc._generator = NULL;
 		lc._etraps = 0;
 		lc._prevstkbase = (SQInt32) ( stackbase - _stackbase );
 		lc._target = (SQInt32) target;
@@ -437,7 +437,7 @@ bool SQVM::Return(SQInteger _arg0, SQInteger _arg1, SQObjectPtr &retval)
 
 	while (last_top > oldstackbase) _stack._vals[last_top--].Null();
 	assert(oldstackbase >= _stackbase);
-	return broot != 0;
+	return broot?true:false;
 }
 
 #define _RET_ON_FAIL(exp) { if(!exp) return false; }
@@ -557,7 +557,7 @@ bool SQVM::DELEGATE_OP(SQObjectPtr &trg,SQObjectPtr &o1,SQObjectPtr &o2)
 		}
 		break;
 	case OT_NULL:
-		_table(o1)->SetDelegate(nullptr);
+		_table(o1)->SetDelegate(NULL);
 		break;
 	default:
 		Raise_Error("using '%s' as delegate", GetTypeName(o2));
@@ -627,7 +627,7 @@ bool SQVM::GETVARGV_OP(SQObjectPtr &target,SQObjectPtr &index,CallInfo *ci)
 
 bool SQVM::CLASS_OP(SQObjectPtr &target,SQInteger baseclass,SQInteger attributes)
 {
-	SQClass *base = nullptr;
+	SQClass *base = NULL;
 	SQObjectPtr attrs;
 	if(baseclass != -1) {
 		if(type(_stack._vals[_stackbase+baseclass]) != OT_CLASS) { Raise_Error("trying to inherit from a %s",GetTypeName(_stack._vals[_stackbase+baseclass])); return false; }
@@ -653,7 +653,7 @@ bool SQVM::CLASS_OP(SQObjectPtr &target,SQInteger baseclass,SQInteger attributes
 bool SQVM::IsEqual(SQObjectPtr &o1,SQObjectPtr &o2,bool &res)
 {
 	if(type(o1) == type(o2)) {
-		res = ((_rawval(o1) == _rawval(o2)));
+		res = ((_rawval(o1) == _rawval(o2)?true:false));
 	}
 	else {
 		if(sq_isnumeric(o1) && sq_isnumeric(o2)) {
@@ -708,7 +708,7 @@ bool SQVM::Execute(SQObjectPtr &closure, SQInteger target, SQInteger nargs, SQIn
 			temp_reg = closure;
 			if(!StartCall(_closure(temp_reg), _top - nargs, nargs, stackbase, false)) {
 				//call the handler if there are no calls in the stack, if not relies on the previous node
-				if(ci == nullptr) CallErrorHandler(_lasterror);
+				if(ci == NULL) CallErrorHandler(_lasterror);
 				return false;
 			}
 			if (_funcproto(_closure(temp_reg)->_function)->_bgenerator) {
@@ -1028,7 +1028,7 @@ common_call:
 			case _OP_THROW:	Raise_Error(TARGET); SQ_THROW();
 			case _OP_CLASS: _GUARD(CLASS_OP(TARGET,arg1,arg2)); continue;
 			case _OP_NEWSLOTA:
-				bool bstatic = (arg0&NEW_SLOT_STATIC_FLAG) != 0;
+				bool bstatic = (arg0&NEW_SLOT_STATIC_FLAG)?true:false;
 				if(type(STK(arg1)) == OT_CLASS) {
 					if(type(_class(STK(arg1))->_metamethods[MT_NEWMEMBER]) != OT_NULL ) {
 						Push(STK(arg1)); Push(STK(arg2)); Push(STK(arg3));
@@ -1160,7 +1160,7 @@ bool SQVM::CallNative(SQNativeClosure *nclosure,SQInteger nargs,SQInteger stackb
 	_top = stackbase + nargs;
 	CallInfo lci = {};
 	lci._closure = nclosure;
-	lci._generator = nullptr;
+	lci._generator = NULL;
 	lci._etraps = 0;
 	lci._prevstkbase = (SQInt32) (stackbase - _stackbase);
 	lci._ncalls = 1;
@@ -1471,7 +1471,9 @@ bool SQVM::DeleteSlot(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPtr
 
 bool SQVM::Call(SQObjectPtr &closure,SQInteger nparams,SQInteger stackbase,SQObjectPtr &outres,SQBool raiseerror,SQBool can_suspend)
 {
-	[[maybe_unused]] SQInteger prevstackbase = _stackbase;
+#ifdef WITH_ASSERT
+	SQInteger prevstackbase = _stackbase;
+#endif
 	switch(type(closure)) {
 	case OT_CLOSURE: {
 		assert(!can_suspend || this->_can_suspend);
@@ -1502,9 +1504,11 @@ bool SQVM::Call(SQObjectPtr &closure,SQInteger nparams,SQInteger stackbase,SQObj
 	default:
 		return false;
 	}
+#ifdef WITH_ASSERT
 	if(!_suspended) {
 		assert(_stackbase == prevstackbase);
 	}
+#endif
 	return true;
 }
 

src/CMakeLists.txt

@@ -309,8 +309,6 @@ add_files(
     rail_gui.h
     rail_map.h
     rail_type.h
-    random_access_file.cpp
-    random_access_file_type.h
     rev.h
     road.cpp
     road.h
@@ -338,8 +336,6 @@ add_files(
     settings_gui.cpp
     settings_gui.h
     settings_internal.h
-    settings_table.h
-    settings_table.cpp
     settings_type.h
     ship.h
     ship_cmd.cpp
@@ -469,7 +465,6 @@ add_files(
     viewport_type.h
     void_cmd.cpp
     void_map.h
-    walltime_func.h
     water.h
     water_cmd.cpp
     water_map.h

src/ai/ai_core.cpp

@@ -114,7 +114,7 @@
 	cur_company.Restore();
 
 	InvalidateWindowData(WC_AI_DEBUG, 0, -1);
-	CloseWindowById(WC_AI_SETTINGS, company);
+	DeleteWindowById(WC_AI_SETTINGS, company);
 }
 
 /* static */ void AI::Pause(CompanyID company)
@@ -207,7 +207,7 @@
 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
 		if (_settings_game.ai_config[c] != nullptr && _settings_game.ai_config[c]->HasScript()) {
 			if (!_settings_game.ai_config[c]->ResetInfo(true)) {
-				Debug(script, 0, "After a reload, the AI by the name '{}' was no longer found, and removed from the list.", _settings_game.ai_config[c]->GetName());
+				DEBUG(script, 0, "After a reload, the AI by the name '%s' was no longer found, and removed from the list.", _settings_game.ai_config[c]->GetName());
 				_settings_game.ai_config[c]->Change(nullptr);
 				if (Company::IsValidAiID(c)) {
 					/* The code belonging to an already running AI was deleted. We can only do
@@ -224,7 +224,7 @@
 		}
 		if (_settings_newgame.ai_config[c] != nullptr && _settings_newgame.ai_config[c]->HasScript()) {
 			if (!_settings_newgame.ai_config[c]->ResetInfo(false)) {
-				Debug(script, 0, "After a reload, the AI by the name '{}' was no longer found, and removed from the list.", _settings_newgame.ai_config[c]->GetName());
+				DEBUG(script, 0, "After a reload, the AI by the name '%s' was no longer found, and removed from the list.", _settings_newgame.ai_config[c]->GetName());
 				_settings_newgame.ai_config[c]->Change(nullptr);
 			}
 		}

src/ai/ai_gui.cpp

@@ -182,7 +182,7 @@ struct AIListWindow : public Window {
 		}
 		InvalidateWindowData(WC_GAME_OPTIONS, WN_GAME_OPTIONS_AI);
 		InvalidateWindowClassesData(WC_AI_SETTINGS);
-		CloseWindowByClass(WC_QUERY_STRING);
+		DeleteWindowByClass(WC_QUERY_STRING);
 		InvalidateWindowClassesData(WC_TEXTFILE);
 	}
 
@@ -190,13 +190,13 @@ struct AIListWindow : public Window {
 	{
 		switch (widget) {
 			case WID_AIL_LIST: { // Select one of the AIs
-				int sel = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_AIL_LIST) - 1;
+				int sel = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_AIL_LIST, 0, this->line_height) - 1;
 				if (sel < (int)this->info_list->size()) {
 					this->selected = sel;
 					this->SetDirty();
 					if (click_count > 1) {
 						this->ChangeAI();
-						this->Close();
+						delete this;
 					}
 				}
 				break;
@@ -204,12 +204,12 @@ struct AIListWindow : public Window {
 
 			case WID_AIL_ACCEPT: {
 				this->ChangeAI();
-				this->Close();
+				delete this;
 				break;
 			}
 
 			case WID_AIL_CANCEL:
-				this->Close();
+				delete this;
 				break;
 		}
 	}
@@ -227,7 +227,7 @@ struct AIListWindow : public Window {
 	void OnInvalidateData(int data = 0, bool gui_scope = true) override
 	{
 		if (_game_mode == GM_NORMAL && Company::IsValidID(this->slot)) {
-			this->Close();
+			delete this;
 			return;
 		}
 
@@ -276,7 +276,7 @@ static WindowDesc _ai_list_desc(
  */
 static void ShowAIListWindow(CompanyID slot)
 {
-	CloseWindowByClass(WC_AI_LIST);
+	DeleteWindowByClass(WC_AI_LIST);
 	new AIListWindow(&_ai_list_desc, slot);
 }
 
@@ -444,7 +444,7 @@ struct AISettingsWindow : public Window {
 				if (!this->IsEditableItem(config_item)) return;
 
 				if (this->clicked_row != num) {
-					this->CloseChildWindows(WC_QUERY_STRING);
+					DeleteChildWindows(WC_QUERY_STRING);
 					HideDropDownMenu(this);
 					this->clicked_row = num;
 					this->clicked_dropdown = false;
@@ -518,7 +518,7 @@ struct AISettingsWindow : public Window {
 			}
 
 			case WID_AIS_ACCEPT:
-				this->Close();
+				delete this;
 				break;
 
 			case WID_AIS_RESET:
@@ -584,7 +584,7 @@ struct AISettingsWindow : public Window {
 	{
 		this->RebuildVisibleSettings();
 		HideDropDownMenu(this);
-		this->CloseChildWindows(WC_QUERY_STRING);
+		DeleteChildWindows(WC_QUERY_STRING);
 	}
 
 private:
@@ -628,8 +628,8 @@ static WindowDesc _ai_settings_desc(
  */
 static void ShowAISettingsWindow(CompanyID slot)
 {
-	CloseWindowByClass(WC_AI_LIST);
-	CloseWindowByClass(WC_AI_SETTINGS);
+	DeleteWindowByClass(WC_AI_LIST);
+	DeleteWindowByClass(WC_AI_SETTINGS);
 	new AISettingsWindow(&_ai_settings_desc, slot);
 }
 
@@ -655,7 +655,7 @@ struct ScriptTextfileWindow : public TextfileWindow {
 	{
 		const char *textfile = GetConfig(slot)->GetTextfile(file_type, slot);
 		if (textfile == nullptr) {
-			this->Close();
+			delete this;
 		} else {
 			this->LoadTextfile(textfile, (slot == OWNER_DEITY) ? GAME_DIR : AI_DIR);
 		}
@@ -669,7 +669,7 @@ struct ScriptTextfileWindow : public TextfileWindow {
  */
 void ShowScriptTextfileWindow(TextfileType file_type, CompanyID slot)
 {
-	CloseWindowById(WC_TEXTFILE, file_type);
+	DeleteWindowById(WC_TEXTFILE, file_type);
 	new ScriptTextfileWindow(file_type, slot);
 }
 
@@ -744,11 +744,10 @@ struct AIConfigWindow : public Window {
 		this->OnInvalidateData(0);
 	}
 
-	void Close() override
+	~AIConfigWindow()
 	{
-		CloseWindowByClass(WC_AI_LIST);
-		CloseWindowByClass(WC_AI_SETTINGS);
-		this->Window::Close();
+		DeleteWindowByClass(WC_AI_LIST);
+		DeleteWindowByClass(WC_AI_SETTINGS);
 	}
 
 	void SetStringParameters(int widget) const override
@@ -785,7 +784,6 @@ struct AIConfigWindow : public Window {
 
 			case WID_AIC_LIST:
 				this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM;
-				resize->height = this->line_height;
 				size->height = 8 * this->line_height;
 				break;
 
@@ -897,7 +895,7 @@ struct AIConfigWindow : public Window {
 			}
 
 			case WID_AIC_LIST: { // Select a slot
-				this->selected_slot = (CompanyID)this->vscroll->GetScrolledRowFromWidget(pt.y, this, widget);
+				this->selected_slot = (CompanyID)this->vscroll->GetScrolledRowFromWidget(pt.y, this, widget, 0, this->line_height);
 				this->InvalidateData();
 				if (click_count > 1 && this->selected_slot != INVALID_COMPANY) ShowAIListWindow((CompanyID)this->selected_slot);
 				break;
@@ -930,7 +928,7 @@ struct AIConfigWindow : public Window {
 				break;
 
 			case WID_AIC_CLOSE:
-				this->Close();
+				delete this;
 				break;
 
 			case WID_AIC_CONTENT_DOWNLOAD:
@@ -972,7 +970,7 @@ struct AIConfigWindow : public Window {
 /** Open the AI config window. */
 void ShowAIConfigWindow()
 {
-	CloseWindowByClass(WC_GAME_OPTIONS);
+	DeleteWindowByClass(WC_GAME_OPTIONS);
 	new AIConfigWindow();
 }
 
@@ -1264,7 +1262,7 @@ struct AIDebugWindow : public Window {
 		this->highlight_row = -1; // The highlight of one AI make little sense for another AI.
 
 		/* Close AI settings window to prevent confusion */
-		CloseWindowByClass(WC_AI_SETTINGS);
+		DeleteWindowByClass(WC_AI_SETTINGS);
 
 		this->InvalidateData(-1);
 

src/ai/ai_info.cpp

@@ -25,7 +25,7 @@
  */
 static bool CheckAPIVersion(const char *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" };
+	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" };
 	return versions.find(api_version) != versions.end();
 }
 
@@ -63,7 +63,7 @@ template <> const char *GetClassName<AIInfo, ST_AI>() { return "AIInfo"; }
 {
 	/* Get the AIInfo */
 	SQUserPointer instance = nullptr;
-	if (SQ_FAILED(sq_getinstanceup(vm, 2, &instance, nullptr)) || instance == nullptr) return sq_throwerror(vm, "Pass an instance of a child class of AIInfo to RegisterAI");
+	if (SQ_FAILED(sq_getinstanceup(vm, 2, &instance, 0)) || instance == nullptr) return sq_throwerror(vm, "Pass an instance of a child class of AIInfo to RegisterAI");
 	AIInfo *info = (AIInfo *)instance;
 
 	SQInteger res = ScriptInfo::Constructor(vm, info);
@@ -89,7 +89,7 @@ template <> const char *GetClassName<AIInfo, ST_AI>() { return "AIInfo"; }
 	if (info->engine->MethodExists(*info->SQ_instance, "GetAPIVersion")) {
 		if (!info->engine->CallStringMethodStrdup(*info->SQ_instance, "GetAPIVersion", &info->api_version, MAX_GET_OPS)) return SQ_ERROR;
 		if (!CheckAPIVersion(info->api_version)) {
-			Debug(script, 1, "Loading info.nut from ({}.{}): GetAPIVersion returned invalid version", info->GetName(), info->GetVersion());
+			DEBUG(script, 1, "Loading info.nut from (%s.%d): GetAPIVersion returned invalid version", info->GetName(), info->GetVersion());
 			return SQ_ERROR;
 		}
 	} else {
@@ -107,7 +107,7 @@ template <> const char *GetClassName<AIInfo, ST_AI>() { return "AIInfo"; }
 {
 	/* Get the AIInfo */
 	SQUserPointer instance;
-	sq_getinstanceup(vm, 2, &instance, nullptr);
+	sq_getinstanceup(vm, 2, &instance, 0);
 	AIInfo *info = (AIInfo *)instance;
 	info->api_version = nullptr;
 

src/ai/ai_scanner.cpp

@@ -66,7 +66,7 @@ AIInfo *AIScannerInfo::SelectRandomAI() const
 	}
 
 	if (num_random_ais == 0) {
-		Debug(script, 0, "No suitable AI found, loading 'dummy' AI.");
+		DEBUG(script, 0, "No suitable AI found, loading 'dummy' AI.");
 		return this->info_dummy;
 	}
 

src/aircraft_cmd.cpp

@@ -1025,7 +1025,7 @@ static bool AircraftController(Aircraft *v)
 	if (count == 0) return false;
 
 	/* If the plane will be a few subpixels away from the destination after
-	 * this movement loop, start nudging it towards the exact position for
+	 * this movement loop, start nudging him towards the exact position for
 	 * the whole loop. Otherwise, heavily depending on the speed of the plane,
 	 * it is possible we totally overshoot the target, causing the plane to
 	 * make a loop, and trying again, and again, and again .. */
@@ -1786,7 +1786,7 @@ static bool AirportMove(Aircraft *v, const AirportFTAClass *apc)
 {
 	/* error handling */
 	if (v->pos >= apc->nofelements) {
-		Debug(misc, 0, "[Ap] position {} is not valid for current airport. Max position is {}", v->pos, apc->nofelements-1);
+		DEBUG(misc, 0, "[Ap] position %d is not valid for current airport. Max position is %d", v->pos, apc->nofelements-1);
 		assert(v->pos < apc->nofelements);
 	}
 
@@ -1825,7 +1825,7 @@ static bool AirportMove(Aircraft *v, const AirportFTAClass *apc)
 		current = current->next;
 	} while (current != nullptr);
 
-	Debug(misc, 0, "[Ap] cannot move further on Airport! (pos {} state {}) for vehicle {}", v->pos, v->state, v->index);
+	DEBUG(misc, 0, "[Ap] cannot move further on Airport! (pos %d state %d) for vehicle %d", v->pos, v->state, v->index);
 	NOT_REACHED();
 }
 

src/airport_gui.cpp

@@ -76,11 +76,10 @@ struct BuildAirToolbarWindow : Window {
 		this->last_user_action = WIDGET_LIST_END;
 	}
 
-	void Close() override
+	~BuildAirToolbarWindow()
 	{
 		if (this->IsWidgetLowered(WID_AT_AIRPORT)) SetViewportCatchmentStation(nullptr, true);
-		if (_settings_client.gui.link_terraform_toolbar) CloseWindowById(WC_SCEN_LAND_GEN, 0, false);
-		this->Window::Close();
+		if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false);
 	}
 
 	/**
@@ -97,7 +96,7 @@ struct BuildAirToolbarWindow : Window {
 			WID_AT_AIRPORT,
 			WIDGET_LIST_END);
 		if (!can_build) {
-			CloseWindowById(WC_BUILD_STATION, TRANSPORT_AIR);
+			DeleteWindowById(WC_BUILD_STATION, TRANSPORT_AIR);
 
 			/* Show in the tooltip why this button is disabled. */
 			this->GetWidget<NWidgetCore>(WID_AT_AIRPORT)->SetToolTip(STR_TOOLBAR_DISABLED_NO_VEHICLE_AVAILABLE);
@@ -159,8 +158,8 @@ struct BuildAirToolbarWindow : Window {
 
 		this->RaiseButtons();
 
-		CloseWindowById(WC_BUILD_STATION, TRANSPORT_AIR);
-		CloseWindowById(WC_SELECT_STATION, 0);
+		DeleteWindowById(WC_BUILD_STATION, TRANSPORT_AIR);
+		DeleteWindowById(WC_SELECT_STATION, 0);
 	}
 
 	static HotkeyList hotkeys;
@@ -218,7 +217,7 @@ Window *ShowBuildAirToolbar()
 {
 	if (!Company::IsValidID(_local_company)) return nullptr;
 
-	CloseWindowByClass(WC_BUILD_TOOLBAR);
+	DeleteWindowByClass(WC_BUILD_TOOLBAR);
 	return AllocateWindowDescFront<BuildAirToolbarWindow>(&_air_toolbar_desc, TRANSPORT_AIR);
 }
 
@@ -277,10 +276,9 @@ public:
 		if (selectFirstAirport) this->SelectFirstAvailableAirport(true);
 	}
 
-	void Close() override
+	virtual ~BuildAirportWindow()
 	{
-		CloseWindowById(WC_SELECT_STATION, 0);
-		this->PickerWindowBase::Close();
+		DeleteWindowById(WC_SELECT_STATION, 0);
 	}
 
 	void SetStringParameters(int widget) const override
@@ -485,7 +483,7 @@ public:
 				break;
 
 			case WID_AP_AIRPORT_LIST: {
-				int num_clicked = this->vscroll->GetPosition() + (pt.y - this->GetWidget<NWidgetBase>(widget)->pos_y) / this->line_height;
+				int num_clicked = this->vscroll->GetPosition() + (pt.y - this->nested_array[widget]->pos_y) / this->line_height;
 				if (num_clicked >= this->vscroll->GetCount()) break;
 				const AirportSpec *as = AirportClass::Get(_selected_airport_class)->GetSpec(num_clicked);
 				if (as->IsAvailable()) this->SelectOtherAirport(num_clicked);

src/autoreplace.cpp

@@ -11,7 +11,6 @@
 #include "command_func.h"
 #include "group.h"
 #include "autoreplace_base.h"
-#include "core/bitmath_func.hpp"
 #include "core/pool_func.hpp"
 
 #include "safeguards.h"
@@ -65,7 +64,7 @@ void RemoveAllEngineReplacement(EngineRenewList *erl)
 EngineID EngineReplacement(EngineRenewList erl, EngineID engine, GroupID group, bool *replace_when_old)
 {
 	const EngineRenew *er = GetEngineReplacement(erl, engine, group);
-	if (er == nullptr && (group == DEFAULT_GROUP || (Group::IsValidID(group) && !HasBit(Group::Get(group)->flags, GroupFlags::GF_REPLACE_PROTECTION)))) {
+	if (er == nullptr && (group == DEFAULT_GROUP || (Group::IsValidID(group) && !Group::Get(group)->replace_protection))) {
 		/* We didn't find anything useful in the vehicle's own group so we will try ALL_GROUP */
 		er = GetEngineReplacement(erl, engine, ALL_GROUP);
 	}

src/autoreplace_cmd.cpp

@@ -207,7 +207,6 @@ static int GetIncompatibleRefitOrderIdForAutoreplace(const Vehicle *v, EngineID
 	const Vehicle *u = (v->type == VEH_TRAIN) ? v->First() : v;
 
 	const OrderList *orders = u->orders.list;
-	if (orders == nullptr) return -1;
 	for (VehicleOrderID i = 0; i < orders->GetNumOrders(); i++) {
 		o = orders->GetOrderAt(i);
 		if (!o->IsRefit()) continue;
@@ -597,7 +596,8 @@ static CommandCost ReplaceChain(Vehicle **chain, DoCommandFlag flags, bool wagon
 					assert(RailVehInfo(wagon->engine_type)->railveh_type == RAILVEH_WAGON);
 
 					/* Sell wagon */
-					[[maybe_unused]] CommandCost ret = DoCommand(0, wagon->index, 0, DC_EXEC, GetCmdSellVeh(wagon));
+					CommandCost ret = DoCommand(0, wagon->index, 0, DC_EXEC, GetCmdSellVeh(wagon));
+					(void)ret; // assert only
 					assert(ret.Succeeded());
 					new_vehs[i] = nullptr;
 
@@ -614,7 +614,6 @@ static CommandCost ReplaceChain(Vehicle **chain, DoCommandFlag flags, bool wagon
 				/* Success ! */
 				if ((flags & DC_EXEC) != 0 && new_head != old_head) {
 					*chain = new_head;
-					AI::NewEvent(old_head->owner, new ScriptEventVehicleAutoReplaced(old_head->index, new_head->index));
 				}
 
 				/* Transfer cargo of old vehicles and sell them */
@@ -632,7 +631,10 @@ static CommandCost ReplaceChain(Vehicle **chain, DoCommandFlag flags, bool wagon
 					cost.AddCost(DoCommand(0, w->index, 0, flags | DC_AUTOREPLACE, GetCmdSellVeh(w)));
 					if ((flags & DC_EXEC) != 0) {
 						old_vehs[i] = nullptr;
-						if (i == 0) old_head = nullptr;
+						if (i == 0) {
+							AI::NewEvent(old_head->owner, new ScriptEventVehicleAutoReplaced(old_head->index, new_head->index));
+							old_head = nullptr;
+						}
 					}
 				}
 
@@ -650,7 +652,8 @@ static CommandCost ReplaceChain(Vehicle **chain, DoCommandFlag flags, bool wagon
 				assert(Train::From(old_head)->GetNextUnit() == nullptr);
 
 				for (int i = num_units - 1; i > 0; i--) {
-					[[maybe_unused]] CommandCost ret = CmdMoveVehicle(old_vehs[i], old_head, DC_EXEC | DC_AUTOREPLACE, false);
+					CommandCost ret = CmdMoveVehicle(old_vehs[i], old_head, DC_EXEC | DC_AUTOREPLACE, false);
+					(void)ret; // assert only
 					assert(ret.Succeeded());
 				}
 			}
@@ -714,7 +717,7 @@ static CommandCost ReplaceChain(Vehicle **chain, DoCommandFlag flags, bool wagon
  * @param text unused
  * @return the cost of this operation or an error
  */
-CommandCost CmdAutoreplaceVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
+CommandCost CmdAutoreplaceVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
 	Vehicle *v = Vehicle::GetIfValid(p1);
 	if (v == nullptr) return CMD_ERROR;
@@ -738,9 +741,6 @@ CommandCost CmdAutoreplaceVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1
 	const Company *c = Company::Get(_current_company);
 	bool wagon_removal = c->settings.renew_keep_length;
 
-	const Group *g = Group::GetIfValid(v->group_id);
-	if (g != nullptr) wagon_removal = HasBit(g->flags, GroupFlags::GF_REPLACE_WAGON_REMOVAL);
-
 	/* Test whether any replacement is set, before issuing a whole lot of commands that would end in nothing changed */
 	Vehicle *w = v;
 	bool any_replacements = false;
@@ -807,7 +807,7 @@ CommandCost CmdAutoreplaceVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1
  * @param text unused
  * @return the cost of this operation or an error
  */
-CommandCost CmdSetAutoReplace(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text)
+CommandCost CmdSetAutoReplace(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
 	Company *c = Company::GetIfValid(_current_company);
 	if (c == nullptr) return CMD_ERROR;

src/autoreplace_gui.cpp

@@ -81,7 +81,7 @@ class ReplaceVehicleWindow : public Window {
 	bool replace_engines;         ///< If \c true, engines are replaced, if \c false, wagons are replaced (only for trains).
 	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).
+	int details_height;           ///< Minimal needed height of the details panels (found so far).
 	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.
@@ -229,7 +229,7 @@ public:
 		this->engines[0].ForceRebuild();
 		this->engines[1].ForceRebuild();
 		this->reset_sel_engine = true;
-		this->details_height   = ((vehicletype == VEH_TRAIN) ? 10 : 9);
+		this->details_height   = ((vehicletype == VEH_TRAIN) ? 10 : 9) * FONT_HEIGHT_NORMAL + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
 		this->sel_engine[0] = INVALID_ENGINE;
 		this->sel_engine[1] = INVALID_ENGINE;
 		this->show_hidden_engines = _engine_sort_show_hidden_engines[vehicletype];
@@ -274,7 +274,7 @@ public:
 
 			case WID_RV_LEFT_DETAILS:
 			case WID_RV_RIGHT_DETAILS:
-				size->height = FONT_HEIGHT_NORMAL * this->details_height + padding.height;
+				size->height = this->details_height;
 				break;
 
 			case WID_RV_TRAIN_WAGONREMOVE_TOGGLE: {
@@ -375,18 +375,8 @@ public:
 				break;
 
 			case WID_RV_TRAIN_WAGONREMOVE_TOGGLE: {
-				bool remove_wagon;
-				const Group *g = Group::GetIfValid(this->sel_group);
-				if (g != nullptr) {
-					remove_wagon = HasBit(g->flags, GroupFlags::GF_REPLACE_WAGON_REMOVAL);
-					SetDParam(0, STR_GROUP_NAME);
-					SetDParam(1, sel_group);
-				} else {
-					const Company *c = Company::Get(_local_company);
-					remove_wagon = c->settings.renew_keep_length;
-					SetDParam(0, STR_GROUP_DEFAULT_TRAINS + this->window_number);
-				}
-				SetDParam(2, remove_wagon ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF);
+				const Company *c = Company::Get(_local_company);
+				SetDParam(0, c->settings.renew_keep_length ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF);
 				break;
 			}
 
@@ -485,7 +475,7 @@ public:
 					NWidgetBase *nwi = this->GetWidget<NWidgetBase>(side == 0 ? WID_RV_LEFT_DETAILS : WID_RV_RIGHT_DETAILS);
 					int text_end = DrawVehiclePurchaseInfo(nwi->pos_x + WD_FRAMETEXT_LEFT, nwi->pos_x + nwi->current_x - WD_FRAMETEXT_RIGHT,
 							nwi->pos_y + WD_FRAMERECT_TOP, this->sel_engine[side], ted);
-					needed_height = std::max(needed_height, (text_end - (int)nwi->pos_y - WD_FRAMERECT_TOP) / FONT_HEIGHT_NORMAL);
+					needed_height = std::max(needed_height, text_end - (int)nwi->pos_y + WD_FRAMERECT_BOTTOM);
 				}
 			}
 			if (needed_height != this->details_height) { // Details window are not high enough, enlarge them.
@@ -538,16 +528,9 @@ public:
 				}
 				break;
 
-			case WID_RV_TRAIN_WAGONREMOVE_TOGGLE: {
-				const Group *g = Group::GetIfValid(this->sel_group);
-				if (g != nullptr) {
-					DoCommandP(0, this->sel_group | (GroupFlags::GF_REPLACE_WAGON_REMOVAL << 16), (HasBit(g->flags, GroupFlags::GF_REPLACE_WAGON_REMOVAL) ? 0 : 1) | (_ctrl_pressed << 1), CMD_SET_GROUP_FLAG);
-				} else {
-					// toggle renew_keep_length
-					DoCommandP(0, 0, Company::Get(_local_company)->settings.renew_keep_length ? 0 : 1, CMD_CHANGE_COMPANY_SETTING, nullptr, "company.renew_keep_length");
-				}
+			case WID_RV_TRAIN_WAGONREMOVE_TOGGLE: // toggle renew_keep_length
+				DoCommandP(0, GetCompanySettingIndex("company.renew_keep_length"), Company::Get(_local_company)->settings.renew_keep_length ? 0 : 1, CMD_CHANGE_COMPANY_SETTING);
 				break;
-			}
 
 			case WID_RV_START_REPLACE: { // Start replacing
 				if (this->GetWidget<NWidgetLeaf>(widget)->ButtonHit(pt)) {
@@ -645,20 +628,6 @@ public:
 		}
 	}
 
-	bool OnTooltip(Point pt, int widget, TooltipCloseCondition close_cond) override
-	{
-		if (widget != WID_RV_TRAIN_WAGONREMOVE_TOGGLE) return false;
-
-		if (Group::IsValidID(this->sel_group)) {
-			uint64 params[1];
-			params[0] = STR_REPLACE_REMOVE_WAGON_HELP;
-			GuiShowTooltips(this, STR_REPLACE_REMOVE_WAGON_GROUP_HELP, 1, params, close_cond);
-		} else {
-			GuiShowTooltips(this, STR_REPLACE_REMOVE_WAGON_HELP, 0, nullptr, close_cond);
-		}
-		return true;
-	}
-
 	void OnResize() override
 	{
 		this->vscroll[0]->SetCapacityFromWidget(this, WID_RV_LEFT_MATRIX);
@@ -864,7 +833,7 @@ static WindowDesc _replace_vehicle_desc(
  */
 void ShowReplaceGroupVehicleWindow(GroupID id_g, VehicleType vehicletype)
 {
-	CloseWindowById(WC_REPLACE_VEHICLE, vehicletype);
+	DeleteWindowById(WC_REPLACE_VEHICLE, vehicletype);
 	WindowDesc *desc;
 	switch (vehicletype) {
 		case VEH_TRAIN: desc = &_replace_rail_vehicle_desc; break;

src/base_media_func.h

@@ -22,8 +22,8 @@
 #define fetch_metadata(name) \
 	item = metadata->GetItem(name, false); \
 	if (item == nullptr || !item->value.has_value() || item->value->empty()) { \
-		Debug(grf, 0, "Base " SET_TYPE "set detail loading: {} field missing.", name); \
-		Debug(grf, 0, "  Is {} readable for the user running OpenTTD?", full_filename); \
+		DEBUG(grf, 0, "Base " SET_TYPE "set detail loading: %s field missing.", name); \
+		DEBUG(grf, 0, "  Is %s readable for the user running OpenTTD?", full_filename); \
 		return false; \
 	}
 
@@ -74,7 +74,7 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
 		/* Find the filename first. */
 		item = files->GetItem(BaseSet<T, Tnum_files, Tsearch_in_tars>::file_names[i], false);
 		if (item == nullptr || (!item->value.has_value() && !allow_empty_filename)) {
-			Debug(grf, 0, "No " SET_TYPE " file for: {} (in {})", BaseSet<T, Tnum_files, Tsearch_in_tars>::file_names[i], full_filename);
+			DEBUG(grf, 0, "No " SET_TYPE " file for: %s (in %s)", BaseSet<T, Tnum_files, Tsearch_in_tars>::file_names[i], full_filename);
 			return false;
 		}
 
@@ -92,7 +92,7 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
 		/* Then find the MD5 checksum */
 		item = md5s->GetItem(filename, false);
 		if (item == nullptr || !item->value.has_value()) {
-			Debug(grf, 0, "No MD5 checksum specified for: {} (in {})", filename, full_filename);
+			DEBUG(grf, 0, "No MD5 checksum specified for: %s (in %s)", filename, full_filename);
 			return false;
 		}
 		const char *c = item->value->c_str();
@@ -105,7 +105,7 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
 			} else if ('A' <= *c && *c <= 'F') {
 				j = *c - 'A' + 10;
 			} else {
-				Debug(grf, 0, "Malformed MD5 checksum specified for: {} (in {})", filename, full_filename);
+				DEBUG(grf, 0, "Malformed MD5 checksum specified for: %s (in %s)", filename, full_filename);
 				return false;
 			}
 			if (i % 2 == 0) {
@@ -119,7 +119,7 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
 		item = origin->GetItem(filename, false);
 		if (item == nullptr) item = origin->GetItem("default", false);
 		if (item == nullptr || !item->value.has_value()) {
-			Debug(grf, 1, "No origin warning message specified for: {}", filename);
+			DEBUG(grf, 1, "No origin warning message specified for: %s", filename);
 			file->missing_warning = stredup("");
 		} else {
 			file->missing_warning = stredup(item->value->c_str());
@@ -136,12 +136,12 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
 				break;
 
 			case MD5File::CR_MISMATCH:
-				Debug(grf, 1, "MD5 checksum mismatch for: {} (in {})", filename, full_filename);
+				DEBUG(grf, 1, "MD5 checksum mismatch for: %s (in %s)", filename, full_filename);
 				this->found_files++;
 				break;
 
 			case MD5File::CR_NO_FILE:
-				Debug(grf, 1, "The file {} specified in {} is missing", filename, full_filename);
+				DEBUG(grf, 1, "The file %s specified in %s is missing", filename, full_filename);
 				break;
 		}
 	}
@@ -153,7 +153,7 @@ template <class Tbase_set>
 bool BaseMedia<Tbase_set>::AddFile(const std::string &filename, size_t basepath_length, const std::string &tar_filename)
 {
 	bool ret = false;
-	Debug(grf, 1, "Checking {} for base " SET_TYPE " set", filename);
+	DEBUG(grf, 1, "Checking %s for base " SET_TYPE " set", filename.c_str());
 
 	Tbase_set *set = new Tbase_set();
 	IniFile *ini = new IniFile();
@@ -179,7 +179,7 @@ bool BaseMedia<Tbase_set>::AddFile(const std::string &filename, size_t basepath_
 			/* The more complete set takes precedence over the version number. */
 			if ((duplicate->valid_files == set->valid_files && duplicate->version >= set->version) ||
 					duplicate->valid_files > set->valid_files) {
-				Debug(grf, 1, "Not adding {} ({}) as base " SET_TYPE " set (duplicate, {})", set->name, set->version,
+				DEBUG(grf, 1, "Not adding %s (%i) as base " SET_TYPE " set (duplicate, %s)", set->name.c_str(), set->version,
 						duplicate->valid_files > set->valid_files ? "less valid files" : "lower version");
 				set->next = BaseMedia<Tbase_set>::duplicate_sets;
 				BaseMedia<Tbase_set>::duplicate_sets = set;
@@ -195,7 +195,7 @@ bool BaseMedia<Tbase_set>::AddFile(const std::string &filename, size_t basepath_
 				 * version number until a new game is started which isn't a big problem */
 				if (BaseMedia<Tbase_set>::used_set == duplicate) BaseMedia<Tbase_set>::used_set = set;
 
-				Debug(grf, 1, "Removing {} ({}) as base " SET_TYPE " set (duplicate, {})", duplicate->name, duplicate->version,
+				DEBUG(grf, 1, "Removing %s (%i) as base " SET_TYPE " set (duplicate, %s)", duplicate->name.c_str(), duplicate->version,
 						duplicate->valid_files < set->valid_files ? "less valid files" : "lower version");
 				duplicate->next = BaseMedia<Tbase_set>::duplicate_sets;
 				BaseMedia<Tbase_set>::duplicate_sets = duplicate;
@@ -209,7 +209,7 @@ bool BaseMedia<Tbase_set>::AddFile(const std::string &filename, size_t basepath_
 			ret = true;
 		}
 		if (ret) {
-			Debug(grf, 1, "Adding {} ({}) as base " SET_TYPE " set", set->name, set->version);
+			DEBUG(grf, 1, "Adding %s (%i) as base " SET_TYPE " set", set->name.c_str(), set->version);
 		}
 	} else {
 		delete set;
@@ -274,7 +274,7 @@ template <class Tbase_set>
 	return p;
 }
 
-#include "network/core/tcp_content_type.h"
+#include "network/network_content.h"
 
 template <class Tbase_set> const char *TryGetBaseSetFile(const ContentInfo *ci, bool md5sum, const Tbase_set *s)
 {

src/blitter/32bpp_anim.cpp

@@ -307,7 +307,7 @@ void Blitter_32bppAnim::DrawColourMappingRect(void *dst, int width, int height,
 		return;
 	}
 
-	Debug(misc, 0, "32bpp blitter doesn't know how to draw this colour table ('{}')", pal);
+	DEBUG(misc, 0, "32bpp blitter doesn't know how to draw this colour table ('%d')", pal);
 }
 
 void Blitter_32bppAnim::SetPixel(void *video, int x, int y, uint8 colour)

src/blitter/32bpp_anim_sse4.cpp

@@ -155,7 +155,6 @@ bmno_full_transparency:
 
 				if ((bt_last == BT_NONE && effective_width & 1) || bt_last == BT_ODD) {
 					if (src->a == 0) {
-						/* Complete transparency. */
 					} else if (src->a == 255) {
 						*anim = *(const uint16*) src_mv;
 						*dst = (src_mv->m >= PALETTE_ANIM_START) ? AdjustBrightneSSE(LookupColourInPalette(src_mv->m), src_mv->v) : *src;
@@ -198,7 +197,7 @@ bmno_full_transparency:
 							m_colour = r == 0 ? m_colour : cmap; \
 							m_colour = m != 0 ? m_colour : srcm; \
 							}
-#ifdef POINTER_IS_64BIT
+#ifdef _SQ64
 						uint64 srcs = _mm_cvtsi128_si64(srcABCD);
 						uint64 dsts;
 						if (animated) dsts = _mm_cvtsi128_si64(dstABCD);
@@ -380,7 +379,7 @@ bm_normal:
 					else                           Draw<BM_NORMAL, RM_WITH_SKIP, BT_ODD, true, true>(bp, zoom);
 				}
 			} else {
-#ifdef POINTER_IS_64BIT
+#ifdef _SQ64
 				if (sprite_flags & SF_TRANSLUCENT) {
 					if (sprite_flags & SF_NO_ANIM) Draw<BM_NORMAL, RM_WITH_MARGIN, BT_NONE, true, false>(bp, zoom);
 					else                           Draw<BM_NORMAL, RM_WITH_MARGIN, BT_NONE, true, true>(bp, zoom);

src/blitter/32bpp_simple.cpp

@@ -106,7 +106,7 @@ void Blitter_32bppSimple::DrawColourMappingRect(void *dst, int width, int height
 		return;
 	}
 
-	Debug(misc, 0, "32bpp blitter doesn't know how to draw this colour table ('{}')", pal);
+	DEBUG(misc, 0, "32bpp blitter doesn't know how to draw this colour table ('%d')", pal);
 }
 
 Sprite *Blitter_32bppSimple::Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator)

src/blitter/32bpp_sse_func.hpp

@@ -34,7 +34,7 @@ static inline void InsertSecondUint32(const uint32 value, __m128i &into)
 
 static inline void LoadUint64(const uint64 value, __m128i &into)
 {
-#ifdef POINTER_IS_64BIT
+#ifdef _SQ64
 	into = _mm_cvtsi64_si128(value);
 #else
 	#if (SSE_VERSION >= 4)
@@ -297,7 +297,7 @@ inline void Blitter_32bppSSE4::Draw(const Blitter::BlitterParams *bp, ZoomLevel
 							m_colour = r == 0 ? m_colour : cmap; \
 							m_colour = m != 0 ? m_colour : srcm; \
 							}
-#ifdef POINTER_IS_64BIT
+#ifdef _SQ64
 						uint64 srcs = _mm_cvtsi128_si64(srcABCD);
 						uint64 remapped_src = 0;
 						CMOV_REMAP(c0, 0, srcs, mvX2);

src/blitter/common.hpp

@@ -16,14 +16,14 @@
 #include <utility>
 
 template <typename SetPixelT>
-void Blitter::DrawLineGeneric(int x1, int y1, int x2, int y2, int screen_width, int screen_height, int width, int dash, SetPixelT set_pixel)
+void Blitter::DrawLineGeneric(int x, int y, int x2, int y2, int screen_width, int screen_height, int width, int dash, SetPixelT set_pixel)
 {
 	int dy;
 	int dx;
 	int stepx;
 	int stepy;
 
-	dy = (y2 - y1) * 2;
+	dy = (y2 - y) * 2;
 	if (dy < 0) {
 		dy = -dy;
 		stepy = -1;
@@ -31,7 +31,7 @@ void Blitter::DrawLineGeneric(int x1, int y1, int x2, int y2, int screen_width,
 		stepy = 1;
 	}
 
-	dx = (x2 - x1) * 2;
+	dx = (x2 - x) * 2;
 	if (dx < 0) {
 		dx = -dx;
 		stepx = -1;
@@ -41,7 +41,7 @@ void Blitter::DrawLineGeneric(int x1, int y1, int x2, int y2, int screen_width,
 
 	if (dx == 0 && dy == 0) {
 		/* The algorithm below cannot handle this special case; make it work at least for line width 1 */
-		if (x1 >= 0 && x1 < screen_width && y1 >= 0 && y1 < screen_height) set_pixel(x1, y1);
+		if (x >= 0 && x < screen_width && y >= 0 && y < screen_height) set_pixel(x, y);
 		return;
 	}
 
@@ -67,14 +67,14 @@ void Blitter::DrawLineGeneric(int x1, int y1, int x2, int y2, int screen_width,
 	int dash_count = 0;
 	if (dx > dy) {
 		if (stepx < 0) {
-			std::swap(x1, x2);
-			std::swap(y1, y2);
+			std::swap(x, x2);
+			std::swap(y, y2);
 			stepy = -stepy;
 		}
-		if (x2 < 0 || x1 >= screen_width) return;
+		if (x2 < 0 || x >= screen_width) return;
 
-		int y_low     = y1;
-		int y_high    = y1;
+		int y_low     = y;
+		int y_high    = y;
 		int frac_low  = dy - frac_diff / 2;
 		int frac_high = dy + frac_diff / 2;
 
@@ -87,10 +87,10 @@ void Blitter::DrawLineGeneric(int x1, int y1, int x2, int y2, int screen_width,
 			y_high += stepy;
 		}
 
-		if (x1 < 0) {
-			dash_count = (-x1) % (dash + gap);
+		if (x < 0) {
+			dash_count = (-x) % (dash + gap);
 			auto adjust_frac = [&](int64 frac, int &y_bound) -> int {
-				frac -= ((int64) dy) * ((int64) x1);
+				frac -= ((int64) dy) * ((int64) x);
 				if (frac >= 0) {
 					int quotient = frac / dx;
 					int remainder = frac % dx;
@@ -101,17 +101,17 @@ void Blitter::DrawLineGeneric(int x1, int y1, int x2, int y2, int screen_width,
 			};
 			frac_low = adjust_frac(frac_low, y_low);
 			frac_high = adjust_frac(frac_high, y_high);
-			x1 = 0;
+			x = 0;
 		}
 		x2++;
 		if (x2 > screen_width) {
 			x2 = screen_width;
 		}
 
-		while (x1 != x2) {
+		while (x != x2) {
 			if (dash_count < dash) {
 				for (int y = y_low; y != y_high; y += stepy) {
-					if (y >= 0 && y < screen_height) set_pixel(x1, y);
+					if (y >= 0 && y < screen_height) set_pixel(x, y);
 				}
 			}
 			if (frac_low >= 0) {
@@ -122,21 +122,21 @@ void Blitter::DrawLineGeneric(int x1, int y1, int x2, int y2, int screen_width,
 				y_high += stepy;
 				frac_high -= dx;
 			}
-			x1++;
+			x++;
 			frac_low += dy;
 			frac_high += dy;
 			if (++dash_count >= dash + gap) dash_count = 0;
 		}
 	} else {
 		if (stepy < 0) {
-			std::swap(x1, x2);
-			std::swap(y1, y2);
+			std::swap(x, x2);
+			std::swap(y, y2);
 			stepx = -stepx;
 		}
-		if (y2 < 0 || y1 >= screen_height) return;
+		if (y2 < 0 || y >= screen_height) return;
 
-		int x_low     = x1;
-		int x_high    = x1;
+		int x_low     = x;
+		int x_high    = x;
 		int frac_low  = dx - frac_diff / 2;
 		int frac_high = dx + frac_diff / 2;
 
@@ -149,10 +149,10 @@ void Blitter::DrawLineGeneric(int x1, int y1, int x2, int y2, int screen_width,
 			x_high += stepx;
 		}
 
-		if (y1 < 0) {
-			dash_count = (-y1) % (dash + gap);
+		if (y < 0) {
+			dash_count = (-y) % (dash + gap);
 			auto adjust_frac = [&](int64 frac, int &x_bound) -> int {
-				frac -= ((int64) dx) * ((int64) y1);
+				frac -= ((int64) dx) * ((int64) y);
 				if (frac >= 0) {
 					int quotient = frac / dy;
 					int remainder = frac % dy;
@@ -163,17 +163,17 @@ void Blitter::DrawLineGeneric(int x1, int y1, int x2, int y2, int screen_width,
 			};
 			frac_low = adjust_frac(frac_low, x_low);
 			frac_high = adjust_frac(frac_high, x_high);
-			y1 = 0;
+			y = 0;
 		}
 		y2++;
 		if (y2 > screen_height) {
 			y2 = screen_height;
 		}
 
-		while (y1 != y2) {
+		while (y != y2) {
 			if (dash_count < dash) {
 				for (int x = x_low; x != x_high; x += stepx) {
-					if (x >= 0 && x < screen_width) set_pixel(x, y1);
+					if (x >= 0 && x < screen_width) set_pixel(x, y);
 				}
 			}
 			if (frac_low >= 0) {
@@ -184,7 +184,7 @@ void Blitter::DrawLineGeneric(int x1, int y1, int x2, int y2, int screen_width,
 				x_high += stepx;
 				frac_high -= dy;
 			}
-			y1++;
+			y++;
 			frac_low += dx;
 			frac_high += dx;
 			if (++dash_count >= dash + gap) dash_count = 0;

src/blitter/factory.hpp

@@ -70,7 +70,7 @@ protected:
 			 */
 			blitters.insert(Blitters::value_type(this->name, this));
 		} else {
-			Debug(driver, 1, "Not registering blitter {} as it is not usable", name);
+			DEBUG(driver, 1, "Not registering blitter %s as it is not usable", name);
 		}
 	}
 
@@ -91,7 +91,7 @@ public:
 	}
 
 	/**
-	 * Find the requested blitter and return its class.
+	 * Find the requested blitter and return his class.
 	 * @param name the blitter to select.
 	 * @post Sets the blitter so GetCurrentBlitter() returns it too.
 	 */
@@ -104,7 +104,7 @@ public:
 		delete *GetActiveBlitter();
 		*GetActiveBlitter() = newb;
 
-		Debug(driver, 1, "Successfully {} blitter '{}'", name.empty() ? "probed" : "loaded", newb->GetName());
+		DEBUG(driver, 1, "Successfully %s blitter '%s'", name.empty() ? "probed" : "loaded", newb->GetName());
 		return newb;
 	}
 

src/bootstrap_gui.cpp

@@ -91,10 +91,9 @@ public:
 		this->InitNested(1);
 	}
 
-	void Close() override
+	~BootstrapErrorWindow()
 	{
 		_exit_game = true;
-		this->Window::Close();
 	}
 
 	void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
@@ -145,13 +144,12 @@ public:
 	{
 	}
 
-	void Close() override
+	~BootstrapContentDownloadStatusWindow()
 	{
 		/* If we are not set to exit the game, it means the bootstrap failed. */
 		if (!_exit_game) {
 			new BootstrapErrorWindow();
 		}
-		this->BaseNetworkContentDownloadStatusWindow::Close();
 	}
 
 	void OnDownloadComplete(ContentID cid) override
@@ -164,7 +162,7 @@ public:
 
 		/* _exit_game is used to break out of the outer video driver's MainLoop. */
 		_exit_game = true;
-		this->Close();
+		delete this;
 	}
 };
 
@@ -203,10 +201,9 @@ public:
 	}
 
 	/** Stop listening to the content client events. */
-	void Close() override
+	~BootstrapAskForDownloadWindow()
 	{
 		_network_content_client.RemoveCallback(this);
-		this->Window::Close();
 	}
 
 	void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
@@ -267,7 +264,7 @@ public:
 		/* And once the meta data is received, start downloading it. */
 		_network_content_client.Select(ci->id);
 		new BootstrapContentDownloadStatusWindow();
-		this->Close();
+		delete this;
 	}
 };