Change: Fetch OpenGFX2 for CI workflows

Change: Package OpenGFX2 for Windows Store and GOG
Doc: update contact information for Free Software Foundation
2026-07-21 01:59:44 +00:00 · 2025-12-06 21:56:41 +00:00 · 2025-12-06 21:44:02 +00:00 · 2025-12-06 19:47:10 +01:00 · 2025-12-06 18:30:31 +00:00 · 2025-12-06 12:52:44 -05:00
1023 changed files with 45850 additions and 33036 deletions
@@ -50,7 +50,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, game_changelog.hpp need updating.
    * The compatibility wrappers (compat_*.nut) need updating.
@@ -0,0 +1,50 @@
+name: 'Setup vcpkg'
+description: 'Installs vcpkg and initialises binary caching via NuGet'
+inputs:
+  vcpkg-location:
+    description: 'Where to install vcpkg'
+    required: true
+  mono-install-command:
+    description: 'Command to run to install mono'
+    required: false
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install vcpkg
+      shell: bash
+      run: |
+        git clone https://github.com/microsoft/vcpkg "${{ inputs.vcpkg-location }}"
+        cd "${{ inputs.vcpkg-location }}"
+        ./bootstrap-vcpkg.$(if [ "${{ runner.os }}" = "Windows" ]; then echo "bat"; else echo "sh"; fi) -disableMetrics
+
+    - name: Install mono
+      if: inputs.mono-install-command
+      shell: bash
+      run: |
+        ${{ inputs.mono-install-command }}
+        echo "MONO=mono" >> "$GITHUB_ENV"
+
+    - name: Setup NuGet Credentials
+      shell: bash
+      env:
+        FEED_URL: 'https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json'
+      run: |
+        cd "${{ inputs.vcpkg-location }}"
+        ${{ env.MONO }} $(./vcpkg fetch nuget | tail -n 1) \
+          sources add \
+          -source "${{ env.FEED_URL }}" \
+          -storepasswordincleartext \
+          -name "GitHub" \
+          -username "${{ github.repository_owner }}" \
+          -password "${{ github.token }}"
+        ${{ env.MONO }} $(./vcpkg fetch nuget | tail -n 1) \
+          setapikey "${{ github.token }}" \
+          -source "${{ env.FEED_URL }}"
+
+    - name: Setup vcpkg caching
+      uses: actions/github-script@v7
+      with:
+        script: |
+          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;nuget,GitHub,readwrite')
+
@@ -10,3 +10,5 @@ query-filters:
    - cpp/irregular-enum-init
    # Our GUI code tends to use switches for OnClick handlers, DrawWidget, and UpdateWidgetSize. Sometimes GUIs just don't have many elements, but we want to keep consistency.
    - cpp/trivial-switch
+    # Our (GUI) code tends to use long switches.
+    - cpp/long-switch
@@ -8,3 +8,5 @@ updates:
    actions:
      patterns:
      - "*"
+  commit-message:
+    prefix: "Upgrade: "
@@ -158,7 +158,7 @@ def scan_source_files(path, strings_found):
        # 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)
+            p = subprocess.run(["g++", "-E", "-DCHECK_UNUSED_STRINGS", new_path], stdout=subprocess.PIPE)
            output = p.stdout.decode()
        else:
            with open(new_path) as fp:
@@ -18,7 +18,7 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6

    - name: Fix dubious ownership
      run: |
@@ -30,20 +30,13 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6

-    - name: Setup vcpkg caching
-      uses: actions/github-script@v7
+    - name: Setup vcpkg
+      uses: ./.github/actions/setup-vcpkg
      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
-
-    - name: Install vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg
-        ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
+        vcpkg-location: ${{ runner.temp }}/vcpkg
+        mono-install-command: 'sudo apt-get install -y --no-install-recommends mono-complete'

    - name: Install dependencies
      run: |
@@ -85,15 +78,15 @@ jobs:
        mkdir -p ~/.local/share/openttd/baseset
        cd ~/.local/share/openttd/baseset

-        echo "::group::Download OpenGFX"
-        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip
+        echo "::group::Download OpenGFX2"
+        curl -L https://cdn.openttd.org/opengfx2_classic-releases/0.8/opengfx2_classic-0.8-all.zip -o opengfx2-all.zip
        echo "::endgroup::"

-        echo "::group::Unpack OpenGFX"
-        unzip opengfx-all.zip
+        echo "::group::Unpack OpenGFX2"
+        unzip opengfx2-all.zip
        echo "::endgroup::"

-        rm -f opengfx-all.zip
+        rm -f opengfx2-all.zip

    - name: Install GCC problem matcher
      uses: ammaraskar/gcc-problem-matcher@master
@@ -32,35 +32,28 @@ jobs:
        xcode-version: latest-stable

    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6

-    - name: Setup vcpkg caching
-      uses: actions/github-script@v7
+    - name: Setup vcpkg
+      uses: ./.github/actions/setup-vcpkg
      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
-
-    - name: Install vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg
-        ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
+        vcpkg-location: ${{ runner.temp }}/vcpkg
+        mono-install-command: 'brew install mono'

    - name: Install OpenGFX
      run: |
        mkdir -p ~/Documents/OpenTTD/baseset
        cd ~/Documents/OpenTTD/baseset

-        echo "::group::Download OpenGFX"
-        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip
+        echo "::group::Download OpenGFX2"
+        curl -L https://cdn.openttd.org/opengfx2_classic-releases/0.8/opengfx2_classic-0.8-all.zip -o opengfx2-all.zip
        echo "::endgroup::"

-        echo "::group::Unpack OpenGFX"
-        unzip opengfx-all.zip
+        echo "::group::Unpack OpenGFX2"
+        unzip opengfx2-all.zip
        echo "::endgroup::"

-        rm -f opengfx-all.zip
+        rm -f opengfx2-all.zip

    - name: Install GCC problem matcher
      uses: ammaraskar/gcc-problem-matcher@master
@@ -21,7 +21,7 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6

    - name: Setup MSYS2
      uses: msys2/setup-msys2@v2
@@ -47,15 +47,15 @@ jobs:
        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 "::group::Download OpenGFX2"
+        curl -L https://cdn.openttd.org/opengfx2_classic-releases/0.8/opengfx2_classic-0.8-all.zip -o opengfx2-all.zip
        echo "::endgroup::"

-        echo "::group::Unpack OpenGFX"
-        unzip opengfx-all.zip
+        echo "::group::Unpack OpenGFX2"
+        unzip opengfx2-all.zip
        echo "::endgroup::"

-        rm -f opengfx-all.zip
+        rm -f opengfx2-all.zip

    - name: Install GCC problem matcher
      uses: ammaraskar/gcc-problem-matcher@master
@@ -18,20 +18,12 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6

-    - name: Setup vcpkg caching
-      uses: actions/github-script@v7
+    - name: Setup vcpkg
+      uses: ./.github/actions/setup-vcpkg
      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
-
-    - name: Install vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}\vcpkg
-        ${{ runner.temp }}\vcpkg\bootstrap-vcpkg.bat -disableMetrics
+        vcpkg-location: ${{ runner.temp }}/vcpkg

    - name: Install OpenGFX
      shell: bash
@@ -39,15 +31,15 @@ jobs:
        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 "::group::Download OpenGFX2"
+        curl -L https://cdn.openttd.org/opengfx2_classic-releases/0.8/opengfx2_classic-0.8-all.zip -o opengfx2-all.zip
        echo "::endgroup::"

-        echo "::group::Unpack OpenGFX"
-        unzip opengfx-all.zip
+        echo "::group::Unpack OpenGFX2"
+        unzip opengfx2-all.zip
        echo "::endgroup::"

-        rm -f opengfx-all.zip
+        rm -f opengfx2-all.zip

    - name: Install MSVC problem matcher
      uses: ammaraskar/msvc-problem-matcher@master
@@ -21,23 +21,17 @@ jobs:
      actions: read
      contents: read
      security-events: write
+      packages: read

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6

-    - name: Setup vcpkg caching
-      uses: actions/github-script@v7
+    - name: Setup vcpkg
+      uses: ./.github/actions/setup-vcpkg
      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
-
-    - name: Install vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg
-        ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
+        vcpkg-location: ${{ runner.temp }}/vcpkg
+        mono-install-command: 'sudo apt-get install -y --no-install-recommends mono-complete'

    - name: Install dependencies
      run: |
@@ -83,7 +77,7 @@ jobs:
        echo "::endgroup::"

    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
      with:
        languages: cpp
        config-file: ./.github/codeql/codeql-config.yml
@@ -99,7 +93,7 @@ jobs:
        echo "::endgroup::"

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
      with:
        category: /language:cpp
        upload: False
@@ -117,6 +111,6 @@ jobs:
        output: sarif-results/cpp.sarif

    - name: Upload results
-      uses: github/codeql-action/upload-sarif@v3
+      uses: github/codeql-action/upload-sarif@v4
      with:
        sarif_file: sarif-results/cpp.sarif
@@ -14,7 +14,7 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
      with:
        fetch-depth: 4

@@ -26,7 +26,7 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
      with:
        ref: ${{ github.event.pull_request.head.sha }}

@@ -15,7 +15,7 @@ jobs:

    steps:
    - name: Download source
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: internal-source

@@ -78,7 +78,7 @@ jobs:
        echo "::endgroup::"

    - name: Store bundles
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        name: openttd-docs
        path: build/bundles/*.tar.xz
@@ -21,7 +21,7 @@ jobs:

    steps:
    - name: Download source
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: internal-source

@@ -35,14 +35,6 @@ jobs:
    - name: Enable Rust cache
      uses: Swatinem/rust-cache@v2

-    - name: Setup vcpkg caching
-      uses: actions/github-script@v7
-      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
-
    - name: Install dependencies
      run: |
        echo "::group::Install system dependencies"
@@ -113,20 +105,16 @@ jobs:
          # EOF
        echo "::endgroup::"

-        # We use vcpkg for our dependencies, to get more up-to-date version.
-        echo "::group::Install vcpkg and dependencies"
-
-        git clone https://github.com/microsoft/vcpkg /vcpkg
-
-        (
-          cd /vcpkg
-          ./bootstrap-vcpkg.sh -disableMetrics
-        )
-
        echo "::group::Install breakpad dependencies"
        cargo install --locked dump_syms
        echo "::endgroup::"

+    - name: Setup vcpkg
+      uses: ./.github/actions/setup-vcpkg
+      with:
+        vcpkg-location: /vcpkg
+        mono-install-command: 'yum install -y mono-complete'
+
    - name: Install GCC problem matcher
      uses: ammaraskar/gcc-problem-matcher@master

@@ -168,14 +156,14 @@ jobs:
        echo "::endgroup::"

    - name: Store bundles
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        name: openttd-linux-generic
        path: build/bundles
        retention-days: 5

    - name: Store symbols
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        name: symbols-linux-generic
        path: build/symbols
@@ -23,7 +23,7 @@ jobs:
        xcode-version: latest-stable

    - name: Download source
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: internal-source

@@ -37,18 +37,11 @@ jobs:
    - name: Enable Rust cache
      uses: Swatinem/rust-cache@v2

-    - name: Setup vcpkg caching
-      uses: actions/github-script@v7
+    - name: Setup vcpkg
+      uses: ./.github/actions/setup-vcpkg
      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
-
-    - name: Install vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg
-        ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
+        vcpkg-location: ${{ runner.temp }}/vcpkg
+        mono-install-command: 'brew install mono'

    - name: Install dependencies
      env:
@@ -86,7 +79,7 @@ jobs:
        echo "::endgroup::"

    - name: Import code signing certificates
-      uses: Apple-Actions/import-codesign-certs@v3
+      uses: Apple-Actions/import-codesign-certs@v5
      with:
        # The certificates in a PKCS12 file encoded as a base64 string
        p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
@@ -212,14 +205,14 @@ jobs:
        mv _CPack_Packages/*/Bundle/openttd-*.zip bundles/

    - name: Store bundles
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        name: openttd-macos-universal
        path: build-x64/bundles
        retention-days: 5

    - name: Store symbols
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        name: symbols-macos-universal
        path: build-x64/symbols
@@ -30,14 +30,14 @@ jobs:
    steps:
    - name: Checkout (Release)
      if: github.event_name == 'release'
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
      with:
        # We generate a changelog; for this we need the full git log.
        fetch-depth: 0

    - name: Checkout (Manual)
      if: github.event_name == 'workflow_dispatch'
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
      with:
        ref: ${{ github.event.inputs.ref }}
        # We generate a changelog; for this we need the full git log.
@@ -45,7 +45,7 @@ jobs:

    - name: Checkout (Trigger)
      if: github.event_name == 'repository_dispatch'
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
      with:
        ref: ${{ github.event.client_payload.ref }}
        # We generate a changelog; for this we need the full git log.
@@ -202,14 +202,14 @@ jobs:
        echo "::endgroup::"

    - name: Store bundles
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        name: openttd-source
        path: build/bundles/*
        retention-days: 5

    - name: Store source (for other jobs)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        name: internal-source
        path: source.tar.gz
@@ -15,7 +15,7 @@ jobs:

    steps:
    - name: Download source
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: internal-source

@@ -25,17 +25,17 @@ jobs:
        tar -xf source.tar.gz --strip-components=1

    - name: Download x86 build
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: openttd-windows-x86

    - name: Download x64 build
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: openttd-windows-x64

    - name: Download arm64 build
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: openttd-windows-arm64

@@ -74,16 +74,16 @@ jobs:
        mkdir -p builds/common-binaries/baseset
        cd builds/common-binaries/baseset

-        echo "::group::Download OpenGFX"
-        curl -L https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip -o opengfx-all.zip
+        echo "::group::Download OpenGFX2"
+        curl -L https://cdn.openttd.org/opengfx2_classic-releases/0.8/opengfx2_classic-0.8-all.zip -o opengfx2_classic.zip
        echo "::endgroup::"

-        echo "::group::Unpack OpenGFX"
-        unzip opengfx-all.zip
-        tar xf opengfx-*.tar
+        echo "::group::Unpack OpenGFX2"
+        unzip opengfx2_classic.zip
+        tar xf OpenGFX2_Classic-0.8.tar
        echo "::endgroup::"

-        rm -f opengfx-all.zip opengfx-*.tar
+        rm -f opengfx2_classic.zip OpenGFX2_Classic-0.8.tar

    - name: Install OpenMSX
      shell: bash
@@ -185,7 +185,7 @@ jobs:
        move output\OpenTTD.appxbundle bundles\internal\openttd-${{ inputs.version }}-windows-store.appxbundle

    - name: Store bundles
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        name: openttd-windows-store
        path: builds/bundles
@@ -30,7 +30,7 @@ jobs:

    steps:
    - name: Download source
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: internal-source

@@ -45,18 +45,10 @@ jobs:
    - name: Enable Rust cache
      uses: Swatinem/rust-cache@v2

-    - name: Setup vcpkg caching
-      uses: actions/github-script@v7
+    - name: Setup vcpkg
+      uses: ./.github/actions/setup-vcpkg
      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
-
-    - name: Install vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}\vcpkg
-        ${{ runner.temp }}\vcpkg\bootstrap-vcpkg.bat -disableMetrics
+        vcpkg-location: ${{ runner.temp }}/vcpkg

    - name: Install dependencies
      shell: bash
@@ -202,14 +194,14 @@ jobs:
        AZURE_CODESIGN_PROFILE_NAME: ${{ secrets.AZURE_CODESIGN_PROFILE_NAME }}

    - name: Store bundles
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        name: openttd-windows-${{ matrix.arch }}
        path: build/bundles
        retention-days: 5

    - name: Store symbols
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        name: symbols-windows-${{ matrix.arch }}
        path: build/symbols
@@ -14,7 +14,7 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6

    - name: Check for finding script functions that require company/deity mode enforcement/checks
      run: |
@@ -14,7 +14,7 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6

    - name: Check for unused strings
      run: |
@@ -21,7 +21,7 @@ jobs:

    steps:
    - name: Download all bundles
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6

    - name: Calculate checksums
      run: |
@@ -70,14 +70,14 @@ jobs:
        done

    - name: Store bundles
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        name: cdn-bundles
        path: bundles/*
        retention-days: 5

    - name: Store breakpad symbols
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        name: cdn-symbols
        path: symbols/*
@@ -130,7 +130,7 @@ jobs:
        installation_retrieval_payload: "OpenTTD/workflows"

    - name: Trigger 'Publish Docs'
-      uses: peter-evans/repository-dispatch@v3
+      uses: peter-evans/repository-dispatch@v4
      with:
        token: ${{ steps.generate_token.outputs.token }}
        repository: OpenTTD/workflows
@@ -15,31 +15,31 @@ jobs:

    steps:
    - name: Download source
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: internal-source
        path: internal-source

    - name: Download bundle (Windows x86)
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: openttd-windows-x86
        path: openttd-windows-x86

    - name: Download bundle (Windows x64)
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: openttd-windows-x64
        path: openttd-windows-x64

    - name: Download bundle (MacOS)
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: openttd-macos-universal
        path: openttd-macos-universal

    - name: Download bundle (Linux)
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: openttd-linux-generic
        path: openttd-linux-generic
@@ -56,16 +56,16 @@ jobs:
        mkdir -p gog/opengfx/baseset
        cd gog/opengfx/baseset

-        echo "::group::Download OpenGFX"
-        curl -L https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip -o opengfx-all.zip
+        echo "::group::Download OpenGFX2"
+        curl -L https://cdn.openttd.org/opengfx2_classic-releases/0.8/opengfx2_classic-0.8-all.zip -o opengfx2_classic.zip
        echo "::endgroup::"

-        echo "::group::Unpack OpenGFX"
-        unzip opengfx-all.zip
-        tar xf opengfx-*.tar
+        echo "::group::Unpack OpenGFX2"
+        unzip opengfx2_classic.zip
+        tar xf OpenGFX2_Classic-0.8.tar
        echo "::endgroup::"

-        rm -f opengfx-all.zip opengfx-*.tar
+        rm -f opengfx2_classic.zip OpenGFX2_Classic-0.8.tar

    - name: Install OpenMSX
      shell: bash
@@ -77,7 +77,7 @@ jobs:
        curl -L https://cdn.openttd.org/openmsx-releases/0.4.2/openmsx-0.4.2-all.zip -o openmsx-all.zip
        echo "::endgroup::"

-        echo "::group::Unpack OpenGFX"
+        echo "::group::Unpack OpenMSX"
        unzip openmsx-all.zip
        tar xf openmsx-*.tar
        echo "::endgroup::"
@@ -18,31 +18,31 @@ jobs:

    steps:
    - name: Download source
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: internal-source
        path: internal-source

    - name: Download bundle (Windows x86)
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: openttd-windows-x86
        path: openttd-windows-x86

    - name: Download bundle (Windows x64)
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: openttd-windows-x64
        path: openttd-windows-x64

    - name: Download bundle (MacOS)
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: openttd-macos-universal
        path: openttd-macos-universal

    - name: Download bundle (Linux)
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
      with:
        name: openttd-linux-generic
        path: openttd-linux-generic
@@ -196,6 +196,29 @@ These include:
 You may also want the guide to [compiling OpenTTD](./COMPILING.md).


+## Use of AI
+
+OpenTTD is a labour of love, created by people.
+
+Please refrain from submitting issues or pull requests that have been generated by an LLM or other fully-automated tools.
+Any submission that is in violation of this policy will be closed, and the submitter may be blocked from this repository without warning.
+
+If you submit an issue, you need to understand what your issue description is saying.
+You need to be able to answer questions about your bug report or feature request.
+Using an AI tool to _proofread_ your issue/comment text is acceptable. Using an AI tool to _write_ your issue/comment text is not.
+
+If you submit a pull request, you need to understand what every line of code you've changed does.
+If you can't explain why your PR is doing something, then do not submit it.
+Using an AI tool to generate entire lines of code is unacceptable.
+
+The rationale behind this policy is that automated contributions are a waste of the maintainers' time.
+Humans spend their time and brainpower reviewing every submission.
+Issues or pull requests generated by automation tools create an imbalance of effort between the submitter and the reviewer.
+Nobody learns anything when a maintainer reviews code written by an LLM.
+
+Additionally, AI-generated code conflicts with this project's license (GPL v2), since you cannot truly release code for use if you didn't author it yourself.
+
+
 ## Project goals

 ### What are the goals of the official branch?
@@ -6,7 +6,7 @@ GNU General Public License

 _Version 2, June 1991_
 _Copyright © 1989, 1991 Free Software Foundation, Inc.,_
-_51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA_
+_[https://fsf.org/](https://fsf.org/)_

 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -37,12 +37,10 @@ Both 'stable' and 'nightly' versions are available for download:

 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.

-
 ## 1.2) OpenTTD gameplay manual

 OpenTTD has a [community-maintained wiki](https://wiki.openttd.org/), including a gameplay manual and tips.

-
 ## 1.3) Supported platforms

 OpenTTD has been ported to several platforms and operating systems.
@@ -56,6 +54,7 @@ The currently supported platforms are:
 Other platforms may also work (in particular various BSD systems), but we don't actively test or maintain these.

 ### 1.3.1) Legacy support
+
 Platforms, languages and compilers change.
 We'll keep support going on old platforms as long as someone is interested in supporting them, except where it means the project can't move forward to keep up with language and compiler features.

@@ -72,7 +71,6 @@ For some platforms these will be downloaded during the installation process if r

 For some platforms, you will need to refer to [the installation guide](https://wiki.openttd.org/en/Manual/Installation).

-
 ### 1.4.1) Free graphics and sound files

 The free data files, split into OpenGFX for graphics, OpenSFX for sounds and
@@ -85,7 +83,6 @@ OpenMSX for music can be found at:
 Please follow the readme of these packages about the installation procedure.
 The Windows installer can optionally download and install these packages.

-
 ### 1.4.2) Original Transport Tycoon Deluxe graphics and sound files

 If you want to play with the original Transport Tycoon Deluxe data files you have to copy the data files from the CD-ROM into the baseset/ directory.
@@ -100,7 +97,6 @@ You need to copy the following files:
 - trgir.grf or TRGI.GRF
 - trgtr.grf or TRGT.GRF

-
 ### 1.4.3) Original Transport Tycoon Deluxe music

 If you want the Transport Tycoon Deluxe music, copy the appropriate files from the original game into the baseset folder.
@@ -108,7 +104,6 @@ If you want the Transport Tycoon Deluxe music, copy the appropriate files from t
 - TTD for DOS: The GM.CAT file
 - Transport Tycoon Original: The GM.CAT file, but rename it to GM-TTO.CAT

-
 ## 1.5) Add-on content / mods

 OpenTTD features multiple types of add-on content, which modify gameplay in different ways.
@@ -117,7 +112,6 @@ Most types of add-on content can be downloaded within OpenTTD via the 'Check Onl

 Add-on content can also be installed manually, but that's more complicated; the [OpenTTD wiki](https://wiki.openttd.org/) may offer help with that, or the [OpenTTD directory structure guide](./docs/directory_structure.md).

-
 ### 1.5.1) Social Integration

 OpenTTD has the ability to load plugins to integrate with Social Platforms like Steam, Discord, etc.
@@ -126,7 +120,6 @@ To enable such integration, the plugin for the specific platform has to be downl

 See [OpenTTD's website](https://www.openttd.org), under Downloads, for what plugins are available.

-
 ### 1.6) OpenTTD directories

 OpenTTD uses its own directory structure to store game data, add-on content etc.
@@ -137,7 +130,6 @@ For more information, see the [directory structure guide](./docs/directory_struc

 If you want to compile OpenTTD from source, instructions can be found in [COMPILING.md](./COMPILING.md).

-
 ## 2.0) Contact and Community

 'Official' channels
@@ -160,12 +152,10 @@ You can play OpenTTD with others, either cooperatively or competitively.

 See the [multiplayer documentation](./docs/multiplayer.md) for more details.

-
 ### 2.2) Contributing to OpenTTD

 We welcome contributors to OpenTTD.  More information for contributors can be found in [CONTRIBUTING.md](./CONTRIBUTING.md)

-
 ### 2.3) Reporting bugs

 Good bug reports are very helpful.  We have a [guide to reporting bugs](./CONTRIBUTING.md#bug-reports) to help with this.
@@ -173,12 +163,10 @@ Good bug reports are very helpful.  We have a [guide to reporting bugs](./CONTRI
 Desyncs in multiplayer are complex to debug and report (some software development skils are required).
 Instructions can be found in [debugging and reporting desyncs](./docs/debugging_desyncs.md).

-
 ### 2.4) Translating

 OpenTTD is translated into many languages.  Translations are added and updated via the [online translation tool](https://translator.openttd.org).

-
 ## 3.0) Licensing

 OpenTTD is licensed under the GNU General Public License version 2.0.
@@ -215,6 +203,6 @@ See `src/3rdparty/openttd_social_integration_api/LICENSE` for the complete licen
 The atomic datatype support detection in `cmake/3rdparty/llvm/CheckAtomic.cmake` is licensed under the Apache 2.0 license.
 See `cmake/3rdparty/llvm/LICENSE.txt` for the complete license text.

-## 4.0 Credits
+## 4.0) Credits

 See [CREDITS.md](./CREDITS.md)
@@ -36,3 +36,11 @@ AITown.FoundTown <- function(tile, size, city, layout, name) { return AITown.Fou

 AIVehicle.SetNameCompat14 <- AIVehicle.SetName;
 AIVehicle.SetName <- function(id, name) { return AIVehicle.SetNameCompat14(id, AICompat14.Text(name)); }
+
+AIObject.constructorCompat14 <- AIObject.constructor;
+foreach(name, object in CompatScriptRootTable) {
+	if (type(object) != "class") continue;
+	if (!object.rawin("constructor")) continue;
+	if (object.constructor != AIObject.constructorCompat14) continue;
+	object.constructor <- function() : (name) { AILog.Error("'" + name + "' is not instantiable"); }
+}
@@ -9,6 +9,9 @@

 GSBridge.GetBridgeID <- GSBridge.GetBridgeType;

+/* Emulate old GSText parameter padding behaviour */
+GSText.SCRIPT_TEXT_MAX_PARAMETERS <- 20;
+
 class GSCompat14 {
 	function Text(text)
 	{
@@ -78,3 +81,11 @@ GSTown.FoundTown <- function(tile, size, city, layout, name) { return GSTown.Fou

 GSVehicle.SetNameCompat14 <- GSVehicle.SetName;
 GSVehicle.SetName <- function(id, name) { return GSVehicle.SetNameCompat14(id, GSCompat14.Text(name)); }
+
+GSObject.constructorCompat14 <- GSObject.constructor;
+foreach(name, object in CompatScriptRootTable) {
+	if (type(object) != "class") continue;
+	if (!object.rawin("constructor")) continue;
+	if (object.constructor != GSObject.constructorCompat14) continue;
+	object.constructor <- function() : (name) { GSLog.Error("'" + name + "' is not instantiable"); }
+}
@@ -1,5 +1,153 @@
 ## 15.x

+### 15.0-beta3 (2025-08-31)
+
+- Feature: Identify cities in the main viewport by appending an icon to their names (#14504)
+- Feature: Allow stations and roadstops under bridges (#14477)
+- Feature: Separate ships travelling in opposite direction (#14493)
+- Feature: Town and Industry cargo history graphs (#14321, #14461)
+- Feature: New company face definition system and UI (#14319)
+- Feature: Rework intro screen menu (#14220, #14233)
+- Feature: Scrollbar for infrastructure window (#14056)
+- Feature: Double-Ctrl+Click on default size box to clear saved size (#14055)
+- Feature: Configure badges in build vehicle and picker windows (#13993, #14021)
+- Feature: Player configuration of badge display (#13993, #14021)
+- Feature: Merge Game Options and Game Settings together (#13242, #14088)
+- Feature: Option to disable activate-on-release behaviour of toolbar dropdown buttons (#10938)
+- Add: Maori (New Zealand) language (#14540)
+- Add: Vietnamese Dong currency (#14474)
+- Add: Buttons to change picker preview image height (#14373)
+- Add: Show and sort online content version in list (#14355)
+- Add: Allow separate expansion of town buildings and roads in scenario editor (#14341)
+- Add: Hover on graph legend to highlight line (#14314)
+- Add: [Script] Ability to clone ScriptList objects (#14305)
+- Add: [NewGRF] All callbacks returning D0xx strings, have now the option to return any string id via register 0x100 (#14224)
+- Add: [BaseSet] Allow basesets to set minor and patch versions in obg/obs/obm files (#14169)
+- Add: "Many random towns" button in scenario editor now prompts for the number of towns, with defaults based on new game settings (#14158)
+- Add: [NewGRF] Special value 0x7FFE for VarAction2 results specifying 'return calculated result' (#14149)
+- Add: [NewGRF] Special value 0x7FFF for Action2 references specifying explicit 'callback/sprite-resolving failed' (#14149)
+- Add: [NewGRF] Add purchase list Action3 CID for houses, industries, industry tiles, airports and airport tiles (#14121)
+- Add: [NewGRF] Provide random bits in var10 of house callback 1C 'construction stage changed' (#14095)
+- Add: [NewGRF] Station/roadstop animation-triggers 'tile loop' (bit 7) and 'path reservation' (bit 8) (#14080)
+- Add: [Script] ScriptVehicleList_Waypoint (#13456)
+- Change: Update OpenTTD TTF fonts to v0.8 (#14546)
+- Change: Hide bridge pillars if obstructed by tile below (#14517)
+- Change: Reduce visual height of default rail waypoints (#14503)
+- Change: Improve sprite ellipsis appearance (#14404)
+- Change: [Script] Don't allow scripts to instantiate ScriptEvent (#14276)
+- Change: [Script] ScriptVehicleList_Station accepts an optional VehicleType parameter (#14260)
+- Change: Remove Apply button from NewGRF config window when unneeded (#14254)
+- Change: [NewGRF] Increase the textstack for all callbacks to 16 registers (#14224)
+- Change: Remove button to toggle showing advanced signal types (#14219)
+- Change: [Script] Remove the limit of 20 parameters to a Text string (#14193)
+- Change: [NewGRF] If Action123 does not resolve in a valid SpriteSet, prefer drawing the default sprite instead of an invalid sprite (#14143)
+- Change: Remove extra close buttons from some windows (#14124)
+- Change: Limit height of settings description, and add scrollbar (#14102)
+- Change: [NewGRF] Provide shared random bits in multi-tile animation-triggers of airport tiles and objects, just like for other features (#14090)
+- Change: [NewGRF] Animation-trigger 'construction stage changed' of houses and industries now also triggers at construction start (#14089)
+- Change: "setting" console command now shows default value (#14061)
+- Change: Include dragged train in depot tile length display (#14060)
+- Change: Don't select content when toggling its download status (#14059)
+- Change: Draw boolean settings toggles as a slider widget (#14051, #14071)
+- Change: Don't replace stripped control codes with '?' for scripts (#14028)
+- Change: [Script] Move GSStation::GetOwner to GSBaseStation::GetOwner (#13406)
+- Fix #14561: Vehicle effects were missing for vehicle on bridge (#14563)
+- Fix #14553: Parameter configuration of pre-action 14 NewGRFs did not work (#14554)
+- Fix: File/directory titles not updated if language is changed (#14542)
+- Fix: Missing space after old file type identifier (#14541)
+- Fix: Account for both text and icon size in station waiting cargo display (#14535)
+- Fix: Crash when buying out company with groups (#14534)
+- Fix #10222: Off by one drawing lines of certain widths (#14520, #14522, #14523)
+- Fix: [Script] Invalid title on GSGoal.Question windows (#14519)
+- Fix: 'Map edges' GUI buttons shouldn't initialize with water on northeast edge (#14514)
+- Fix #14415: Update survey option text when changing setting (#14487)
+- Fix #14480: Music player playlist buttons are clickable but non-operational in intro menu (#14482)
+- Fix: Missing button beeps (#14470)
+- Fix #14464: Invalid string parameter in scenario editor when unable to build industry (#14465)
+- Fix: [Linkgraph] Use correct station ID when erasing flows (#14459)
+- Fix: Vehicle liveries did not update when switching company (#14456)
+- Fix: Engine preview window could have the wrong size (#14455)
+- Fix #8167: No error sub-message when trying to clear protected buildings (#14444)
+- Fix #14433: [NewGRF] Road tile for drive-through stops was not drawn (#14434)
+- Fix: [Win32] Build failure with newer Windows SDK version due to WinRT changes (#14432)
+- Fix #14396: Industry production graph showed zero when data was unavailable (#14416)
+- Fix #14385: Crash in industry view due to incorrect string parameter calculations (#14413)
+- Fix #14360: Stop reusing strings for Low/Medium/High setting values to improve translations (#14409)
+- Fix #14377: Make house picker window remember house protection state when closed (#14406)
+- Fix #14375: When loading config, validate timekeeping mode and minutes per year (#14405)
+- Fix: Include sort button width in content list header minimal size (#14402)
+- Fix: Don't draw truncation ellipsis if it's too wide (#14401)
+- Fix: Don't include ellipsis width in RTL truncation offset (#14400)
+- Fix: Buildings with non-zero subtile offsets broken in house picker (#14390)
+- Fix #12900: Could not use join station with new non-square stations (#14378)
+- Fix: Allow object picker to resize if there are no classes (#14372)
+- Fix #14081: Only allow "rm" & "del" console commands to remove savegames (#14371)
+- Fix: Train path reservations on different railtypes could join leading to train crashes (#14366)
+- Fix #14356: Incorrect sprite group chosen for stations and road stops (#14359)
+- Fix: Wrong error message about script Save() returned value (#14334)
+- Fix: Hidden-by-facility station signs were not ignored when handling clicks (#14326)
+- Fix: [Script] SQOpsLimiter had no effect for native valuator/filter (#14322)
+- Fix: Crash if loading compatibility scripts fails (#14318)
+- Fix #14277: Aircraft could land when a zeppelin was on the runway (#14317)
+- Fix: Drag drop line position when dragging NewGRF from file to active panel (#14316)
+- Fix: Upgrade button in NewGRF window no longer worked (#14315)
+- Fix: [NewGRF] Clear rail vehicle flipped flag if reverse probability callback returns false (#14281)
+- Fix: [Script] Conversion from ScriptEvent to ScriptEventCompanyTown subclasses (#14274)
+- Fix: Empty first parameter of EncodedString was skipped (#14273)
+- Fix #14271: Crash due to incorrect parameter index in string (#14272)
+- Fix: Restore the behaviour when entering numbers in query windows: clamp integers out of range to the maximum valid value (#14268)
+- Fix: Replacing a dropdown list could reposition it partially off-screen (#14261)
+- Fix: Click+Dragging of selected order was not possible (#14259)
+- Fix #14256: Company finance windows not updated when paused (#14258)
+- Fix: Incorrect tile colour in smallmap for snowy clear tiles in vegetation mode (#14257)
+- Fix #14241: Invalid string parameters in subsidies list window (#14243)
+- Fix #13854: 40bpp-anim blitter recolouring failed for 32bpp pixels without mask channel (#14242)
+- Fix #14234: Crash due to broken invalid string parameter handling (#14235, #14236)
+- Fix: Closing the Game Options window closes all textfile windows (#14210)
+- Fix: Zoom-scroll extra viewports only if the mouse cursor is over the viewport (#14209)
+- Fix: Changing monospace font didn't refresh the monospace width cache, causing wrapping issues (#14185)
+- Fix: Crash/Undefined behaviour in station view window (#14183)
+- Fix: Handle tab characters when loading GS strings from savegame (#14180)
+- Fix: [Script] Access to enum/consts defined outside of main.nut (#14176)
+- Fix: Small order list arrow was wrong direction for RTL text (#14174)
+- Fix #14170: Missing spaces for timetabled order strings (#14172)
+- Fix #14166: Loan was no longer invalidated when refreshing finance window (#14168)
+- Fix #14098: Ability to play MIDI tracks over 7 minutes long (#14144)
+- Fix: [NewGRF] AI station construction callback did not work for stations with ID >= 0x100 (#14142)
+- Fix: Out-of-bounds read, if NewGRF stations provided no spritesets (#14140)
+- Fix: [NewGRF] The result of Action123 evaluation affected rerandomisation in a weird corner case (#14139)
+- Fix: [NewGRF] Computed VarAction2 callback results were not always properly masked to 15 bit results (#14138)
+- Fix #14125: NewGRF sounds were not loaded (#14130)
+- Fix: List Ctrl+Click behaviour for vehicle details tooltip (#14127)
+- Fix: Road vehicle blocking and train collisions used slightly inconsistent distance thresholds (#14114)
+- Fix #14107: Mark the company value in the company view window dirty when it changes (#14112)
+- Fix #14107: Invalidate all shared vehicle windows when changing group (#14110)
+- Fix #14104: Don't base timetable timing decisions on client settings (#14105)
+- Fix: Focus settings filter box (only) when the tab becomes active (#14100)
+- Fix: [Script] Reject scripts using negative version (#14096)
+- Fix: Map size column in server list could be too wide (#14094)
+- Fix: [NewGRF] Cargo-types for airport-tile animation-triggers were not properly translated (#14092)
+- Fix: [NewGRF] For animation-triggers which do not supply a cargo-type in var18, the var18 bits should remain empty (#14091)
+- Fix: Changing language or interface scale could hang (#14087)
+- Fix: [NewGRF] For roadstop multi-tile-animation-triggers, the upper 16 bits were not the same for all tiles (#14084)
+- Fix: Town view caption lost "(City)" flag (#14082)
+- Fix: [NewGRF] Randomisation-trigger 'path reservation' did not work for waypoints (#14076)
+- Fix: Incorrect test of object flags allowed HQ to be removed (#14062)
+- Fix: Odd drawing and crash if scrollbar is not tall enough (#14052)
+- Fix: Incorrect string display for autoreplace wagon removal status (#14038)
+- Fix: House picker crashes if selection is not available (#14030)
+- Fix: [NewGRF] PrepareLayout worked on a copy of the data resulting in bad sprite layouts (#14013)
+- Fix: [NewGRF] Strange things happened, when using the synchronised tile loop animation trigger for houses (#14011)
+- Fix: [NewGRF] Animation speed properties of houses and stations had wrong default (#14005)
+- Fix: [NewGRF] Roadstop animation/randomisation was not triggered on vehicle arrival (#14003)
+- Fix: Don't display badges if the class has no name (#13994)
+- Fix #13954: Plotting graphs with limited data to the right (#13956)
+- Fix #13307: Return non-zero value when there is a mistake in command-line arguments (#13547)
+- Fix: [Script] Make ScriptOrder functions aware of road waypoints (#13419)
+- Fix: Scale graph gridlines and axes with GUI scale (#12131)
+- Fix: Original graphics' tycoon-of-the-century sprite assumes a black background (#11679, #14545)
+
+
 ### 15.0-beta2 (2025-04-13)

 - Feature: Snow-covered rocks are now visible (#13627)
@@ -20,6 +168,7 @@
 - Add: Ukrainian Hryvnia currency (#12877)
 - Add: Convert 32bpp-only sprites to 8bpp when needed (#11602)
 - Change: [Script] Start GS (but don't run it) when generating world in scenario editor (#13961)
+- Change: [Script] Add vehicle owner to crash event (#13878)
 - Change: Make tree placement at world generation look more organic (#13515)
 - Change: [MacOS] Put the icon in a rounded rectangle (#13446)
 - Change: [Script] GetWaypointID to return the StationID of any waypoint (#13407)
@@ -25,6 +25,12 @@ if(EDITBIN_EXECUTABLE)
    execute_process(COMMAND ${EDITBIN_EXECUTABLE} /nologo /subsystem:console ${OPENTTD_EXECUTABLE})
 endif()

+# Remove previous crash files
+file(GLOB CRASH_FILES "regression/crash*")
+if(CRASH_FILES)
+    file(REMOVE ${CRASH_FILES})
+endif()
+
 # Run the regression test
 execute_process(COMMAND ${OPENTTD_EXECUTABLE}
                        -x
@@ -40,6 +46,13 @@ execute_process(COMMAND ${OPENTTD_EXECUTABLE}
                OUTPUT_STRIP_TRAILING_WHITESPACE
 )

+# Detect any crash
+file(GLOB CRASH_FILES "regression/crash*.log")
+if (CRASH_FILES)
+    file(READ ${CRASH_FILES} CRASH_LOG)
+    message(FATAL_ERROR "OpenTTD crashed: ${CRASH_LOG}")
+endif()
+
 if(REGRESSION_OUTPUT)
    message(FATAL_ERROR "Unexpected output: ${REGRESSION_OUTPUT}")
 endif()
@@ -17,41 +17,48 @@ if(NOT APILC)
 endif()

 macro(dump_fileheader)
-    get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME)
-    string(APPEND SQUIRREL_EXPORT "\n#include \"../${SCRIPT_API_FILE_NAME}\"")
+    get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME_WE)
+    string(APPEND SQUIRREL_EXPORT "\n#include \"../${SCRIPT_API_FILE_NAME}.hpp\"")
    if(NOT "${APIUC}" STREQUAL "Template")
        string(REPLACE "script_" "template_" SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE_NAME}")
-        string(APPEND SQUIRREL_EXPORT "\n#include \"../template/${SCRIPT_API_FILE_NAME}.sq\"")
+        string(APPEND SQUIRREL_EXPORT "\n#include \"../template/${SCRIPT_API_FILE_NAME}.sq.hpp\"")
+    endif()
+endmacro()
+
+macro(open_namespace)
+    if(NOT NAMESPACE_OPENED)
+        string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
+        set(NAMESPACE_OPENED TRUE)
    endif()
 endmacro()

 macro(dump_class_templates NAME)
    string(REGEX REPLACE "^Script" "" REALNAME ${NAME})

-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<${NAME} *> { static inline ${NAME} *Get(HSQUIRRELVM vm, int index) { return  static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<${NAME} &> { static inline ${NAME} &Get(HSQUIRRELVM vm, int index) { return *static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<const ${NAME} *> { static inline const ${NAME} *Get(HSQUIRRELVM vm, int index) { return  static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<const ${NAME} &> { static inline const ${NAME} &Get(HSQUIRRELVM vm, int index) { return *static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
+    string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<${NAME} *> { static inline ${NAME} *Get(HSQUIRRELVM vm, int index) { return  static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
+    string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<${NAME} &> { static inline ${NAME} &Get(HSQUIRRELVM vm, int index) { return *static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
+    string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<const ${NAME} *> { static inline const ${NAME} *Get(HSQUIRRELVM vm, int index) { return  static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
+    string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<const ${NAME} &> { static inline const ${NAME} &Get(HSQUIRRELVM vm, int index) { return *static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
    if("${NAME}" STREQUAL "ScriptEvent")
-        string(APPEND SQUIRREL_EXPORT "\n	template <> struct Return<${NAME} *> { static inline int Set(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; } };")
+        string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Return<${NAME} *> { static inline int Set(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")
        string(APPEND SQUIRREL_EXPORT "\n")
-        string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<Text *> {")
-        string(APPEND SQUIRREL_EXPORT "\n		static inline Text *Get(HSQUIRRELVM vm, int index) {")
-        string(APPEND SQUIRREL_EXPORT "\n			if (sq_gettype(vm, index) == OT_INSTANCE) {")
-        string(APPEND SQUIRREL_EXPORT "\n				return Param<ScriptText *>::Get(vm, index);")
-        string(APPEND SQUIRREL_EXPORT "\n			}")
-        string(APPEND SQUIRREL_EXPORT "\n			if (sq_gettype(vm, index) == OT_STRING) {")
-        string(APPEND SQUIRREL_EXPORT "\n				return new RawText(Param<const std::string &>::Get(vm, index));")
-        string(APPEND SQUIRREL_EXPORT "\n			}")
-        string(APPEND SQUIRREL_EXPORT "\n			if (sq_gettype(vm, index) == OT_NULL) {")
-        string(APPEND SQUIRREL_EXPORT "\n				return nullptr;")
-        string(APPEND SQUIRREL_EXPORT "\n			}")
-        string(APPEND SQUIRREL_EXPORT "\n			throw sq_throwerror(vm, fmt::format(\"parameter {} has an invalid type ; expected: 'Text'\", index - 1));")
-        string(APPEND SQUIRREL_EXPORT "\n		}")
-        string(APPEND SQUIRREL_EXPORT "\n	};")
+        string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<Text *> {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\tstatic inline Text *Get(HSQUIRRELVM vm, int index) {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\tif (sq_gettype(vm, index) == OT_INSTANCE) {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t\treturn Param<ScriptText *>::Get(vm, index);")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t}")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\tif (sq_gettype(vm, index) == OT_STRING) {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t\treturn new RawText(Param<const std::string &>::Get(vm, index));")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t}")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\tif (sq_gettype(vm, index) == OT_NULL) {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t\treturn nullptr;")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t}")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\tthrow sq_throwerror(vm, fmt::format(\"parameter {} has an invalid type ; expected: 'Text'\", index - 1));")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t}")
+        string(APPEND SQUIRREL_EXPORT "\n\t};")
    else()
-        string(APPEND SQUIRREL_EXPORT "\n	template <> struct Return<${NAME} *> { static inline int Set(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; } };")
+        string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Return<${NAME} *> { static inline int Set(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; } };")
    endif()
 endmacro()

@@ -66,7 +73,6 @@ macro(reset_reader)
    unset(STATIC_METHODS)
    unset(CLS)
    unset(START_SQUIRREL_DEFINE_ON_NEXT_LINE)
-    set(CLS_LEVEL 0)
    unset(CLS_IN_API)
 endmacro()

@@ -75,6 +81,9 @@ reset_reader()
 file(STRINGS "${SCRIPT_API_FILE}" SOURCE_LINES)

 set(NUM_LINE 0)
+set(CLS_LEVEL 0)
+set(BRACE_LEVEL 0)
+
 macro(doxygen_check)
    if(NOT "${DOXYGEN_SKIP}" STREQUAL "")
        message(FATAL_ERROR "${SCRIPT_API_FILE}:${NUM_LINE}: a DOXYGEN_API block was not properly closed")
@@ -110,7 +119,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
        continue()
    endif()

-    if("${LINE}" MATCHES "^([	 ]*)\\* @api (.*)$")
+    if("${LINE}" MATCHES "^([\t ]*)\\* @api (.*)$")
        set(LINE ${CMAKE_MATCH_2})
        # By default, classes are not selected
        if(NOT CLS_LEVEL)
@@ -148,22 +157,28 @@ foreach(LINE IN LISTS SOURCE_LINES)
        continue()
    endif()

+    # Count braces to skip function bodies
+    string(REGEX REPLACE "[^{]" "" OPENING_BRACES "${LINE}")
+    string(LENGTH "${OPENING_BRACES}" OPENING_BRACES)
+    string(REGEX REPLACE "[^}]" "" CLOSING_BRACES "${LINE}")
+    string(LENGTH "${CLOSING_BRACES}" CLOSING_BRACES)
+    math(EXPR BRACE_LEVEL "${BRACE_LEVEL} + ${OPENING_BRACES} - ${CLOSING_BRACES}")
+
    # Ignore forward declarations of classes
-    if("${LINE}" MATCHES "^(	*)class(.*);")
+    if("${LINE}" MATCHES "^(\t*)class(.*);")
        continue()
    endif()

    # We only want to have public functions exported for now
-    if("${LINE}" MATCHES "^(	*)class (.*) (: public|: protected|: private|:) ([^ ]*)")
+    if("${LINE}" MATCHES "^(\t*)class (.*) (: public|: protected|: private|:) ([^ ]*)")
        if(NOT CLS_LEVEL)
            if(NOT DEFINED API_SELECTED)
-                message(WARNING "Class '${CMAKE_MATCH_2}' has no @api. It won't be published to any API.")
+                message(WARNING "${SCRIPT_API_FILE}:${NUM_LINE}: Class '${CMAKE_MATCH_2}' has no @api. It won't be published to any API.")
                set(API_SELECTED FALSE)
            endif()
            unset(IS_PUBLIC)
-            unset(CLS_PARAM_0)
-            set(CLS_PARAM_1 1)
-            set(CLS_PARAM_2 "x")
+            unset(CLS_PARAMS)
+            set(CLS_TYPES "x")
            set(CLS_IN_API ${API_SELECTED})
            unset(API_SELECTED)
            set(CLS "${CMAKE_MATCH_2}")
@@ -181,19 +196,19 @@ foreach(LINE IN LISTS SOURCE_LINES)
        math(EXPR CLS_LEVEL "${CLS_LEVEL} + 1")
        continue()
    endif()
-    if("${LINE}" MATCHES "^(	*)public")
+    if("${LINE}" MATCHES "^(\t*)public")
        if(CLS_LEVEL EQUAL 1)
            set(IS_PUBLIC TRUE)
        endif()
        continue()
    endif()
-    if("${LINE}" MATCHES "^(	*)protected")
+    if("${LINE}" MATCHES "^(\t*)protected")
        if(CLS_LEVEL EQUAL 1)
            unset(IS_PUBLIC)
        endif()
        continue()
    endif()
-    if("${LINE}" MATCHES "^(	*)private")
+    if("${LINE}" MATCHES "^(\t*)private")
        if(CLS_LEVEL EQUAL 1)
            unset(IS_PUBLIC)
        endif()
@@ -221,7 +236,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
    endif()

    # We need to make specialized conversions for structs
-    if("${LINE}" MATCHES "^(	*)struct ([^ ]*)")
+    if("${LINE}" MATCHES "^(\t*)struct ([^ ]*)")
        math(EXPR CLS_LEVEL "${CLS_LEVEL} + 1")

        # Check if we want to publish this struct
@@ -243,7 +258,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
    endif()

    # We need to make specialized conversions for enums
-    if("${LINE}" MATCHES "^(	*)enum ([^ ]*)")
+    if("${LINE}" MATCHES "^(\t*)enum ([^ ]*)")
        math(EXPR CLS_LEVEL "${CLS_LEVEL} + 1")

        # Check if we want to publish this enum
@@ -266,7 +281,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
    endif()

    # Maybe the end of the class, if so we can start with the Squirrel export pretty soon
-    if("${LINE}" MATCHES "};")
+    if(BRACE_LEVEL LESS CLS_LEVEL)
        math(EXPR CLS_LEVEL "${CLS_LEVEL} - 1")
        if(CLS_LEVEL)
            unset(IN_ENUM)
@@ -280,7 +295,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
    endif()

    # Empty/white lines. When we may do the Squirrel export, do that export.
-    if("${LINE}" MATCHES "^([ 	]*)$")
+    if("${LINE}" MATCHES "^([ \t]*)$")
        if(NOT START_SQUIRREL_DEFINE_ON_NEXT_LINE)
            continue()
        endif()
@@ -304,33 +319,17 @@ foreach(LINE IN LISTS SOURCE_LINES)
        string(APPEND SQUIRREL_EXPORT "\n")

        if("${APIUC}" STREQUAL "Template")
-            # First check whether we have enums to print
-            if(DEFINED ENUMS)
-                if(NOT NAMESPACE_OPENED)
-                    string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
-                    set(NAMESPACE_OPENED TRUE)
-                endif()
-            endif()
-
            # Then check whether we have structs/classes to print
            if(DEFINED STRUCTS)
-                if(NOT NAMESPACE_OPENED)
-                    string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
-                    set(NAMESPACE_OPENED TRUE)
-                endif()
-                string(APPEND SQUIRREL_EXPORT "\n	/* Allow inner classes/structs to be used as Squirrel parameters */")
+                open_namespace()
+                string(APPEND SQUIRREL_EXPORT "\n\t/* Allow inner classes/structs to be used as Squirrel parameters */")
                foreach(STRUCT IN LISTS STRUCTS)
                    dump_class_templates(${STRUCT})
                endforeach()
            endif()

-            if(NOT NAMESPACE_OPENED)
-                string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
-                set(NAMESPACE_OPENED TRUE)
-            else()
-                string(APPEND SQUIRREL_EXPORT "\n")
-            endif()
-            string(APPEND SQUIRREL_EXPORT "\n	/* Allow ${CLS} to be used as Squirrel parameter */")
+            open_namespace()
+            string(APPEND SQUIRREL_EXPORT "\n\t/* Allow ${CLS} to be used as Squirrel parameter */")
            dump_class_templates(${CLS})

            string(APPEND SQUIRREL_EXPORT "\n} // namespace SQConvert")
@@ -340,23 +339,23 @@ foreach(LINE IN LISTS SOURCE_LINES)
        endif()

        string(APPEND SQUIRREL_EXPORT "\n")
-        string(APPEND SQUIRREL_EXPORT "\ntemplate <> SQInteger PushClassName<${CLS}, ScriptType::${APIUC}>(HSQUIRRELVM vm) { sq_pushstring(vm, \"${API_CLS}\", -1); return 1; }")
+        string(APPEND SQUIRREL_EXPORT "\ntemplate <> SQInteger PushClassName<${CLS}, ScriptType::${APIUC}>(HSQUIRRELVM vm) { sq_pushstring(vm, \"${API_CLS}\"); return 1; }")
        string(APPEND SQUIRREL_EXPORT "\n")

        # Then do the registration functions of the class.
-        string(APPEND SQUIRREL_EXPORT "\nvoid SQ${API_CLS}_Register(Squirrel *engine)")
+        string(APPEND SQUIRREL_EXPORT "\nvoid SQ${API_CLS}_Register(Squirrel &engine)")
        string(APPEND SQUIRREL_EXPORT "\n{")
-        string(APPEND SQUIRREL_EXPORT "\n	DefSQClass<${CLS}, ScriptType::${APIUC}> SQ${API_CLS}(\"${API_CLS}\");")
+        string(APPEND SQUIRREL_EXPORT "\n\tDefSQClass<${CLS}, ScriptType::${APIUC}> SQ${API_CLS}(\"${API_CLS}\");")
        if("${SUPER_CLS}" STREQUAL "Text")
-            string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PreRegister(engine);")
+            string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.PreRegister(engine);")
        else()
-            string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PreRegister(engine, \"${API_SUPER_CLS}\");")
+            string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.PreRegister(engine, \"${API_SUPER_CLS}\");")
        endif()
-        if(NOT "${SUPER_CLS}" MATCHES "^ScriptEvent")
-            if("${CLS_PARAM_2}" STREQUAL "v")
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.AddSQAdvancedConstructor(engine);")
+        if((DEFINED CLS_PARAMS OR DEFINED METHODS) AND NOT "${SUPER_CLS}" MATCHES "^ScriptEvent" AND NOT "${CLS}" STREQUAL "ScriptEvent")
+            if("${CLS_TYPES}" STREQUAL "v")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.AddSQAdvancedConstructor(engine);")
            else()
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.AddConstructor<void (${CLS}::*)(${CLS_PARAM_0}), ${CLS_PARAM_1}>(engine, \"${CLS_PARAM_2}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.AddConstructor<void (${CLS}::*)(${CLS_PARAMS})>(engine, \"${CLS_TYPES}\");")
            endif()
        endif()
        string(APPEND SQUIRREL_EXPORT "\n")
@@ -376,7 +375,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
            foreach(i RANGE ${LEN})
                string(APPEND SPACES " ")
            endforeach()
-            string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQConst(engine, ${CLS}::${ENUM_VALUE},${SPACES}\"${ENUM_VALUE}\");")
+            string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQConst(engine, ${CLS}::${ENUM_VALUE},${SPACES}\"${ENUM_VALUE}\");")
        endforeach()
        if(MLEN)
            string(APPEND SQUIRREL_EXPORT "\n")
@@ -397,7 +396,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
            foreach(i RANGE ${LEN})
                string(APPEND SPACES " ")
            endforeach()
-            string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQConst(engine, ${CLS}::${CONST_VALUE},${SPACES}\"${CONST_VALUE}\");")
+            string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQConst(engine, ${CLS}::${CONST_VALUE},${SPACES}\"${CONST_VALUE}\");")
        endforeach()
        if(MLEN)
            string(APPEND SQUIRREL_EXPORT "\n")
@@ -423,7 +422,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
            foreach(i RANGE ${LEN})
                string(APPEND SPACES " ")
            endforeach()
-            string(APPEND SQUIRREL_EXPORT "\n	ScriptError::RegisterErrorMap(${ENUM_STRING},${SPACES}${CLS}::${ENUM_ERROR});")
+            string(APPEND SQUIRREL_EXPORT "\n\tScriptError::RegisterErrorMap(${ENUM_STRING},${SPACES}${CLS}::${ENUM_ERROR});")
        endforeach()
        if(MLEN)
            string(APPEND SQUIRREL_EXPORT "\n")
@@ -444,7 +443,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
            foreach(i RANGE ${LEN})
                string(APPEND SPACES " ")
            endforeach()
-            string(APPEND SQUIRREL_EXPORT "\n	ScriptError::RegisterErrorMapString(${CLS}::${ENUM_ERROR_TO_STRING},${SPACES}\"${ENUM_ERROR_TO_STRING}\");")
+            string(APPEND SQUIRREL_EXPORT "\n\tScriptError::RegisterErrorMapString(${CLS}::${ENUM_ERROR_TO_STRING},${SPACES}\"${ENUM_ERROR_TO_STRING}\");")
        endforeach()
        if(MLEN)
            string(APPEND SQUIRREL_EXPORT "\n")
@@ -463,8 +462,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
        foreach(STATIC_METHOD IN LISTS STATIC_METHODS)
            string(REPLACE ":" ";" STATIC_METHOD "${STATIC_METHOD}")
            list(GET STATIC_METHOD 0 FUNCNAME)
-            list(GET STATIC_METHOD 1 ARGC)
-            list(GET STATIC_METHOD 2 TYPES)
+            list(GET STATIC_METHOD 1 TYPES)
            string(LENGTH "${FUNCNAME}" LEN)
            math(EXPR LEN "${MLEN} - ${LEN}")
            if("${TYPES}" STREQUAL "v")
@@ -479,9 +477,9 @@ foreach(LINE IN LISTS SOURCE_LINES)
                string(APPEND SPACES " ")
            endforeach()
            if("${TYPES}" STREQUAL "v")
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQAdvancedStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQAdvancedStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
            else()
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}${ARGC}, \"${TYPES}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}\"${TYPES}\");")
            endif()
        endforeach()
        if(MLEN)
@@ -501,8 +499,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
        foreach(METHOD IN LISTS METHODS)
            string(REPLACE ":" ";" METHOD "${METHOD}")
            list(GET METHOD 0 FUNCNAME)
-            list(GET METHOD 1 ARGC)
-            list(GET METHOD 2 TYPES)
+            list(GET METHOD 1 TYPES)
            string(LENGTH "${FUNCNAME}" LEN)
            math(EXPR LEN "${MLEN} - ${LEN}")
            if("${TYPES}" STREQUAL "v")
@@ -517,16 +514,16 @@ foreach(LINE IN LISTS SOURCE_LINES)
                string(APPEND SPACES " ")
            endforeach()
            if("${TYPES}" STREQUAL "v")
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQAdvancedMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQAdvancedMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
            else()
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}${ARGC}, \"${TYPES}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}\"${TYPES}\");")
            endif()
        endforeach()
        if(MLEN)
            string(APPEND SQUIRREL_EXPORT "\n")
        endif()

-        string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PostRegister(engine);")
+        string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.PostRegister(engine);")
        string(APPEND SQUIRREL_EXPORT "\n}")

        reset_reader()
@@ -539,9 +536,13 @@ foreach(LINE IN LISTS SOURCE_LINES)
        continue()
    endif()

+    if(NOT BRACE_LEVEL EQUAL CLS_LEVEL)
+        continue()
+    endif()
+
    # Add enums
    if(IN_ENUM)
-        string(REGEX MATCH "([^,	 ]+)" ENUM_VALUE "${LINE}")
+        string(REGEX MATCH "([^,\t ]+)" ENUM_VALUE "${LINE}")
        list(APPEND ENUM_VALUES "${ENUM_VALUE}")

        # Check if this a special error enum
@@ -549,12 +550,12 @@ foreach(LINE IN LISTS SOURCE_LINES)
        if("${ENUM}" MATCHES ".*::ErrorMessages")
            # syntax:
            # enum ErrorMessages {
-            #	ERR_SOME_ERROR,	// [STR_ITEM1, STR_ITEM2, ...]
+            #\tERR_SOME_ERROR,\t// [STR_ITEM1, STR_ITEM2, ...]
            # }

            # Set the mappings
            if("${LINE}" MATCHES "\\[(.*)\\]")
-                string(REGEX REPLACE "[ 	]" "" MAPPINGS "${CMAKE_MATCH_1}")
+                string(REGEX REPLACE "[ \t]" "" MAPPINGS "${CMAKE_MATCH_1}")
                string(REPLACE "," ";" MAPPINGS "${MAPPINGS}")

                foreach(MAPPING IN LISTS MAPPINGS)
@@ -568,11 +569,11 @@ foreach(LINE IN LISTS SOURCE_LINES)
    endif()

    # Add a const (non-enum) value
-    if("${LINE}" MATCHES "^[ 	]*static const [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
+    if("${LINE}" MATCHES "^[ \t]*static const [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
        list(APPEND CONST_VALUES "${CMAKE_MATCH_1}")
        continue()
    endif()
-    if("${LINE}" MATCHES "^[ 	]*static constexpr [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
+    if("${LINE}" MATCHES "^[ \t]*static constexpr [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
        list(APPEND CONST_VALUES "${CMAKE_MATCH_1}")
        continue()
    endif()
@@ -584,41 +585,43 @@ foreach(LINE IN LISTS SOURCE_LINES)
        endif()
        if("${LINE}" MATCHES "~")
            if(DEFINED API_SELECTED)
-                message(WARNING "Destructor for '${CLS}' has @api. Tag ignored.")
+                message(WARNING "${SCRIPT_API_FILE}:${NUM_LINE}: Destructor for '${CLS}' has @api. Tag ignored.")
                unset(API_SELECTED)
            endif()
            continue()
        endif()

        unset(IS_STATIC)
-        if("${LINE}" MATCHES "static")
+        if("${LINE}" MATCHES "static ")
            set(IS_STATIC TRUE)
        endif()

-        string(REGEX REPLACE "(virtual|static|const)[ 	]+" "" LINE "${LINE}")
+        string(REGEX REPLACE "(virtual|static|const)[ \t]+" "" LINE "${LINE}")
        string(REGEX REPLACE "{.*" "" LINE "${LINE}")
        set(PARAM_S "${LINE}")
        string(REGEX REPLACE "\\*" "" LINE "${LINE}")
        string(REGEX REPLACE "\\(.*" "" LINE "${LINE}")

-        string(REGEX REPLACE ".*\\(" "" PARAM_S "${PARAM_S}")
+        # Parameters start at first "(". Further "(" will appear in ctor lists.
+        string(REGEX MATCH "\\(.*" PARAM_S "${PARAM_S}")
        string(REGEX REPLACE "\\).*" "" PARAM_S "${PARAM_S}")
+        string(REGEX REPLACE "^\\(" "" PARAM_S "${PARAM_S}")

-        string(REGEX MATCH "([^ 	]+)( ([^ ]+))?" RESULT "${LINE}")
+        string(REGEX MATCH "([^ \t]+)( ([^ ]+))?" RESULT "${LINE}")
        set(FUNCTYPE "${CMAKE_MATCH_1}")
        set(FUNCNAME "${CMAKE_MATCH_3}")
        if("${FUNCTYPE}" STREQUAL "${CLS}" AND NOT FUNCNAME)
            if(DEFINED API_SELECTED)
-                message(WARNING "Constructor for '${CLS}' has @api. Tag ignored.")
+                message(WARNING "${SCRIPT_API_FILE}:${NUM_LINE}: Constructor for '${CLS}' has @api. Tag ignored.")
                unset(API_SELECTED)
            endif()
-            set(CLS_PARAM_0 "${PARAM_S}")
+            set(CLS_PARAMS "${PARAM_S}")
            if(NOT PARAM_S)
                continue()
            endif()
        elseif(NOT FUNCNAME)
            continue()
-		endif()
+        endif()

        string(REPLACE "," ";" PARAMS "${PARAM_S}")
        if(IS_STATIC)
@@ -627,9 +630,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
            set(TYPES "x")
        endif()

-        set(LEN 1)
        foreach(PARAM IN LISTS PARAMS)
-            math(EXPR LEN "${LEN} + 1")
            string(STRIP "${PARAM}" PARAM)
            if("${PARAM}" MATCHES "\\*|&")
                if("${PARAM}" MATCHES "^char")
@@ -668,13 +669,12 @@ foreach(LINE IN LISTS SOURCE_LINES)
        unset(API_SELECTED)

        if("${FUNCTYPE}" STREQUAL "${CLS}" AND NOT FUNCNAME)
-            set(CLS_PARAM_1 ${LEN})
-            set(CLS_PARAM_2 "${TYPES}")
+            set(CLS_TYPES "${TYPES}")
        elseif("${FUNCNAME}" MATCHES "^_" AND NOT "${TYPES}" STREQUAL "v")
        elseif(IS_STATIC)
-            list(APPEND STATIC_METHODS "${FUNCNAME}:${LEN}:${TYPES}")
+            list(APPEND STATIC_METHODS "${FUNCNAME}:${TYPES}")
        else()
-            list(APPEND METHODS "${FUNCNAME}:${LEN}:${TYPES}")
+            list(APPEND METHODS "${FUNCNAME}:${TYPES}")
        endif()
        continue()
    endif()
@@ -19,7 +19,7 @@ endif()
 file(READ "${API_FILES}" SCRIPT_API_BINARY_FILES)

 foreach(FILE IN LISTS SCRIPT_API_BINARY_FILES)
-    file(STRINGS "${FILE}" LINES REGEX "^void SQ${APIUC}.*_Register\\(Squirrel \\*engine\\)$")
+    file(STRINGS "${FILE}" LINES REGEX "^void SQ${APIUC}.*_Register\\(Squirrel &engine\\)$")
    if(LINES)
        string(REGEX REPLACE ".*api/${APILC}/(.*)" "#include \"\\1\"" FILE "${FILE}")
        list(APPEND SQUIRREL_INCLUDES "${FILE}")
@@ -28,7 +28,7 @@ foreach(FILE IN LISTS SCRIPT_API_BINARY_FILES)
                continue()
            endif()
            string(REGEX REPLACE "^.*void " "	" LINE "${LINE}")
-            string(REGEX REPLACE "Squirrel \\*" "" LINE "${LINE}")
+            string(REGEX REPLACE "Squirrel &" "" LINE "${LINE}")
            list(APPEND SQUIRREL_REGISTER "${LINE}")
        endforeach()
    endif()
@@ -246,7 +246,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits" rowspan=4><span class="free">OOOO OOOO OOOO OOOO</span></td>
      <td class="bits" rowspan=5><span class="free">OOOO OOO</span><span class="used" title="Non-flooding state">X</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="used" title="Water tile type: coast, clear, lock, depot">0000</span> <span class="free">OOO0</span></td>
+      <td class="bits"><span class="used" title="Water tile type: coast, clear, lock, depot">0000</span> <span class="free">OOOO</span></td>
      <td class="bits" rowspan=5><span class="free">OOOO OOOO</span></td>
      <td class="bits" rowspan=5><span class="free">OOOO OOOO</span></td>
      <td class="bits" rowspan=5><span class="free">OOOO OOOO OOOO OOOO</span></td>
@@ -16,8 +16,11 @@
 ; - `openttd -I <name>` starts OpenTTD with the given set (case sensitive)
 ; - adding `graphicsset = <name>` to the misc section of openttd.cfg makes
 ;   OpenTTD start with that graphics set by default
-; - there is a command line tool for all platforms called md5sum that can
-;   create the MD5 checksum you need.
+; - `grfid -m` can give the GRF file MD5 checksums that you need
+; - The `--md5` output option for `nmlc` can also give the MD5 if you are
+;   encoding from an nml source
+; - Simple file MD5 checksums, eg. using `md5sum` are not correct for grf
+;   container versions other than 1
 ; - all files specified in this file are search relatively to the path where
 ;   this file is found, i.e. if the graphics files are in a subdir you have
 ;   to add that subdir to the names in this file to! It will NOT search for
@@ -44,6 +47,8 @@ description.en_US = howdie
 palette      = DOS
 ; preferred blitter, optional; either 8bpp (default) or 32bpp.
 blitter      = 8bpp
+; url, optional
+url          = https://github.com/my/baseset

 ; The files section lists the files that replace sprites.
 ; The file names are case sensitive.
@@ -2,8 +2,8 @@

 ## Table of contents

- 1.0) About
- 2.0) Known bugs
+- 1.0) [About](#10-about)
+- 2.0) [Known bugs](#20-known-bugs)

 ## 1.0) About

@@ -12,7 +12,7 @@ that are the same as these. If you do, do not act surprised, because
 we WILL flame you!

 The current list of known bugs that we intend to fix can be found in our
-bug tracking system at https://github.com/OpenTTD/OpenTTD/issues
+bug tracking system at [https://github.com/OpenTTD/OpenTTD/issues](https://github.com/OpenTTD/OpenTTD/issues)
 Also check the closed bugs when searching for your bug in this system as we
 might have fixed the bug in the mean time.

@@ -1 +1 @@
-019dba4830a64ee4345d3d647633e1da
+c56aad31380c077d619e124bd87c8270
@@ -10,6 +10,7 @@ if(GRFCODEC_FOUND)
                         ${CMAKE_CURRENT_SOURCE_DIR}/airport_preview.nfo
                         ${CMAKE_CURRENT_SOURCE_DIR}/aqueduct.nfo
                         ${CMAKE_CURRENT_SOURCE_DIR}/autorail.nfo
+                         ${CMAKE_CURRENT_SOURCE_DIR}/bridge_decks.nfo
                         ${CMAKE_CURRENT_SOURCE_DIR}/canals.nfo
                         ${CMAKE_CURRENT_SOURCE_DIR}/chars.nfo
                         ${CMAKE_CURRENT_SOURCE_DIR}/elrails.nfo
@@ -31,6 +32,8 @@ if(GRFCODEC_FOUND)
                         ${CMAKE_CURRENT_SOURCE_DIR}/airport_preview.png
                         ${CMAKE_CURRENT_SOURCE_DIR}/aqueduct.png
                         ${CMAKE_CURRENT_SOURCE_DIR}/autorail.png
+                         ${CMAKE_CURRENT_SOURCE_DIR}/bridge_decks.png
+                         ${CMAKE_CURRENT_SOURCE_DIR}/bridge_decks_toyland.png
                         ${CMAKE_CURRENT_SOURCE_DIR}/canals.png
                         ${CMAKE_CURRENT_SOURCE_DIR}/canal_locks.png
                         ${CMAKE_CURRENT_SOURCE_DIR}/chars.png
@@ -0,0 +1,70 @@
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+//
+   -1 * 0	 0C "Bridge decks"
+   -1 * 0	 07 83 01 \7= 03 19
+   -1 * 3	 05 1B 18
+
+   -1 sprites/bridge_decks.png 8bpp   96  16  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp   16  16  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  176  16  64  39 -31   -8 normal
+   -1 sprites/bridge_decks.png 8bpp  256  16  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  336  16  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  416  16  64  39 -31   -8 normal
+
+   -1 sprites/bridge_decks.png 8bpp   96  71  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp   16  71  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  176  71  64  39 -31   -8 normal
+   -1 sprites/bridge_decks.png 8bpp  256  71  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  336  71  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  416  71  64  39 -31   -8 normal
+
+   -1 sprites/bridge_decks.png 8bpp   96 126  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp   16 126  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  176 126  64  39 -31   -8 normal
+   -1 sprites/bridge_decks.png 8bpp  256 126  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  336 126  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  416 126  64  39 -31   -8 normal
+
+// X and Y axis are swapped for road surface.
+   -1 sprites/bridge_decks.png 8bpp   16 181  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp   96 181  64  31 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  176 181  64  39 -31   -8 normal
+   -1 sprites/bridge_decks.png 8bpp  256 181  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  336 181  64  23 -31    0 normal
+   -1 sprites/bridge_decks.png 8bpp  416 181  64  39 -31   -8 normal
+
+// Toyland bridge decks, skip if not toyland.
+   -1 * 0	 07 83 01 \7! 03 19
+   -1 * 3	 05 1B 18
+
+   -1 sprites/bridge_decks_toyland.png 8bpp   96  16  64  31 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp   16  16  64  31 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  176  16  64  39 -31   -8 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  256  16  64  23 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  336  16  64  23 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  416  16  64  39 -31   -8 normal
+
+   -1 sprites/bridge_decks_toyland.png 8bpp   96  71  64  31 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp   16  71  64  31 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  176  71  64  39 -31   -8 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  256  71  64  23 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  336  71  64  23 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  416  71  64  39 -31   -8 normal
+
+   -1 sprites/bridge_decks_toyland.png 8bpp   96 126  64  31 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp   16 126  64  31 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  176 126  64  39 -31   -8 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  256 126  64  23 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  336 126  64  23 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  416 126  64  39 -31   -8 normal
+
+// X and Y axis are swapped for road surface.
+   -1 sprites/bridge_decks_toyland.png 8bpp   16 181  64  31 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp   96 181  64  31 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  176 181  64  39 -31   -8 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  256 181  64  23 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  336 181  64  23 -31    0 normal
+   -1 sprites/bridge_decks_toyland.png 8bpp  416 181  64  39 -31   -8 normal
@@ -671,9 +671,9 @@

 // U+2026: Horizontal Ellipsis
   -1 * 18	 12 04 00 01 26 20 01 01 26 20 02 01 26 20 03 01 26 20
-   -1 sprites/chars.png 8bpp 560  370  11  12   0  -1 normal
+   -1 sprites/chars.png 8bpp 560  370   9  12   0  -1 normal
   -1 sprites/chars.png 8bpp 560  390   5   7   0   0 normal
-   -1 sprites/chars.png 8bpp 560  400  15  21   0  -2 normal
+   -1 sprites/chars.png 8bpp 560  400  14  21   0  -2 normal
   -1 sprites/mono.png 8bpp 265  270   7  13   0   0 normal

 // U+2039: Single Left-Pointing Angle Quotation Mark
@@ -840,3 +840,13 @@
   -1 sprites/chars.png 8bpp 630  400   6  21   0  -2 normal
   -1 sprites/mono.png 8bpp 325  270   7  13   0   0 normal
   -1 sprites/mono.png 8bpp 340  270   7  13   0   0 normal
+
+// U+E29D: Small left arrow
+   -1 * 6   12 01 01 01 9D E2
+   -1 sprites/chars.png 8bpp  10  430   5  5   0   1 normal
+
+// U+E29B: Town
+// U+E29C: City
+   -1 * 6   12 01 00 02 9B E2
+   -1 sprites/chars.png 8bpp  20  430  10 10   0   0 normal
+   -1 sprites/chars.png 8bpp  40  430  10 10   0   0 normal
@@ -100,3 +100,4 @@
 #include "palette.nfo"
 #include "road_waypoints.nfo"
 #include "overlay_rocks.nfo"
+#include "bridge_decks.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 192 // 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
@@ -196,3 +196,4 @@
   -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
+   -1 sprites/openttdgui.png 8bpp 605  440   8  10   0   0 normal
@@ -24,7 +24,7 @@ if (!$Env:AZURE_CODESIGN_ENDPOINT -or !$Env:AZURE_CODESIGN_ACCOUNT_NAME -or !$En
 	exit
 }

-Install-Module -Name AzureCodeSigning -Scope CurrentUser -RequiredVersion 0.3.0 -Force -Repository PSGallery
+Install-Module -Name TrustedSigning -Scope CurrentUser -RequiredVersion 0.5.3 -Force -Repository PSGallery

 $params = @{}

@@ -37,4 +37,4 @@ $params["FileDigest"] = "SHA256"
 $params["TimestampRfc3161"] = "http://timestamp.acs.microsoft.com"
 $params["TimestampDigest"] = "SHA256"

-Invoke-AzureCodeSigning @params
+Invoke-TrustedSigning @params
@@ -17,6 +17,10 @@ function Regression::TestInit()
 	print(" IsValid(vehicle.plane_speed): " + AIGameSettings.IsValid("vehicle.plane_speed"));
 	print(" vehicle.plane_speed: " + AIGameSettings.GetValue("vehicle.plane_speed"));
 	require("require.nut");
+	print(" TestEnum.value1: " + ::TestEnum.value1);
+	print(" test_constant: " + ::test_constant);
+	print(" TestEnum.value2: " + TestEnum.value2);
+	print(" test_constant: " + test_constant);
 	print(" min(6, 3): " + min(6, 3));
 	print(" min(3, 6): " + min(3, 6));
 	print(" max(6, 3): " + max(6, 3));
@@ -457,6 +461,21 @@ function Regression::Company()
 	}
 }

+function Regression::CompanyGender()
+{
+	print("");
+	print("--Company Gender--");
+	/* Check gender switching behaviour matches API. */
+	print("  GetPresidentGender():              " + AICompany.GetPresidentGender(AICompany.COMPANY_SELF));
+	print("  SetPresidentGender():              " + AICompany.SetPresidentGender(AICompany.GENDER_MALE));
+	print("  GetPresidentGender():              " + AICompany.GetPresidentGender(AICompany.COMPANY_SELF));
+	print("  SetPresidentGender():              " + AICompany.SetPresidentGender(AICompany.GENDER_FEMALE));
+	print("  GetPresidentGender():              " + AICompany.GetPresidentGender(AICompany.COMPANY_SELF));
+	/* Setting to existing gender should fail. */
+	print("  SetPresidentGender():              " + AICompany.SetPresidentGender(AICompany.GENDER_FEMALE));
+	print("  GetPresidentGender():              " + AICompany.GetPresidentGender(AICompany.COMPANY_SELF));
+}
+
 function Regression::Engine()
 {
 	local j = 0;
@@ -483,6 +502,13 @@ function Regression::Engine()
 		print("    GetRailType():      " + AIEngine.GetRailType(i));
 		print("    GetRoadType():      " + AIEngine.GetRoadType(i));
 		print("    GetPlaneType():     " + AIEngine.GetPlaneType(i));
+		local railtypes = AIEngine.GetAllRailTypes(i);
+		print("    GetAllRailTypes():  " + (railtypes == null ? "null" : "instance"));
+		if (railtypes != null) {
+			foreach(t in railtypes) {
+				print("      " + t);
+			}
+		}
 	}
 	print("  Valid Engines:        " + j);
 }
@@ -824,6 +850,13 @@ function Regression::List()
 	print("  []:");
 	print("    4000 => " + list[4000]);

+	print("  clone:");
+	local list3 = clone list;
+	print("  Clone ListDump:");
+	foreach (idx, val in list3) {
+		print("    " + idx + " => " + val);
+	}
+
 	list.Clear();
 	print("  IsEmpty():     " + list.IsEmpty());

@@ -856,6 +889,12 @@ function Regression::List()
 		it = list.Next();
 		print("    " + it + " => " + list.GetValue(it));
 	}
+
+	print("  Clone ListDump:");
+	foreach (idx, val in list3) {
+		print("    " + idx + " => " + val);
+	}
+
 }

 function Regression::Map()
@@ -1017,6 +1056,28 @@ function Regression::Order()
 	foreach (idx, val in list) {
 		print("    " + idx + " => " + val);
 	}
+	list = AIVehicleList_Station(3, AIVehicle.VT_ROAD);
+	print("  Count():             " + list.Count());
+	list.Valuate(AIVehicle.GetLocation);
+	print("  Location ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	print("  foreach():");
+	foreach (idx, val in list) {
+		print("    " + idx + " => " + val);
+	}
+	list = AIVehicleList_Station(3, AIVehicle.VT_RAIL);
+	print("  Count():             " + list.Count());
+	list.Valuate(AIVehicle.GetLocation);
+	print("  Location ListDump:");
+	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
+		print("    " + i + " => " + list.GetValue(i));
+	}
+	print("  foreach():");
+	foreach (idx, val in list) {
+		print("    " + idx + " => " + val);
+	}
 }

 function Regression::RailTypeList()
@@ -1675,13 +1736,22 @@ function Regression::TownList()
 	}

 	print("  HasStatue():                     " + AITown.HasStatue(list.Begin()));
-	print("  GetRoadReworkDuration():         " + AITown.GetRoadReworkDuration(list.Begin()));
-	print("  GetExclusiveRightsCompany():     " + AITown.GetExclusiveRightsCompany(list.Begin()));
-	print("  GetExclusiveRightsDuration():    " + AITown.GetExclusiveRightsDuration(list.Begin()));
 	print("  IsActionAvailable(BUILD_STATUE): " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_BUILD_STATUE));
 	print("  PerformTownAction(BUILD_STATUE): " + AITown.PerformTownAction(list.Begin(), AITown.TOWN_ACTION_BUILD_STATUE));
 	print("  IsActionAvailable(BUILD_STATUE): " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_BUILD_STATUE));
 	print("  HasStatue():                     " + AITown.HasStatue(list.Begin()));
+	print("  GetRoadReworkDuration():         " + AITown.GetRoadReworkDuration(list.Begin()));
+	print("  IsActionAvailable(ROAD_REBUILD): " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_ROAD_REBUILD));
+	print("  PerformTownAction(ROAD_REBUILD): " + AITown.PerformTownAction(list.Begin(), AITown.TOWN_ACTION_ROAD_REBUILD));
+	print("  IsActionAvailable(ROAD_REBUILD): " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_ROAD_REBUILD));
+	print("  GetRoadReworkDuration():         " + AITown.GetRoadReworkDuration(list.Begin()));
+	print("  GetExclusiveRightsCompany():     " + AITown.GetExclusiveRightsCompany(list.Begin()));
+	print("  GetExclusiveRightsDuration():    " + AITown.GetExclusiveRightsDuration(list.Begin()));
+	print("  IsActionAvailable(BUY_RIGHTS):   " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_BUY_RIGHTS));
+	print("  PerformTownAction(BUY_RIGHTS):   " + AITown.PerformTownAction(list.Begin(), AITown.TOWN_ACTION_BUY_RIGHTS));
+	print("  IsActionAvailable(BUY_RIGHTS):   " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_BUY_RIGHTS));
+	print("  GetExclusiveRightsCompany():     " + AITown.GetExclusiveRightsCompany(list.Begin()));
+	print("  GetExclusiveRightsDuration():    " + AITown.GetExclusiveRightsDuration(list.Begin()));
 }

 function Regression::Tunnel()
@@ -1975,6 +2045,33 @@ function Regression::Math()
 	print("   13725      > -2147483648:   " + ( 13725      > -2147483648));
 }

+function Regression::PriorityQueue()
+{
+	print("");
+	print("--PriorityQueue--");
+	local queue = AIPriorityQueue();
+	print("  IsEmpty():    " + queue.IsEmpty());
+	print("  Count():      " + queue.Count());
+	print("  --Insert--")
+	for (local i = 0; i < 10; i++) {
+		print("    Insert(" + i + ", " + i + "): " + queue.Insert(i, i));
+	}
+	print("  Exists(5):    " + queue.Exists(5));
+	print("  Insert(5, 5): "+ queue.Insert(5, 5));
+	print("  IsEmpty():    " + queue.IsEmpty());
+	print("  Count():      " + queue.Count());
+	local item = queue.Peek();
+	print("  Peek():       " + item);
+	print("  Count():      " + queue.Count());
+	local item2 = queue.Pop();
+	print("  Pop():        " + item2);
+	print("  Count():      " + queue.Count());
+	print("  " + item + " == " + item2 + " :      " + (item == item2));
+	print("  Clear():      " + queue.Clear());
+	print("  IsEmpty():    " + queue.IsEmpty());
+	print("  Count():      " + queue.Count());
+}
+
 function Regression::Start()
 {
 	this.TestInit();
@@ -2014,6 +2111,7 @@ function Regression::Start()
 	this.Vehicle();
 	/* Order has to be after Vehicle */
 	this.Order();
+	this.CompanyGender();
 	print("");
 	print("  First Subsidy Test");
 	PrintSubsidy(0);
@@ -2049,6 +2147,20 @@ function Regression::Start()
 				print("      PresidentName:     " + c.GetNewName());
 			} break;

+			case AIEvent.ET_EXCLUSIVE_TRANSPORT_RIGHTS: {
+				local c = AIEventExclusiveTransportRights.Convert(e);
+				print("      EventName:         ExclusiveTransportRights");
+				print("      CompanyID:         " + c.GetCompanyID());
+				print("      TownID:            " + c.GetTownID());
+			} break;
+
+			case AIEvent.ET_ROAD_RECONSTRUCTION: {
+				local c = AIEventRoadReconstruction.Convert(e);
+				print("      EventName:         RoadReconstruction");
+				print("      CompanyID:         " + c.GetCompanyID());
+				print("      TownID:            " + c.GetTownID());
+			} break;
+
 			default:
 				print("      Unknown Event");
 				break;
@@ -2057,12 +2169,18 @@ function Regression::Start()
 	print("  IsEventWaiting:        false");

 	this.Math();
+	this.PriorityQueue();

 	/* Check Valuate() is actually limited, MUST BE THE LAST TEST. */
 	print("--Valuate() with excessive CPU usage--")
 	local list = AIList();
 	list.AddItem(0, 0);
 	local Infinite = function(id) { while(true); }
+	try {
+		list = AIIndustryList(Infinite);
+	} catch (e) {
+		print("constructor failed with: " + e);
+	}
 	list.Valuate(Infinite);
 }

@@ -1,2 +1,9 @@
 print("  Required this file");

+const test_constant = 1;
+
+enum TestEnum {
+	value0,
+	value1,
+	value2
+};
@@ -19,6 +19,7 @@
 #include <unicode/utypes.h>
 #include <unicode/uobject.h>
 #include <unicode/uscript.h>
+#include <array>

 U_NAMESPACE_BEGIN

@@ -281,7 +281,7 @@ void Md5::Append(const void *data, const size_t nbytes)
 	if (offset) {
 		size_t copy = (offset + nbytes > 64 ? 64 - offset : nbytes);

-		memcpy(this->buf + offset, p, copy);
+		std::copy_n(p, copy, this->buf + offset);

 		if (offset + copy < 64) return;

@@ -294,7 +294,7 @@ void Md5::Append(const void *data, const size_t nbytes)
 	for (; left >= 64; p += 64, left -= 64) this->Process(p);

 	/* Process a final partial block. */
-	if (left) memcpy(this->buf, p, left);
+	if (left) std::copy_n(p, left, this->buf);
 }

 void Md5::Finish(MD5Hash &digest)
@@ -1,6 +1,5 @@
 add_files(
    sqstdaux.h
    sqstdmath.h
-    sqstdstring.h
    squirrel.h
 )
@@ -1,23 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQSTD_STRING_H_
-#define _SQSTD_STRING_H_
-
-typedef unsigned int SQRexBool;
-typedef struct SQRex SQRex;
-
-typedef struct {
-	const SQChar *begin;
-	SQInteger len;
-} SQRexMatch;
-
-SQRex *sqstd_rex_compile(const SQChar *pattern,const SQChar **error);
-void sqstd_rex_free(SQRex *exp);
-SQBool sqstd_rex_match(SQRex* exp,const SQChar* text);
-SQBool sqstd_rex_search(SQRex* exp,const SQChar* text, const SQChar** out_begin, const SQChar** out_end);
-SQBool sqstd_rex_searchrange(SQRex* exp,const SQChar* text_begin,const SQChar* text_end,const SQChar** out_begin, const SQChar** out_end);
-SQInteger sqstd_rex_getsubexpcount(SQRex* exp);
-SQBool sqstd_rex_getsubexp(SQRex* exp, SQInteger n, SQRexMatch *subexp);
-
-SQRESULT sqstd_register_stringlib(HSQUIRRELVM v);
-
-#endif /*_SQSTD_STRING_H_*/
@@ -68,7 +68,6 @@ struct SQClass;
 struct SQInstance;
 struct SQDelegable;

-typedef char SQChar;
 #define MAX_CHAR 0xFFFF

 #define SQUIRREL_VERSION	"Squirrel 2.2.5 stable - With custom OpenTTD modifications"
@@ -164,17 +163,17 @@ typedef struct tagSQObject
 }SQObject;

 typedef struct tagSQStackInfos{
-	const SQChar* funcname;
-	const SQChar* source;
-	SQInteger line;
+	std::string_view funcname;
+	std::string_view source;
+	SQInteger line = -1;
 }SQStackInfos;

 typedef struct SQVM* HSQUIRRELVM;
 typedef SQObject HSQOBJECT;
 typedef SQInteger (*SQFUNCTION)(HSQUIRRELVM);
 typedef SQInteger (*SQRELEASEHOOK)(SQUserPointer,SQInteger size);
-typedef void (*SQCOMPILERERROR)(HSQUIRRELVM,const SQChar * /*desc*/,const SQChar * /*source*/,SQInteger /*line*/,SQInteger /*column*/);
-typedef void (*SQPRINTFUNCTION)(HSQUIRRELVM,const std::string &);
+typedef void (*SQCOMPILERERROR)(HSQUIRRELVM,std::string_view /*desc*/,std::string_view /*source*/,SQInteger /*line*/,SQInteger /*column*/);
+typedef void (*SQPRINTFUNCTION)(HSQUIRRELVM,std::string_view);

 typedef SQInteger (*SQWRITEFUNC)(SQUserPointer,SQUserPointer,SQInteger);
 typedef SQInteger (*SQREADFUNC)(SQUserPointer,SQUserPointer,SQInteger);
@@ -182,16 +181,16 @@ typedef SQInteger (*SQREADFUNC)(SQUserPointer,SQUserPointer,SQInteger);
 typedef char32_t (*SQLEXREADFUNC)(SQUserPointer);

 typedef struct tagSQRegFunction{
-	const SQChar *name;
+	std::string_view name;
 	SQFUNCTION f;
 	SQInteger nparamscheck;
-	const SQChar *typemask;
+	std::optional<std::string_view> typemask;
 }SQRegFunction;

 typedef struct tagSQFunctionInfo {
 	SQUserPointer funcid;
-	const SQChar *name;
-	const SQChar *source;
+	std::string_view name;
+	std::string_view source;
 }SQFunctionInfo;


@@ -213,8 +212,8 @@ SQInteger sq_getvmstate(HSQUIRRELVM v);
 void sq_decreaseops(HSQUIRRELVM v, int amount);

 /*compiler*/
-SQRESULT sq_compile(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,const SQChar *sourcename,SQBool raiseerror);
-SQRESULT sq_compilebuffer(HSQUIRRELVM v,const SQChar *s,SQInteger size,const SQChar *sourcename,SQBool raiseerror);
+SQRESULT sq_compile(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,std::string_view sourcename,SQBool raiseerror);
+SQRESULT sq_compilebuffer(HSQUIRRELVM v,std::string_view buffer,std::string_view sourcename,SQBool raiseerror);
 void sq_enabledebuginfo(HSQUIRRELVM v, SQBool enable);
 void sq_notifyallexceptions(HSQUIRRELVM v, SQBool enable);
 void sq_setcompilererrorhandler(HSQUIRRELVM v,SQCOMPILERERROR f);
@@ -235,10 +234,9 @@ SQUserPointer sq_newuserdata(HSQUIRRELVM v,SQUnsignedInteger size);
 void sq_newtable(HSQUIRRELVM v);
 void sq_newarray(HSQUIRRELVM v,SQInteger size);
 void sq_newclosure(HSQUIRRELVM v,SQFUNCTION func,SQUnsignedInteger nfreevars);
-SQRESULT sq_setparamscheck(HSQUIRRELVM v,SQInteger nparamscheck,const SQChar *typemask);
+SQRESULT sq_setparamscheck(HSQUIRRELVM v,SQInteger nparamscheck,std::optional<std::string_view> typemask);
 SQRESULT sq_bindenv(HSQUIRRELVM v,SQInteger idx);
-void sq_pushstring(HSQUIRRELVM v,const SQChar *s,SQInteger len);
-inline void sq_pushstring(HSQUIRRELVM v, const std::string &str, SQInteger len = -1) { sq_pushstring(v, str.data(), len == -1 ? str.size() : len); }
+void sq_pushstring(HSQUIRRELVM v, std::string_view str);
 void sq_pushfloat(HSQUIRRELVM v,SQFloat f);
 void sq_pushinteger(HSQUIRRELVM v,SQInteger n);
 void sq_pushbool(HSQUIRRELVM v,SQBool b);
@@ -250,7 +248,7 @@ SQRESULT sq_getbase(HSQUIRRELVM v,SQInteger idx);
 SQBool sq_instanceof(HSQUIRRELVM v);
 void sq_tostring(HSQUIRRELVM v,SQInteger idx);
 void sq_tobool(HSQUIRRELVM v, SQInteger idx, SQBool *b);
-SQRESULT sq_getstring(HSQUIRRELVM v,SQInteger idx,const SQChar **c);
+SQRESULT sq_getstring(HSQUIRRELVM v,SQInteger idx,std::string_view &str);
 SQRESULT sq_getinteger(HSQUIRRELVM v,SQInteger idx,SQInteger *i);
 SQRESULT sq_getfloat(HSQUIRRELVM v,SQInteger idx,SQFloat *f);
 SQRESULT sq_getbool(HSQUIRRELVM v,SQInteger idx,SQBool *b);
@@ -260,10 +258,10 @@ SQRESULT sq_getuserdata(HSQUIRRELVM v,SQInteger idx,SQUserPointer *p,SQUserPoint
 SQRESULT sq_settypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer typetag);
 SQRESULT sq_gettypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer *typetag);
 void sq_setreleasehook(HSQUIRRELVM v,SQInteger idx,SQRELEASEHOOK hook);
-SQChar *sq_getscratchpad(HSQUIRRELVM v,SQInteger minsize);
+std::span<char> sq_getscratchpad(HSQUIRRELVM v,SQInteger minsize);
 SQRESULT sq_getfunctioninfo(HSQUIRRELVM v,SQInteger idx,SQFunctionInfo *fi);
 SQRESULT sq_getclosureinfo(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparams,SQUnsignedInteger *nfreevars);
-SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,SQInteger idx,const SQChar *name);
+SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,SQInteger idx,std::string_view name);
 SQRESULT sq_setinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer p);
 SQRESULT sq_getinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserPointer typetag);
 SQRESULT sq_setclassudsize(HSQUIRRELVM v, SQInteger idx, SQInteger udsize);
@@ -305,10 +303,9 @@ SQRESULT sq_clear(HSQUIRRELVM v,SQInteger idx);
 /*calls*/
 SQRESULT sq_call(HSQUIRRELVM v,SQInteger params,SQBool retval,SQBool raiseerror, int suspend = -1);
 SQRESULT sq_resume(HSQUIRRELVM v,SQBool retval,SQBool raiseerror);
-const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx);
-const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval);
-SQRESULT sq_throwerror(HSQUIRRELVM v,const SQChar *err, SQInteger len = -1);
-inline SQRESULT sq_throwerror(HSQUIRRELVM v, const std::string_view err) { return sq_throwerror(v, err.data(), err.size()); }
+std::optional<std::string_view> sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx);
+std::optional<std::string_view> sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval);
+SQRESULT sq_throwerror(HSQUIRRELVM v,std::string_view err);
 void sq_reseterror(HSQUIRRELVM v);
 void sq_getlasterror(HSQUIRRELVM v);

@@ -318,7 +315,7 @@ void sq_pushobject(HSQUIRRELVM v,HSQOBJECT obj);
 void sq_addref(HSQUIRRELVM v,HSQOBJECT *po);
 SQBool sq_release(HSQUIRRELVM v,HSQOBJECT *po);
 void sq_resetobject(HSQOBJECT *po);
-const SQChar *sq_objtostring(HSQOBJECT *o);
+std::optional<std::string_view> sq_objtostring(HSQOBJECT *o);
 SQBool sq_objtobool(HSQOBJECT *o);
 SQInteger sq_objtointeger(HSQOBJECT *o);
 SQFloat sq_objtofloat(HSQOBJECT *o);
@@ -363,7 +360,7 @@ void sq_setdebughook(HSQUIRRELVM v);

 /* Limit the total number of ops that can be consumed by an operation */
 struct SQOpsLimiter {
-	SQOpsLimiter(HSQUIRRELVM v, SQInteger ops, const char *label);
+	SQOpsLimiter(HSQUIRRELVM v, SQInteger ops, std::string_view label);
 	~SQOpsLimiter();
 private:
 	HSQUIRRELVM _v;
@@ -16,39 +16,36 @@ void sqstd_printcallstack(HSQUIRRELVM v)
 		SQInteger i;
 		SQBool b;
 		SQFloat f;
-		const SQChar *s;
 		SQInteger level=1; //1 is to skip this function that is level 0
-		const SQChar *name=nullptr;
 		SQInteger seq=0;
-		pf(v,"\nCALLSTACK\n");
+		pf(v,"\n");
+		pf(v,"CALLSTACK\n");
 		while(SQ_SUCCEEDED(sq_stackinfos(v,level,&si)))
 		{
-			const SQChar *fn="unknown";
-			const SQChar *src="unknown";
-			if(si.funcname)fn=si.funcname;
-			if(si.source) {
+			std::string_view fn="unknown";
+			std::string_view src="unknown";
+			if(!si.funcname.empty())fn=si.funcname;
+			if(!si.source.empty()) {
 				/* We don't want to bother users with absolute paths to all AI files.
 				 * Since the path only reaches NoAI code in a formatted string we have
 				 * to strip it here. Let's hope nobody installs openttd in a subdirectory
 				 * of a directory named /ai/. */
-				src = strstr(si.source, "\\ai\\");
-				if (!src) src = strstr(si.source, "/ai/");
-				if (src) {
-					src += 4;
-				} else {
-					src = si.source;
-				}
+				auto p = si.source.find("\\ai\\");
+				if (p == std::string_view::npos) p = si.source.find("/ai/");
+				src = (p == std::string_view::npos) ? si.source : si.source.substr(p + 4);
 			}
 			pf(v,fmt::format("*FUNCTION [{}()] {} line [{}]\n",fn,src,si.line));
 			level++;
 		}
 		level=0;
-		pf(v,"\nLOCALS\n");
+		pf(v,"\n");
+		pf(v,"LOCALS\n");

 		for(level=0;level<10;level++){
 			seq=0;
-			while((name = sq_getlocal(v,level,seq)))
-			{
+			std::optional<std::string_view> opt;
+			while ((opt = sq_getlocal(v,level,seq)).has_value()) {
+				std::string_view name = *opt;
 				seq++;
 				switch(sq_gettype(v,-1))
 				{
@@ -66,10 +63,12 @@ void sqstd_printcallstack(HSQUIRRELVM v)
 				case OT_USERPOINTER:
 					pf(v,fmt::format("[{}] USERPOINTER\n",name));
 					break;
-				case OT_STRING:
-					sq_getstring(v,-1,&s);
-					pf(v,fmt::format("[{}] \"{}\"\n",name,s));
+				case OT_STRING: {
+					std::string_view view;
+					sq_getstring(v,-1,view);
+					pf(v,fmt::format("[{}] \"{}\"\n",name,view));
 					break;
+				}
 				case OT_TABLE:
 					pf(v,fmt::format("[{}] TABLE\n",name));
 					break;
@@ -117,13 +116,14 @@ static SQInteger _sqstd_aux_printerror(HSQUIRRELVM v)
 {
 	SQPRINTFUNCTION pf = sq_getprintfunc(v);
 	if(pf) {
-		const SQChar *sErr = nullptr;
+		std::string_view error;
 		if(sq_gettop(v)>=1) {
-			if(SQ_SUCCEEDED(sq_getstring(v,2,&sErr)))	{
-				pf(v,fmt::format("\nAN ERROR HAS OCCURRED [{}]\n",sErr));
+			pf(v,"\n");
+			if(SQ_SUCCEEDED(sq_getstring(v,2,error))) {
+				pf(v,fmt::format("AN ERROR HAS OCCURRED [{}]\n",error));
 			}
 			else{
-				pf(v,"\nAN ERROR HAS OCCURRED [unknown]\n");
+				pf(v,"AN ERROR HAS OCCURRED [unknown]\n");
 			}
 			sqstd_printcallstack(v);
 		}
@@ -131,7 +131,7 @@ static SQInteger _sqstd_aux_printerror(HSQUIRRELVM v)
 	return 0;
 }

-void _sqstd_compiler_error(HSQUIRRELVM v,const SQChar *sErr,const SQChar *sSource,SQInteger line,SQInteger column)
+void _sqstd_compiler_error(HSQUIRRELVM v,std::string_view sErr,std::string_view sSource,SQInteger line,SQInteger column)
 {
 	SQPRINTFUNCTION pf = sq_getprintfunc(v);
 	if(pf) {
@@ -67,7 +67,7 @@ SINGLE_ARG_FUNC(ceil, 1)
 SINGLE_ARG_FUNC(exp, 100)

 #define _DECL_FUNC(name,nparams,tycheck) {#name,math_##name,nparams,tycheck}
-static SQRegFunction mathlib_funcs[] = {
+static const std::initializer_list<SQRegFunction> mathlib_funcs = {
 	_DECL_FUNC(sqrt,2,".n"),
 	_DECL_FUNC(sin,2,".n"),
 	_DECL_FUNC(cos,2,".n"),
@@ -84,11 +84,10 @@ static SQRegFunction mathlib_funcs[] = {
 	_DECL_FUNC(exp,2,".n"),
 #ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
 	_DECL_FUNC(srand,2,".n"),
-	_DECL_FUNC(rand,1,nullptr),
+	_DECL_FUNC(rand,1,std::nullopt),
 #endif /* EXPORT_DEFAULT_SQUIRREL_FUNCTIONS */
 	_DECL_FUNC(fabs,2,".n"),
 	_DECL_FUNC(abs,2,".n"),
-	{nullptr,nullptr,0,nullptr},
 };

 #ifndef M_PI
@@ -97,21 +96,19 @@ static SQRegFunction mathlib_funcs[] = {

 SQRESULT sqstd_register_mathlib(HSQUIRRELVM v)
 {
-	SQInteger i=0;
-	while(mathlib_funcs[i].name!=nullptr)	{
-		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);
-		sq_setnativeclosurename(v,-1,mathlib_funcs[i].name);
+	for(auto &func : mathlib_funcs) {
+		sq_pushstring(v,func.name);
+		sq_newclosure(v,func.f,0);
+		sq_setparamscheck(v,func.nparamscheck,func.typemask);
+		sq_setnativeclosurename(v,-1,func.name);
 		sq_createslot(v,-3);
-		i++;
 	}
 #ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
-	sq_pushstring(v,"RAND_MAX",-1);
+	sq_pushstring(v,"RAND_MAX");
 	sq_pushinteger(v,RAND_MAX);
 	sq_createslot(v,-3);
 #endif /* EXPORT_DEFAULT_SQUIRREL_FUNCTIONS */
-	sq_pushstring(v,"PI",-1);
+	sq_pushstring(v,"PI");
 	sq_pushfloat(v,(SQFloat)M_PI);
 	sq_createslot(v,-3);
 	return SQ_OK;
@@ -1,632 +0,0 @@
-/* see copyright notice in squirrel.h */
-#include <squirrel.h>
-#include <exception>
-#include "sqstdstring.h"
-
-#ifdef _UNICODE
-#define scisprint iswprint
-#else
-#define scisprint isprint
-#endif
-
-#ifdef _DEBUG
-
-static const SQChar *g_nnames[] =
-{
-	"NONE","OP_GREEDY",	"OP_OR",
-	"OP_EXPR","OP_NOCAPEXPR","OP_DOT",	"OP_CLASS",
-	"OP_CCLASS","OP_NCLASS","OP_RANGE","OP_CHAR",
-	"OP_EOL","OP_BOL","OP_WB"
-};
-
-#endif
-
-#define OP_GREEDY		(MAX_CHAR+1) // * + ? {n}
-#define OP_OR			(MAX_CHAR+2)
-#define OP_EXPR			(MAX_CHAR+3) //parentesis ()
-#define OP_NOCAPEXPR	(MAX_CHAR+4) //parentesis (?:)
-#define OP_DOT			(MAX_CHAR+5)
-#define OP_CLASS		(MAX_CHAR+6)
-#define OP_CCLASS		(MAX_CHAR+7)
-#define OP_NCLASS		(MAX_CHAR+8) //negates class the [^
-#define OP_RANGE		(MAX_CHAR+9)
-#define OP_CHAR			(MAX_CHAR+10)
-#define OP_EOL			(MAX_CHAR+11)
-#define OP_BOL			(MAX_CHAR+12)
-#define OP_WB			(MAX_CHAR+13)
-
-#define SQREX_SYMBOL_ANY_CHAR ('.')
-#define SQREX_SYMBOL_GREEDY_ONE_OR_MORE ('+')
-#define SQREX_SYMBOL_GREEDY_ZERO_OR_MORE ('*')
-#define SQREX_SYMBOL_GREEDY_ZERO_OR_ONE ('?')
-#define SQREX_SYMBOL_BRANCH ('|')
-#define SQREX_SYMBOL_END_OF_STRING ('$')
-#define SQREX_SYMBOL_BEGINNING_OF_STRING ('^')
-#define SQREX_SYMBOL_ESCAPE_CHAR ('\\')
-
-
-typedef int SQRexNodeType;
-
-typedef struct tagSQRexNode{
-	SQRexNodeType type;
-	SQInteger left;
-	SQInteger right;
-	SQInteger next;
-}SQRexNode;
-
-struct SQRex{
-	const SQChar *_eol;
-	const SQChar *_bol;
-	const SQChar *_p;
-	SQInteger _first;
-	SQInteger _op;
-	SQRexNode *_nodes;
-	SQInteger _nallocated;
-	SQInteger _nsize;
-	SQInteger _nsubexpr;
-	SQRexMatch *_matches;
-	SQInteger _currsubexp;
-	const SQChar **_error;
-};
-
-static SQInteger sqstd_rex_list(SQRex *exp);
-
-static SQInteger sqstd_rex_newnode(SQRex *exp, SQRexNodeType type)
-{
-	SQRexNode n;
-	n.type = type;
-	n.next = n.right = n.left = -1;
-	if(type == OP_EXPR)
-		n.right = exp->_nsubexpr++;
-	if(exp->_nallocated < (exp->_nsize + 1)) {
-		SQInteger oldsize = exp->_nallocated;
-		exp->_nallocated *= 2;
-		exp->_nodes = (SQRexNode *)sq_realloc(exp->_nodes, oldsize * sizeof(SQRexNode) ,exp->_nallocated * sizeof(SQRexNode));
-	}
-	exp->_nodes[exp->_nsize++] = n;
-	SQInteger newid = exp->_nsize - 1;
-	return (SQInteger)newid;
-}
-
-static void sqstd_rex_error(SQRex *exp,const SQChar *error)
-{
-	if(exp->_error) *exp->_error = error;
-	throw std::exception();
-}
-
-static void sqstd_rex_expect(SQRex *exp, SQChar n){
-	if((*exp->_p) != n)
-		sqstd_rex_error(exp, "expected paren");
-	exp->_p++;
-}
-
-static SQChar sqstd_rex_escapechar(SQRex *exp)
-{
-	if(*exp->_p == SQREX_SYMBOL_ESCAPE_CHAR){
-		exp->_p++;
-		switch(*exp->_p) {
-		case 'v': exp->_p++; return '\v';
-		case 'n': exp->_p++; return '\n';
-		case 't': exp->_p++; return '\t';
-		case 'r': exp->_p++; return '\r';
-		case 'f': exp->_p++; return '\f';
-		default: return (*exp->_p++);
-		}
-	} else if(!scisprint(*exp->_p)) sqstd_rex_error(exp,"letter expected");
-	return (*exp->_p++);
-}
-
-static SQInteger sqstd_rex_charclass(SQRex *exp,SQInteger classid)
-{
-	SQInteger n = sqstd_rex_newnode(exp,OP_CCLASS);
-	exp->_nodes[n].left = classid;
-	return n;
-}
-
-static SQInteger sqstd_rex_charnode(SQRex *exp,SQBool isclass)
-{
-	SQChar t;
-	if(*exp->_p == SQREX_SYMBOL_ESCAPE_CHAR) {
-		exp->_p++;
-		switch(*exp->_p) {
-			case 'n': exp->_p++; return sqstd_rex_newnode(exp,'\n');
-			case 't': exp->_p++; return sqstd_rex_newnode(exp,'\t');
-			case 'r': exp->_p++; return sqstd_rex_newnode(exp,'\r');
-			case 'f': exp->_p++; return sqstd_rex_newnode(exp,'\f');
-			case 'v': exp->_p++; return sqstd_rex_newnode(exp,'\v');
-			case 'a': case 'A': case 'w': case 'W': case 's': case 'S':
-			case 'd': case 'D': case 'x': case 'X': case 'c': case 'C':
-			case 'p': case 'P': case 'l': case 'u':
-				{
-				t = *exp->_p; exp->_p++;
-				return sqstd_rex_charclass(exp,t);
-				}
-			case 'b':
-			case 'B':
-				if(!isclass) {
-					SQInteger node = sqstd_rex_newnode(exp,OP_WB);
-					exp->_nodes[node].left = *exp->_p;
-					exp->_p++;
-					return node;
-				} //else default
-			default:
-				t = *exp->_p; exp->_p++;
-				return sqstd_rex_newnode(exp,t);
-		}
-	}
-	else if(!scisprint(*exp->_p)) {
-
-		sqstd_rex_error(exp,"letter expected");
-	}
-	t = *exp->_p; exp->_p++;
-	return sqstd_rex_newnode(exp,t);
-}
-static SQInteger sqstd_rex_class(SQRex *exp)
-{
-	SQInteger ret = -1;
-	SQInteger first = -1,chain;
-	if(*exp->_p == SQREX_SYMBOL_BEGINNING_OF_STRING){
-		ret = sqstd_rex_newnode(exp,OP_NCLASS);
-		exp->_p++;
-	}else ret = sqstd_rex_newnode(exp,OP_CLASS);
-
-	if(*exp->_p == ']') sqstd_rex_error(exp,"empty class");
-	chain = ret;
-	while(*exp->_p != ']' && exp->_p != exp->_eol) {
-		if(*exp->_p == '-' && first != -1){
-			SQInteger r;
-			if(*exp->_p++ == ']') sqstd_rex_error(exp,"unfinished range");
-			r = sqstd_rex_newnode(exp,OP_RANGE);
-			if(exp->_nodes[first].type>*exp->_p) sqstd_rex_error(exp,"invalid range");
-			if(exp->_nodes[first].type == OP_CCLASS) sqstd_rex_error(exp,"cannot use character classes in ranges");
-			exp->_nodes[r].left = exp->_nodes[first].type;
-			SQInteger t = sqstd_rex_escapechar(exp);
-			exp->_nodes[r].right = t;
-            exp->_nodes[chain].next = r;
-			chain = r;
-			first = -1;
-		}
-		else{
-			if(first!=-1){
-				SQInteger c = first;
-				exp->_nodes[chain].next = c;
-				chain = c;
-				first = sqstd_rex_charnode(exp,SQTrue);
-			}
-			else{
-				first = sqstd_rex_charnode(exp,SQTrue);
-			}
-		}
-	}
-	if(first!=-1){
-		SQInteger c = first;
-		exp->_nodes[chain].next = c;
-		chain = c;
-		first = -1;
-	}
-	/* hack? */
-	exp->_nodes[ret].left = exp->_nodes[ret].next;
-	exp->_nodes[ret].next = -1;
-	return ret;
-}
-
-static SQInteger sqstd_rex_parsenumber(SQRex *exp)
-{
-	SQInteger ret = *exp->_p-'0';
-	SQInteger positions = 10;
-	exp->_p++;
-	while(isdigit(*exp->_p)) {
-		ret = ret*10+(*exp->_p++-'0');
-		if(positions==1000000000) sqstd_rex_error(exp,"overflow in numeric constant");
-		positions *= 10;
-	};
-	return ret;
-}
-
-static SQInteger sqstd_rex_element(SQRex *exp)
-{
-	SQInteger ret = -1;
-	switch(*exp->_p)
-	{
-	case '(': {
-		SQInteger expr;
-		exp->_p++;
-
-
-		if(*exp->_p =='?') {
-			exp->_p++;
-			sqstd_rex_expect(exp,':');
-			expr = sqstd_rex_newnode(exp,OP_NOCAPEXPR);
-		}
-		else
-			expr = sqstd_rex_newnode(exp,OP_EXPR);
-		SQInteger newn = sqstd_rex_list(exp);
-		exp->_nodes[expr].left = newn;
-		ret = expr;
-		sqstd_rex_expect(exp,')');
-			  }
-			  break;
-	case '[':
-		exp->_p++;
-		ret = sqstd_rex_class(exp);
-		sqstd_rex_expect(exp,']');
-		break;
-	case SQREX_SYMBOL_END_OF_STRING: exp->_p++; ret = sqstd_rex_newnode(exp,OP_EOL);break;
-	case SQREX_SYMBOL_ANY_CHAR: exp->_p++; ret = sqstd_rex_newnode(exp,OP_DOT);break;
-	default:
-		ret = sqstd_rex_charnode(exp,SQFalse);
-		break;
-	}
-
-
-	SQInteger op;
-	SQBool isgreedy = SQFalse;
-	unsigned short p0 = 0, p1 = 0;
-	switch(*exp->_p){
-		case SQREX_SYMBOL_GREEDY_ZERO_OR_MORE: p0 = 0; p1 = 0xFFFF; exp->_p++; isgreedy = SQTrue; break;
-		case SQREX_SYMBOL_GREEDY_ONE_OR_MORE: p0 = 1; p1 = 0xFFFF; exp->_p++; isgreedy = SQTrue; break;
-		case SQREX_SYMBOL_GREEDY_ZERO_OR_ONE: p0 = 0; p1 = 1; exp->_p++; isgreedy = SQTrue; break;
-		case '{':
-			exp->_p++;
-			if(!isdigit(*exp->_p)) sqstd_rex_error(exp,"number expected");
-			p0 = (unsigned short)sqstd_rex_parsenumber(exp);
-			/*******************************/
-			switch(*exp->_p) {
-		case '}':
-			p1 = p0; exp->_p++;
-			break;
-		case ',':
-			exp->_p++;
-			p1 = 0xFFFF;
-			if(isdigit(*exp->_p)){
-				p1 = (unsigned short)sqstd_rex_parsenumber(exp);
-			}
-			sqstd_rex_expect(exp,'}');
-			break;
-		default:
-			sqstd_rex_error(exp,", or } expected");
-			}
-			/*******************************/
-			isgreedy = SQTrue;
-			break;
-
-	}
-	if(isgreedy) {
-		SQInteger nnode = sqstd_rex_newnode(exp,OP_GREEDY);
-		op = OP_GREEDY;
-		exp->_nodes[nnode].left = ret;
-		exp->_nodes[nnode].right = ((p0)<<16)|p1;
-		ret = nnode;
-	}
-
-	if((*exp->_p != SQREX_SYMBOL_BRANCH) && (*exp->_p != ')') && (*exp->_p != SQREX_SYMBOL_GREEDY_ZERO_OR_MORE) && (*exp->_p != SQREX_SYMBOL_GREEDY_ONE_OR_MORE) && (*exp->_p != '\0')) {
-		SQInteger nnode = sqstd_rex_element(exp);
-		exp->_nodes[ret].next = nnode;
-	}
-
-	return ret;
-}
-
-static SQInteger sqstd_rex_list(SQRex *exp)
-{
-	SQInteger ret=-1,e;
-	if(*exp->_p == SQREX_SYMBOL_BEGINNING_OF_STRING) {
-		exp->_p++;
-		ret = sqstd_rex_newnode(exp,OP_BOL);
-	}
-	e = sqstd_rex_element(exp);
-	if(ret != -1) {
-		exp->_nodes[ret].next = e;
-	}
-	else ret = e;
-
-	if(*exp->_p == SQREX_SYMBOL_BRANCH) {
-		SQInteger temp,tright;
-		exp->_p++;
-		temp = sqstd_rex_newnode(exp,OP_OR);
-		exp->_nodes[temp].left = ret;
-		tright = sqstd_rex_list(exp);
-		exp->_nodes[temp].right = tright;
-		ret = temp;
-	}
-	return ret;
-}
-
-static SQBool sqstd_rex_matchcclass(SQInteger cclass,SQChar c)
-{
-	switch(cclass) {
-	case 'a': return isalpha(c)?SQTrue:SQFalse;
-	case 'A': return !isalpha(c)?SQTrue:SQFalse;
-	case 'w': return (isalnum(c) || c == '_')?SQTrue:SQFalse;
-	case 'W': return (!isalnum(c) && c != '_')?SQTrue:SQFalse;
-	case 's': return isspace(c)?SQTrue:SQFalse;
-	case 'S': return !isspace(c)?SQTrue:SQFalse;
-	case 'd': return isdigit(c)?SQTrue:SQFalse;
-	case 'D': return !isdigit(c)?SQTrue:SQFalse;
-	case 'x': return isxdigit(c)?SQTrue:SQFalse;
-	case 'X': return !isxdigit(c)?SQTrue:SQFalse;
-	case 'c': return iscntrl(c)?SQTrue:SQFalse;
-	case 'C': return !iscntrl(c)?SQTrue:SQFalse;
-	case 'p': return ispunct(c)?SQTrue:SQFalse;
-	case 'P': return !ispunct(c)?SQTrue:SQFalse;
-	case 'l': return islower(c)?SQTrue:SQFalse;
-	case 'u': return isupper(c)?SQTrue:SQFalse;
-	}
-	return SQFalse; /*cannot happen*/
-}
-
-static SQBool sqstd_rex_matchclass(SQRex* exp,SQRexNode *node,SQInteger c)
-{
-	do {
-		switch(node->type) {
-			case OP_RANGE:
-				if(c >= node->left && c <= node->right) return SQTrue;
-				break;
-			case OP_CCLASS:
-				if(sqstd_rex_matchcclass(node->left,c)) return SQTrue;
-				break;
-			default:
-				if(c == node->type)return SQTrue;
-		}
-	} while((node->next != -1) && (node = &exp->_nodes[node->next]));
-	return SQFalse;
-}
-
-static const SQChar *sqstd_rex_matchnode(SQRex* exp,SQRexNode *node,const SQChar *str,SQRexNode *next)
-{
-
-	SQRexNodeType type = node->type;
-	switch(type) {
-	case OP_GREEDY: {
-		//SQRexNode *greedystop = (node->next != -1) ? &exp->_nodes[node->next] : nullptr;
-		SQRexNode *greedystop = nullptr;
-		SQInteger p0 = (node->right >> 16)&0x0000FFFF, p1 = node->right&0x0000FFFF, nmaches = 0;
-		const SQChar *s=str, *good = str;
-
-		if(node->next != -1) {
-			greedystop = &exp->_nodes[node->next];
-		}
-		else {
-			greedystop = next;
-		}
-
-		while((nmaches == 0xFFFF || nmaches < p1)) {
-
-			const SQChar *stop;
-			if(!(s = sqstd_rex_matchnode(exp,&exp->_nodes[node->left],s,greedystop)))
-				break;
-			nmaches++;
-			good=s;
-			if(greedystop) {
-				//checks that 0 matches satisfy the expression(if so skips)
-				//if not would always stop(for instance if is a '?')
-				if(greedystop->type != OP_GREEDY ||
-				(greedystop->type == OP_GREEDY && ((greedystop->right >> 16)&0x0000FFFF) != 0))
-				{
-					SQRexNode *gnext = nullptr;
-					if(greedystop->next != -1) {
-						gnext = &exp->_nodes[greedystop->next];
-					}else if(next && next->next != -1){
-						gnext = &exp->_nodes[next->next];
-					}
-					stop = sqstd_rex_matchnode(exp,greedystop,s,gnext);
-					if(stop) {
-						//if satisfied stop it
-						if(p0 == p1 && p0 == nmaches) break;
-						else if(nmaches >= p0 && p1 == 0xFFFF) break;
-						else if(nmaches >= p0 && nmaches <= p1) break;
-					}
-				}
-			}
-
-			if(s >= exp->_eol)
-				break;
-		}
-		if(p0 == p1 && p0 == nmaches) return good;
-		else if(nmaches >= p0 && p1 == 0xFFFF) return good;
-		else if(nmaches >= p0 && nmaches <= p1) return good;
-		return nullptr;
-	}
-	case OP_OR: {
-			const SQChar *asd = str;
-			SQRexNode *temp=&exp->_nodes[node->left];
-			while( (asd = sqstd_rex_matchnode(exp,temp,asd,nullptr)) ) {
-				if(temp->next != -1)
-					temp = &exp->_nodes[temp->next];
-				else
-					return asd;
-			}
-			asd = str;
-			temp = &exp->_nodes[node->right];
-			while( (asd = sqstd_rex_matchnode(exp,temp,asd,nullptr)) ) {
-				if(temp->next != -1)
-					temp = &exp->_nodes[temp->next];
-				else
-					return asd;
-			}
-			return nullptr;
-			break;
-	}
-	case OP_EXPR:
-	case OP_NOCAPEXPR:{
-			SQRexNode *n = &exp->_nodes[node->left];
-			const SQChar *cur = str;
-			SQInteger capture = -1;
-			if(node->type != OP_NOCAPEXPR && node->right == exp->_currsubexp) {
-				capture = exp->_currsubexp;
-				exp->_matches[capture].begin = cur;
-				exp->_currsubexp++;
-			}
-
-			do {
-				SQRexNode *subnext = nullptr;
-				if(n->next != -1) {
-					subnext = &exp->_nodes[n->next];
-				}else {
-					subnext = next;
-				}
-				if(!(cur = sqstd_rex_matchnode(exp,n,cur,subnext))) {
-					if(capture != -1){
-						exp->_matches[capture].begin = 0;
-						exp->_matches[capture].len = 0;
-					}
-					return nullptr;
-				}
-			} while((n->next != -1) && (n = &exp->_nodes[n->next]));
-
-			if(capture != -1)
-				exp->_matches[capture].len = cur - exp->_matches[capture].begin;
-			return cur;
-	}
-	case OP_WB:
-		if((str == exp->_bol && !isspace(*str))
-		 || (str == exp->_eol && !isspace(*(str-1)))
-		 || (!isspace(*str) && isspace(*(str+1)))
-		 || (isspace(*str) && !isspace(*(str+1))) ) {
-			return (node->left == 'b')?str:nullptr;
-		}
-		return (node->left == 'b')?nullptr:str;
-	case OP_BOL:
-		if(str == exp->_bol) return str;
-		return nullptr;
-	case OP_EOL:
-		if(str == exp->_eol) return str;
-		return nullptr;
-	case OP_DOT:{
-		*str++;
-				}
-		return str;
-	case OP_NCLASS:
-	case OP_CLASS:
-		if(sqstd_rex_matchclass(exp,&exp->_nodes[node->left],*str)?(type == OP_CLASS?SQTrue:SQFalse):(type == OP_NCLASS?SQTrue:SQFalse)) {
-			*str++;
-			return str;
-		}
-		return nullptr;
-	case OP_CCLASS:
-		if(sqstd_rex_matchcclass(node->left,*str)) {
-			*str++;
-			return str;
-		}
-		return nullptr;
-	default: /* char */
-		if(*str != (SQChar)node->type) return nullptr;
-		*str++;
-		return str;
-	}
-	return nullptr;
-}
-
-/* public api */
-SQRex *sqstd_rex_compile(const SQChar *pattern,const SQChar **error)
-{
-	SQRex *exp = (SQRex *)sq_malloc(sizeof(SQRex));
-	exp->_eol = exp->_bol = nullptr;
-	exp->_p = pattern;
-	exp->_nallocated = (SQInteger)strlen(pattern) * sizeof(SQChar);
-	exp->_nodes = (SQRexNode *)sq_malloc(exp->_nallocated * sizeof(SQRexNode));
-	exp->_nsize = 0;
-	exp->_matches = 0;
-	exp->_nsubexpr = 0;
-	exp->_first = sqstd_rex_newnode(exp,OP_EXPR);
-	exp->_error = error;
-	try {
-		SQInteger res = sqstd_rex_list(exp);
-		exp->_nodes[exp->_first].left = res;
-		if(*exp->_p!='\0')
-			sqstd_rex_error(exp,"unexpected character");
-#ifdef _DEBUG
-		{
-			SQInteger nsize,i;
-			SQRexNode *t;
-			nsize = exp->_nsize;
-			t = &exp->_nodes[0];
-			printf("\n");
-			/* XXX -- The (int) casts are needed to silent warnings on 64bit systems (SQInteger is 64bit, %d assumes 32bit, (int) is 32bit) */
-			for(i = 0;i < nsize; i++) {
-				if(exp->_nodes[i].type>MAX_CHAR)
-					printf("[%02d] %10s ",(int)i,g_nnames[exp->_nodes[i].type-MAX_CHAR]);
-				else
-					printf("[%02d] %10c ",(int)i,exp->_nodes[i].type);
-				printf("left %02d right %02d next %02d\n",(int)exp->_nodes[i].left,(int)exp->_nodes[i].right,(int)exp->_nodes[i].next);
-			}
-			printf("\n");
-		}
-#endif
-		exp->_matches = (SQRexMatch *) sq_malloc(exp->_nsubexpr * sizeof(SQRexMatch));
-		memset(exp->_matches,0,exp->_nsubexpr * sizeof(SQRexMatch));
-	}
-	catch (...) {
-		sqstd_rex_free(exp);
-		return nullptr;
-	}
-	return exp;
-}
-
-void sqstd_rex_free(SQRex *exp)
-{
-	if(exp)	{
-		if(exp->_nodes) sq_free(exp->_nodes,exp->_nallocated * sizeof(SQRexNode));
-		if(exp->_matches) sq_free(exp->_matches,exp->_nsubexpr * sizeof(SQRexMatch));
-		sq_free(exp,sizeof(SQRex));
-	}
-}
-
-SQBool sqstd_rex_match(SQRex* exp,const SQChar* text)
-{
-	const SQChar* res = nullptr;
-	exp->_bol = text;
-	exp->_eol = text + strlen(text);
-	exp->_currsubexp = 0;
-	res = sqstd_rex_matchnode(exp,exp->_nodes,text,nullptr);
-	if(res == nullptr || res != exp->_eol)
-		return SQFalse;
-	return SQTrue;
-}
-
-SQBool sqstd_rex_searchrange(SQRex* exp,const SQChar* text_begin,const SQChar* text_end,const SQChar** out_begin, const SQChar** out_end)
-{
-	const SQChar *cur = nullptr;
-	SQInteger node = exp->_first;
-	if(text_begin >= text_end) return SQFalse;
-	exp->_bol = text_begin;
-	exp->_eol = text_end;
-	do {
-		cur = text_begin;
-		while(node != -1) {
-			exp->_currsubexp = 0;
-			cur = sqstd_rex_matchnode(exp,&exp->_nodes[node],cur,nullptr);
-			if(!cur)
-				break;
-			node = exp->_nodes[node].next;
-		}
-		*text_begin++;
-	} while(cur == nullptr && text_begin != text_end);
-
-	if(cur == nullptr)
-		return SQFalse;
-
-	--text_begin;
-
-	if(out_begin) *out_begin = text_begin;
-	if(out_end) *out_end = cur;
-	return SQTrue;
-}
-
-SQBool sqstd_rex_search(SQRex* exp,const SQChar* text, const SQChar** out_begin, const SQChar** out_end)
-{
-	return sqstd_rex_searchrange(exp,text,text + strlen(text),out_begin,out_end);
-}
-
-SQInteger sqstd_rex_getsubexpcount(SQRex* exp)
-{
-	return exp->_nsubexpr;
-}
-
-SQBool sqstd_rex_getsubexp(SQRex* exp, SQInteger n, SQRexMatch *subexp)
-{
-	if( n<0 || n >= exp->_nsubexpr) return SQFalse;
-	*subexp = exp->_matches[n];
-	return SQTrue;
-}
-
@@ -1,270 +0,0 @@
-/* see copyright notice in squirrel.h */
-#include <squirrel.h>
-#include <sqstdstring.h>
-
-#define scstrchr strchr
-#define scatoi atoi
-#define scstrtok strtok
-#define MAX_FORMAT_LEN	20
-#define MAX_WFORMAT_LEN	3
-#define ADDITIONAL_FORMAT_SPACE (100*sizeof(SQChar))
-
-static SQInteger validate_format(HSQUIRRELVM v, SQChar *fmt, const SQChar *src, SQInteger n,SQInteger &width)
-{
-	SQChar swidth[MAX_WFORMAT_LEN];
-	SQInteger wc = 0;
-	SQInteger start = n;
-	fmt[0] = '%';
-	while (scstrchr("-+ #0", src[n])) n++;
-	while (isdigit(src[n])) {
-		swidth[wc] = src[n];
-		n++;
-		wc++;
-		if(wc>=MAX_WFORMAT_LEN)
-			return sq_throwerror(v,"width format too long");
-	}
-	swidth[wc] = '\0';
-	if(wc > 0) {
-		width = atoi(swidth);
-	}
-	else
-		width = 0;
-	if (src[n] == '.') {
-	    n++;
-
-		wc = 0;
-		while (isdigit(src[n])) {
-			swidth[wc] = src[n];
-			n++;
-			wc++;
-			if(wc>=MAX_WFORMAT_LEN)
-				return sq_throwerror(v,"precision format too long");
-		}
-		swidth[wc] = '\0';
-		if(wc > 0) {
-			width += atoi(swidth);
-		}
-	}
-	if (n-start > MAX_FORMAT_LEN )
-		return sq_throwerror(v,"format too long");
-	memcpy(&fmt[1],&src[start],((n-start)+1)*sizeof(SQChar));
-	fmt[(n-start)+2] = '\0';
-	return n;
-}
-
-static void __strip_l(const SQChar *str,const SQChar **start)
-{
-	const SQChar *t = str;
-	while(((*t) != '\0') && isspace(*t)){ t++; }
-	*start = t;
-}
-
-static void __strip_r(const SQChar *str,SQInteger len,const SQChar **end)
-{
-	if(len == 0) {
-		*end = str;
-		return;
-	}
-	const SQChar *t = &str[len-1];
-	while(t != str && isspace(*t)) { t--; }
-	*end = t+1;
-}
-
-static SQInteger _string_strip(HSQUIRRELVM v)
-{
-	const SQChar *str,*start,*end;
-	sq_getstring(v,2,&str);
-	SQInteger len = sq_getsize(v,2);
-	__strip_l(str,&start);
-	__strip_r(str,len,&end);
-	sq_pushstring(v,start,end - start);
-	return 1;
-}
-
-static SQInteger _string_lstrip(HSQUIRRELVM v)
-{
-	const SQChar *str,*start;
-	sq_getstring(v,2,&str);
-	__strip_l(str,&start);
-	sq_pushstring(v,start,-1);
-	return 1;
-}
-
-static SQInteger _string_rstrip(HSQUIRRELVM v)
-{
-	const SQChar *str,*end;
-	sq_getstring(v,2,&str);
-	SQInteger len = sq_getsize(v,2);
-	__strip_r(str,len,&end);
-	sq_pushstring(v,str,end - str);
-	return 1;
-}
-
-static SQInteger _string_split(HSQUIRRELVM v)
-{
-	const SQChar *str,*seps;
-	SQChar *stemp,*tok;
-	sq_getstring(v,2,&str);
-	sq_getstring(v,3,&seps);
-	if(sq_getsize(v,3) == 0) return sq_throwerror(v,"empty separators string");
-	SQInteger memsize = (sq_getsize(v,2)+1)*sizeof(SQChar);
-	stemp = sq_getscratchpad(v,memsize);
-	memcpy(stemp,str,memsize);
-	tok = scstrtok(stemp,seps);
-	sq_newarray(v,0);
-	while( tok != nullptr ) {
-		sq_pushstring(v,tok,-1);
-		sq_arrayappend(v,-2);
-		tok = scstrtok( nullptr, seps );
-	}
-	return 1;
-}
-
-#define SETUP_REX(v) \
-	SQRex *self = nullptr; \
-	sq_getinstanceup(v,1,(SQUserPointer *)&self,0);
-
-static SQInteger _rexobj_releasehook(SQUserPointer p, SQInteger size)
-{
-	SQRex *self = ((SQRex *)p);
-	sqstd_rex_free(self);
-	return 1;
-}
-
-static SQInteger _regexp_match(HSQUIRRELVM v)
-{
-	SETUP_REX(v);
-	const SQChar *str;
-	sq_getstring(v,2,&str);
-	if(sqstd_rex_match(self,str) == SQTrue)
-	{
-		sq_pushbool(v,SQTrue);
-		return 1;
-	}
-	sq_pushbool(v,SQFalse);
-	return 1;
-}
-
-static void _addrexmatch(HSQUIRRELVM v,const SQChar *str,const SQChar *begin,const SQChar *end)
-{
-	sq_newtable(v);
-	sq_pushstring(v,"begin",-1);
-	sq_pushinteger(v,begin - str);
-	sq_rawset(v,-3);
-	sq_pushstring(v,"end",-1);
-	sq_pushinteger(v,end - str);
-	sq_rawset(v,-3);
-}
-
-static SQInteger _regexp_search(HSQUIRRELVM v)
-{
-	SETUP_REX(v);
-	const SQChar *str,*begin,*end;
-	SQInteger start = 0;
-	sq_getstring(v,2,&str);
-	if(sq_gettop(v) > 2) sq_getinteger(v,3,&start);
-	if(sqstd_rex_search(self,str+start,&begin,&end) == SQTrue) {
-		_addrexmatch(v,str,begin,end);
-		return 1;
-	}
-	return 0;
-}
-
-static SQInteger _regexp_capture(HSQUIRRELVM v)
-{
-	SETUP_REX(v);
-	const SQChar *str,*begin,*end;
-	SQInteger start = 0;
-	sq_getstring(v,2,&str);
-	if(sq_gettop(v) > 2) sq_getinteger(v,3,&start);
-	if(sqstd_rex_search(self,str+start,&begin,&end) == SQTrue) {
-		SQInteger n = sqstd_rex_getsubexpcount(self);
-		SQRexMatch match;
-		sq_newarray(v,0);
-		for(SQInteger i = 0;i < n; i++) {
-			sqstd_rex_getsubexp(self,i,&match);
-			if(match.len > 0)
-				_addrexmatch(v,str,match.begin,match.begin+match.len);
-			else
-				_addrexmatch(v,str,str,str); //empty match
-			sq_arrayappend(v,-2);
-		}
-		return 1;
-	}
-	return 0;
-}
-
-static SQInteger _regexp_subexpcount(HSQUIRRELVM v)
-{
-	SETUP_REX(v);
-	sq_pushinteger(v,sqstd_rex_getsubexpcount(self));
-	return 1;
-}
-
-static SQInteger _regexp_constructor(HSQUIRRELVM v)
-{
-	const SQChar *error,*pattern;
-	sq_getstring(v,2,&pattern);
-	SQRex *rex = sqstd_rex_compile(pattern,&error);
-	if(!rex) return sq_throwerror(v,error);
-	sq_setinstanceup(v,1,rex);
-	sq_setreleasehook(v,1,_rexobj_releasehook);
-	return 0;
-}
-
-static SQInteger _regexp__typeof(HSQUIRRELVM v)
-{
-	sq_pushstring(v,"regexp",-1);
-	return 1;
-}
-
-#define _DECL_REX_FUNC(name,nparams,pmask) {#name,_regexp_##name,nparams,pmask}
-static SQRegFunction rexobj_funcs[]={
-	_DECL_REX_FUNC(constructor,2,".s"),
-	_DECL_REX_FUNC(search,-2,"xsn"),
-	_DECL_REX_FUNC(match,2,"xs"),
-	_DECL_REX_FUNC(capture,-2,"xsn"),
-	_DECL_REX_FUNC(subexpcount,1,"x"),
-	_DECL_REX_FUNC(_typeof,1,"x"),
-	{0,0,0,0}
-};
-
-#define _DECL_FUNC(name,nparams,pmask) {#name,_string_##name,nparams,pmask}
-static SQRegFunction stringlib_funcs[]={
-	_DECL_FUNC(format,-2,".s"),
-	_DECL_FUNC(strip,2,".s"),
-	_DECL_FUNC(lstrip,2,".s"),
-	_DECL_FUNC(rstrip,2,".s"),
-	_DECL_FUNC(split,3,".ss"),
-	{0,0,0,0}
-};
-
-
-SQInteger sqstd_register_stringlib(HSQUIRRELVM v)
-{
-	sq_pushstring(v,"regexp",-1);
-	sq_newclass(v,SQFalse);
-	SQInteger i = 0;
-	while(rexobj_funcs[i].name != 0) {
-		SQRegFunction &f = rexobj_funcs[i];
-		sq_pushstring(v,f.name,-1);
-		sq_newclosure(v,f.f,0);
-		sq_setparamscheck(v,f.nparamscheck,f.typemask);
-		sq_setnativeclosurename(v,-1,f.name);
-		sq_createslot(v,-3);
-		i++;
-	}
-	sq_createslot(v,-3);
-
-	i = 0;
-	while(stringlib_funcs[i].name!=0)
-	{
-		sq_pushstring(v,stringlib_funcs[i].name,-1);
-		sq_newclosure(v,stringlib_funcs[i].f,0);
-		sq_setparamscheck(v,stringlib_funcs[i].nparamscheck,stringlib_funcs[i].typemask);
-		sq_setnativeclosurename(v,-1,stringlib_funcs[i].name);
-		sq_createslot(v,-3);
-		i++;
-	}
-	return 1;
-}
@@ -18,6 +18,7 @@
 #include "sqfuncstate.h"
 #include "sqclass.h"

+#include "../../../core/string_consumer.hpp"
 #include "../../../string_func.h"

 #include "../../../safeguards.h"
@@ -57,7 +58,7 @@ HSQUIRRELVM sq_open(SQInteger initialstacksize)
 	SQVM *v;
 	sq_new(ss, SQSharedState);
 	v = (SQVM *)SQ_MALLOC(sizeof(SQVM));
-	new (v) SQVM(ss);
+	new (v, sizeof(SQVM)) SQVM(ss);
 	ss->_root_vm = v;
 	if(v->Init(nullptr, initialstacksize)) {
 		return v;
@@ -75,7 +76,7 @@ HSQUIRRELVM sq_newthread(HSQUIRRELVM friendvm, SQInteger initialstacksize)
 	ss=_ss(friendvm);

 	v= (SQVM *)SQ_MALLOC(sizeof(SQVM));
-	new (v) SQVM(ss);
+	new (v, sizeof(SQVM)) SQVM(ss);

 	if(v->Init(friendvm, initialstacksize)) {
 		friendvm->Push(v);
@@ -131,7 +132,7 @@ void sq_close(HSQUIRRELVM v)
 	sq_delete(ss, SQSharedState);
 }

-SQRESULT sq_compile(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,const SQChar *sourcename,SQBool raiseerror)
+SQRESULT sq_compile(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,std::string_view sourcename,SQBool raiseerror)
 {
 	SQObjectPtr o;
 	if(Compile(v, read, p, sourcename, o, raiseerror != 0, _ss(v)->_debuginfo)) {
@@ -172,12 +173,12 @@ SQBool sq_release(HSQUIRRELVM v,HSQOBJECT *po)
 #endif
 }

-const SQChar *sq_objtostring(HSQOBJECT *o)
+std::optional<std::string_view> sq_objtostring(HSQOBJECT *o)
 {
 	if(sq_type(*o) == OT_STRING) {
 		return _stringval(*o);
 	}
-	return nullptr;
+	return std::nullopt;
 }

 SQInteger sq_objtointeger(HSQOBJECT *o)
@@ -209,11 +210,9 @@ void sq_pushnull(HSQUIRRELVM v)
 	v->Push(_null_);
 }

-void sq_pushstring(HSQUIRRELVM v,const SQChar *s,SQInteger len)
+void sq_pushstring(HSQUIRRELVM v,std::string_view s)
 {
-	if(s)
-		v->Push(SQObjectPtr(SQString::Create(_ss(v), s, len)));
-	else v->Push(_null_);
+	v->Push(SQObjectPtr(SQString::Create(_ss(v), s)));
 }

 void sq_pushinteger(HSQUIRRELVM v,SQInteger n)
@@ -375,7 +374,7 @@ SQRESULT sq_getclosureinfo(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparam
 	return sq_throwerror(v,"the object is not a closure");
 }

-SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,SQInteger idx,const SQChar *name)
+SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,SQInteger idx,std::string_view name)
 {
 	SQObject o = stack_get(v, idx);
 	if(sq_isnativeclosure(o)) {
@@ -386,16 +385,16 @@ SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,SQInteger idx,const SQChar *name)
 	return sq_throwerror(v,"the object is not a nativeclosure");
 }

-SQRESULT sq_setparamscheck(HSQUIRRELVM v,SQInteger nparamscheck,const SQChar *typemask)
+SQRESULT sq_setparamscheck(HSQUIRRELVM v,SQInteger nparamscheck,std::optional<std::string_view> typemask)
 {
 	SQObject o = stack_get(v, -1);
 	if(!sq_isnativeclosure(o))
 		return sq_throwerror(v, "native closure expected");
 	SQNativeClosure *nc = _nativeclosure(o);
 	nc->_nparamscheck = nparamscheck;
-	if(typemask) {
+	if(typemask.has_value()) {
 		SQIntVec res;
-		if(!CompileTypemask(res, typemask))
+		if(!CompileTypemask(res, *typemask))
 			return sq_throwerror(v, "invalid typemask");
 		nc->_typecheck.copy(res);
 	}
@@ -552,11 +551,11 @@ SQRESULT sq_getbool(HSQUIRRELVM v,SQInteger idx,SQBool *b)
 	return SQ_ERROR;
 }

-SQRESULT sq_getstring(HSQUIRRELVM v,SQInteger idx,const SQChar **c)
+SQRESULT sq_getstring(HSQUIRRELVM v,SQInteger idx,std::string_view &str)
 {
 	SQObjectPtr *o = nullptr;
 	_GETSAFE_OBJ(v, idx, OT_STRING,o);
-	*c = _stringval(*o);
+	str = _stringval(*o);
 	return SQ_OK;
 }

@@ -584,7 +583,7 @@ SQInteger sq_getsize(HSQUIRRELVM v, SQInteger idx)
 	SQObjectPtr &o = stack_get(v, idx);
 	SQObjectType type = type(o);
 	switch(type) {
-	case OT_STRING:		return _string(o)->_len;
+	case OT_STRING:		return _string(o)->View().size();
 	case OT_TABLE:		return _table(o)->CountUsed();
 	case OT_ARRAY:		return _array(o)->Size();
 	case OT_USERDATA:	return _userdata(o)->_size;
@@ -896,7 +895,7 @@ SQRESULT sq_getstackobj(HSQUIRRELVM v,SQInteger idx,HSQOBJECT *po)
 	return SQ_OK;
 }

-const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx)
+std::optional<std::string_view> sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx)
 {
 	SQUnsignedInteger cstksize=v->_callsstacksize;
 	SQUnsignedInteger lvl=(cstksize-level)-1;
@@ -908,7 +907,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 std::nullopt;
 		SQClosure *c=_closure(ci._closure);
 		SQFunctionProto *func=_funcproto(c->_function);
 		if(func->_noutervalues > (SQInteger)idx) {
@@ -918,7 +917,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 std::nullopt;
 }

 void sq_pushobject(HSQUIRRELVM v,HSQOBJECT obj)
@@ -931,9 +930,9 @@ void sq_resetobject(HSQOBJECT *po)
 	po->_unVal.pUserPointer=nullptr;po->_type=OT_NULL;
 }

-SQRESULT sq_throwerror(HSQUIRRELVM v,const SQChar *err, SQInteger len)
+SQRESULT sq_throwerror(HSQUIRRELVM v,std::string_view error)
 {
-	v->_lasterror=SQString::Create(_ss(v),err, len);
+	v->_lasterror=SQString::Create(_ss(v),error);
 	return -1;
 }

@@ -978,6 +977,10 @@ SQRESULT sq_call(HSQUIRRELVM v,SQInteger params,SQBool retval,SQBool raiseerror,
 		if(!v->_suspended) {
 			v->Pop(params);//pop closure and args
 		}
+		if (!v->_can_suspend && v->IsOpsTillSuspendError()) {
+			v->Raise_Error(fmt::format("excessive CPU usage in {}", v->_ops_till_suspend_error_label));
+			return SQ_ERROR;
+		}
 		if(retval){
 			v->Push(res); return SQ_OK;
 		}
@@ -1075,7 +1078,7 @@ SQRESULT sq_readclosure(HSQUIRRELVM v,SQREADFUNC r,SQUserPointer up)
 	return SQ_OK;
 }

-SQChar *sq_getscratchpad(HSQUIRRELVM v,SQInteger minsize)
+std::span<char> sq_getscratchpad(HSQUIRRELVM v,SQInteger minsize)
 {
 	return _ss(v)->GetScratchPad(minsize);
 }
@@ -1089,19 +1092,18 @@ SQInteger sq_collectgarbage(HSQUIRRELVM v)
 #endif
 }

-const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)
+std::optional<std::string_view> sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)
 {
 	SQObjectPtr &self = stack_get(v,idx);
-	const SQChar *name = nullptr;
 	if(type(self) == OT_CLOSURE) {
 		if(_closure(self)->_outervalues.size()>nval) {
 			v->Push(_closure(self)->_outervalues[nval]);
 			SQFunctionProto *fp = _funcproto(_closure(self)->_function);
 			SQOuterVar &ov = fp->_outervalues[nval];
-			name = _stringval(ov._name);
+			return _stringval(ov._name);
 		}
 	}
-	return name;
+	return std::nullopt;
 }

 SQRESULT sq_setfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)
@@ -1253,44 +1255,16 @@ SQRESULT sq_next(HSQUIRRELVM v,SQInteger idx)
 	return SQ_ERROR;
 }

-struct BufState{
-	const SQChar *buf;
-	SQInteger ptr;
-	SQInteger size;
-};
-
 char32_t buf_lexfeed(SQUserPointer file)
 {
 	/* Convert an UTF-8 character into a char32_t */
-	BufState *buf = (BufState *)file;
-	const char *p = &buf->buf[buf->ptr];
-
-	if (buf->size < buf->ptr + 1) return 0;
-
-	/* Read the first character, and get the length based on UTF-8 specs. If invalid, bail out. */
-	uint len = Utf8EncodedCharLen(*p);
-	if (len == 0) {
-		buf->ptr++;
-		return -1;
-	}
-
-	/* Read the remaining bits. */
-	if (buf->size < buf->ptr + len) return 0;
-	buf->ptr += len;
-
-	/* Convert the character, and when definitely invalid, bail out as well. */
-	char32_t c;
-	if (Utf8Decode(&c, p) != len) return -1;
-
-	return c;
+	StringConsumer &consumer = *reinterpret_cast<StringConsumer *>(file);
+	return consumer.AnyBytesLeft() ? consumer.ReadUtf8(-1) : 0;
 }

-SQRESULT sq_compilebuffer(HSQUIRRELVM v,const SQChar *s,SQInteger size,const SQChar *sourcename,SQBool raiseerror) {
-	BufState buf;
-	buf.buf = s;
-	buf.size = size;
-	buf.ptr = 0;
-	return sq_compile(v, buf_lexfeed, &buf, sourcename, raiseerror);
+SQRESULT sq_compilebuffer(HSQUIRRELVM v,std::string_view buffer,std::string_view sourcename,SQBool raiseerror) {
+	StringConsumer consumer{buffer};
+	return sq_compile(v, buf_lexfeed, &consumer, sourcename, raiseerror);
 }

 void sq_move(HSQUIRRELVM dest,HSQUIRRELVM src,SQInteger idx)
@@ -1323,7 +1297,7 @@ void sq_free(void *p,SQUnsignedInteger size)
 	SQ_FREE(p,size);
 }

-SQOpsLimiter::SQOpsLimiter(HSQUIRRELVM v, SQInteger ops, const char *label) : _v(v)
+SQOpsLimiter::SQOpsLimiter(HSQUIRRELVM v, SQInteger ops, std::string_view label) : _v(v)
 {
 	this->_ops = v->_ops_till_suspend_error_threshold;
 	if (this->_ops == INT64_MIN) {
@@ -13,7 +13,7 @@ private:
 public:
 	static SQArray* Create(SQSharedState *ss,SQInteger nInitialSize){
 		SQArray *newarray=(SQArray*)SQ_MALLOC(sizeof(SQArray));
-		new (newarray) SQArray(ss,nInitialSize);
+		new (newarray, sizeof(SQArray)) SQArray(ss,nInitialSize);
 		return newarray;
 	}
 #ifndef NO_GARBAGE_COLLECTOR
@@ -5,6 +5,7 @@
 #include "../../../stdafx.h"
 #include "../../fmt/format.h"

+#include "../../../core/string_consumer.hpp"
 #include "sqpcheader.h"
 #include "sqvm.h"
 #include "sqstring.h"
@@ -17,19 +18,20 @@

 #include "../../../safeguards.h"

-bool str2num(const SQChar *s,SQObjectPtr &res)
+bool str2num(std::string_view s,SQObjectPtr &res)
 {
-	SQChar *end;
-	if(strstr(s,".")){
-		SQFloat r = SQFloat(strtod(s,&end));
-		if(s == end) return false;
+	if(s.find('.') != std::string_view::npos){
+		char *end;
+		std::string str{s};
+		SQFloat r = SQFloat(strtod(str.c_str(),&end));
+		if(str.c_str() == end) return false;
 		res = r;
 		return true;
 	}
 	else{
-		SQInteger r = SQInteger(strtol(s,&end,10));
-		if(s == end) return false;
-		res = r;
+		auto val = ParseInteger<int64_t>(s);
+		if (!val.has_value()) return false;
+		res = *val;
 		return true;
 	}
 }
@@ -101,29 +103,29 @@ static SQInteger base_getstackinfos(HSQUIRRELVM v)
 	SQInteger level;
 	SQStackInfos si;
 	SQInteger seq = 0;
-	const SQChar *name = nullptr;
 	sq_getinteger(v, -1, &level);
 	if (SQ_SUCCEEDED(sq_stackinfos(v, level, &si)))
 	{
-		const SQChar *fn = "unknown";
-		const SQChar *src = "unknown";
+		std::string_view fn = "unknown";
+		std::string_view src = "unknown";
 		if(si.funcname)fn = si.funcname;
 		if(si.source)src = si.source;
 		sq_newtable(v);
-		sq_pushstring(v, "func", -1);
-		sq_pushstring(v, fn, -1);
+		sq_pushstring(v, "func");
+		sq_pushstring(v, fn);
 		sq_createslot(v, -3);
-		sq_pushstring(v, "src", -1);
-		sq_pushstring(v, src, -1);
+		sq_pushstring(v, "src");
+		sq_pushstring(v, src);
 		sq_createslot(v, -3);
-		sq_pushstring(v, "line", -1);
+		sq_pushstring(v, "line");
 		sq_pushinteger(v, si.line);
 		sq_createslot(v, -3);
-		sq_pushstring(v, "locals", -1);
+		sq_pushstring(v, "locals");
 		sq_newtable(v);
 		seq=0;
-		while ((name = sq_getlocal(v, level, seq))) {
-			sq_pushstring(v, name, -1);
+		std::optional<std::string_view> name;
+		while ((name = sq_getlocal(v, level, seq)).has_value()) {
+			sq_pushstring(v, *name);
 			sq_push(v, -2);
 			sq_createslot(v, -4);
 			sq_pop(v, 1);
@@ -169,9 +171,9 @@ static SQInteger get_slice_params(HSQUIRRELVM v,SQInteger &sidx,SQInteger &eidx,

 static SQInteger base_print(HSQUIRRELVM v)
 {
-	const SQChar *str;
+	std::string_view str;
 	sq_tostring(v,2);
-	sq_getstring(v,-1,&str);
+	sq_getstring(v,-1,str);
 	if(_ss(v)->_printfunc) _ss(v)->_printfunc(v,str);
 	return 0;
 }
@@ -180,14 +182,14 @@ static SQInteger base_print(HSQUIRRELVM v)
 static SQInteger base_compilestring(HSQUIRRELVM v)
 {
 	SQInteger nargs=sq_gettop(v);
-	const SQChar *src=nullptr,*name="unnamedbuffer";
+	std::string_view src, name="unnamedbuffer";
 	SQInteger size;
-	sq_getstring(v,2,&src);
+	sq_getstring(v,2,src);
 	size=sq_getsize(v,2);
 	if(nargs>2){
-		sq_getstring(v,3,&name);
+		sq_getstring(v,3,name);
 	}
-	if(SQ_SUCCEEDED(sq_compilebuffer(v,src,size,name,SQFalse)))
+	if(SQ_SUCCEEDED(sq_compilebuffer(v,src.substr(0, size),name,SQFalse)))
 		return 1;
 	else
 		return SQ_ERROR;
@@ -232,62 +234,59 @@ static SQInteger base_array(HSQUIRRELVM v)
 static SQInteger base_type(HSQUIRRELVM v)
 {
 	SQObjectPtr &o = stack_get(v,2);
-	v->Push(SQString::Create(_ss(v),GetTypeName(o),-1));
+	v->Push(SQString::Create(_ss(v),GetTypeName(o)));
 	return 1;
 }

-static SQRegFunction base_funcs[]={
+static const std::initializer_list<SQRegFunction> base_funcs={
 	//generic
 #ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
-	{"seterrorhandler",base_seterrorhandler,2, nullptr},
-	{"setdebughook",base_setdebughook,2, nullptr},
-	{"enabledebuginfo",base_enabledebuginfo,2, nullptr},
+	{"seterrorhandler",base_seterrorhandler,2, std::nullopt},
+	{"setdebughook",base_setdebughook,2, std::nullopt},
+	{"enabledebuginfo",base_enabledebuginfo,2, std::nullopt},
 	{"getstackinfos",base_getstackinfos,2, ".n"},
-	{"getroottable",base_getroottable,1, nullptr},
-	{"setroottable",base_setroottable,2, nullptr},
-	{"getconsttable",base_getconsttable,1, nullptr},
-	{"setconsttable",base_setconsttable,2, nullptr},
+	{"getroottable",base_getroottable,1, std::nullopt},
+	{"setroottable",base_setroottable,2, std::nullopt},
+	{"getconsttable",base_getconsttable,1, std::nullopt},
+	{"setconsttable",base_setconsttable,2, std::nullopt},
 #endif
-	{"assert",base_assert,2, nullptr},
-	{"print",base_print,2, nullptr},
+	{"assert",base_assert,2, std::nullopt},
+	{"print",base_print,2, std::nullopt},
 #ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
 	{"compilestring",base_compilestring,-2, ".ss"},
 	{"newthread",base_newthread,2, ".c"},
-	{"suspend",base_suspend,-1, nullptr},
+	{"suspend",base_suspend,-1, std::nullopt},
 #endif
 	{"array",base_array,-2, ".n"},
-	{"type",base_type,2, nullptr},
+	{"type",base_type,2, std::nullopt},
 #ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
-	{"dummy",base_dummy,0,nullptr},
+	{"dummy",base_dummy,0,std::nullopt},
 #ifndef NO_GARBAGE_COLLECTOR
 	{"collectgarbage",base_collectgarbage,1, "t"},
 #endif
 #endif
-	{nullptr,nullptr,0,nullptr}
 };

 void sq_base_register(HSQUIRRELVM v)
 {
-	SQInteger i=0;
 	sq_pushroottable(v);
-	while(base_funcs[i].name!=nullptr) {
-		sq_pushstring(v,base_funcs[i].name,-1);
-		sq_newclosure(v,base_funcs[i].f,0);
-		sq_setnativeclosurename(v,-1,base_funcs[i].name);
-		sq_setparamscheck(v,base_funcs[i].nparamscheck,base_funcs[i].typemask);
+	for(auto &func : base_funcs) {
+		sq_pushstring(v,func.name);
+		sq_newclosure(v,func.f,0);
+		sq_setnativeclosurename(v,-1,func.name);
+		sq_setparamscheck(v,func.nparamscheck,func.typemask);
 		sq_createslot(v,-3);
-		i++;
 	}
-	sq_pushstring(v,"_version_",-1);
-	sq_pushstring(v,SQUIRREL_VERSION,-1);
+	sq_pushstring(v,"_version_");
+	sq_pushstring(v,SQUIRREL_VERSION);
 	sq_createslot(v,-3);
-	sq_pushstring(v,"_charsize_",-1);
-	sq_pushinteger(v,sizeof(SQChar));
+	sq_pushstring(v,"_charsize_");
+	sq_pushinteger(v,sizeof(char));
 	sq_createslot(v,-3);
-	sq_pushstring(v,"_intsize_",-1);
+	sq_pushstring(v,"_intsize_");
 	sq_pushinteger(v,sizeof(SQInteger));
 	sq_createslot(v,-3);
-	sq_pushstring(v,"_floatsize_",-1);
+	sq_pushstring(v,"_floatsize_");
 	sq_pushinteger(v,sizeof(SQFloat));
 	sq_createslot(v,-3);
 	sq_pop(v,1);
@@ -370,8 +369,8 @@ static SQInteger obj_clear(HSQUIRRELVM v)
 static SQInteger number_delegate_tochar(HSQUIRRELVM v)
 {
 	SQObject &o=stack_get(v,1);
-	SQChar c = (SQChar)tointeger(o);
-	v->Push(SQString::Create(_ss(v),(const SQChar *)&c,1));
+	char c = static_cast<char>(tointeger(o));
+	v->Push(SQString::Create(_ss(v),std::string_view(&c, 1)));
 	return 1;
 }

@@ -409,16 +408,15 @@ static SQInteger table_rawget(HSQUIRRELVM v)
 }


-SQRegFunction SQSharedState::_table_default_delegate_funcz[]={
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_table_default_delegate_funcz={
 	{"len",default_delegate_len,1, "t"},
 	{"rawget",table_rawget,2, "t"},
 	{"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, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
 	{"clear",obj_clear,1, "."},
-	{nullptr,nullptr,0,nullptr}
 };

 //ARRAY DEFAULT DELEGATE///////////////////////////////////////
@@ -611,7 +609,7 @@ static SQInteger array_slice(HSQUIRRELVM v)

 }

-SQRegFunction SQSharedState::_array_default_delegate_funcz[]={
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_array_default_delegate_funcz={
 	{"len",default_delegate_len,1, "a"},
 	{"append",array_append,2, "a"},
 	{"extend",array_extend,2, "aa"},
@@ -624,10 +622,9 @@ 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, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
 	{"clear",obj_clear,1, "."},
-	{nullptr,nullptr,0,nullptr}
 };

 //STRING DEFAULT DELEGATE//////////////////////////
@@ -636,25 +633,25 @@ static SQInteger string_slice(HSQUIRRELVM v)
 	SQInteger sidx,eidx;
 	SQObjectPtr o;
 	if(SQ_FAILED(get_slice_params(v,sidx,eidx,o)))return -1;
-	SQInteger slen = _string(o)->_len;
+	SQInteger slen = _string(o)->View().size();
 	if(sidx < 0)sidx = slen + sidx;
 	if(eidx < 0)eidx = slen + eidx;
 	if(eidx < sidx)	return sq_throwerror(v,"wrong indexes");
 	if(eidx > slen)	return sq_throwerror(v,"slice out of range");
-	v->Push(SQString::Create(_ss(v),&_stringval(o)[sidx],eidx-sidx));
+	v->Push(SQString::Create(_ss(v),_stringval(o).substr(sidx,eidx-sidx)));
 	return 1;
 }

 static SQInteger string_find(HSQUIRRELVM v)
 {
 	SQInteger top,start_idx=0;
-	const SQChar *str,*substr,*ret;
-	if(((top=sq_gettop(v))>1) && SQ_SUCCEEDED(sq_getstring(v,1,&str)) && SQ_SUCCEEDED(sq_getstring(v,2,&substr))){
+	std::string_view str,substr;
+	if(((top=sq_gettop(v))>1) && SQ_SUCCEEDED(sq_getstring(v,1,str)) && SQ_SUCCEEDED(sq_getstring(v,2,substr))){
 		if(top>2)sq_getinteger(v,3,&start_idx);
 		if((sq_getsize(v,1)>start_idx) && (start_idx>=0)){
-			ret=strstr(&str[start_idx],substr);
-			if(ret){
-				sq_pushinteger(v,(SQInteger)(ret-str));
+			auto ret = str.find(substr, start_idx);
+			if(ret != std::string_view::npos){
+				sq_pushinteger(v,static_cast<SQInteger>(ret));
 				return 1;
 			}
 		}
@@ -666,11 +663,11 @@ static SQInteger string_find(HSQUIRRELVM v)
 #define STRING_TOFUNCZ(func) static SQInteger string_##func(HSQUIRRELVM v) \
 { \
 	SQObject str=stack_get(v,1); \
-	SQInteger len=_string(str)->_len; \
-	const SQChar *sThis=_stringval(str); \
-	SQChar *sNew=(_ss(v)->GetScratchPad(len)); \
-	for(SQInteger i=0;i<len;i++) sNew[i]=func(sThis[i]); \
-	v->Push(SQString::Create(_ss(v),sNew,len)); \
+	std::string_view sThis=_stringval(str); \
+	size_t len=sThis.size(); \
+	std::span<char> sNew=(_ss(v)->GetScratchPad(len)); \
+	for(size_t i=0;i<len;i++) sNew[i]=func(sThis[i]); \
+	v->Push(SQString::Create(_ss(v),std::string_view(sNew.data(), len))); \
 	return 1; \
 }

@@ -678,7 +675,7 @@ static SQInteger string_find(HSQUIRRELVM v)
 STRING_TOFUNCZ(tolower)
 STRING_TOFUNCZ(toupper)

-SQRegFunction SQSharedState::_string_default_delegate_funcz[]={
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_string_default_delegate_funcz={
 	{"len",default_delegate_len,1, "s"},
 	{"tointeger",default_delegate_tointeger,1, "s"},
 	{"tofloat",default_delegate_tofloat,1, "s"},
@@ -687,18 +684,16 @@ 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, std::nullopt },
 };

 //INTEGER DEFAULT DELEGATE//////////////////////////
-SQRegFunction SQSharedState::_number_default_delegate_funcz[]={
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_number_default_delegate_funcz={
 	{"tointeger",default_delegate_tointeger,1, "n|b"},
 	{"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, std::nullopt },
 };

 //CLOSURE DEFAULT DELEGATE//////////////////////////
@@ -749,19 +744,19 @@ static SQInteger closure_getinfos(HSQUIRRELVM v) {
 			_array(params)->Set((SQInteger)n,f->_parameters[n]);
 		}
 		if(f->_varparams) {
-			_array(params)->Set(nparams-1,SQString::Create(_ss(v),"...",-1));
+			_array(params)->Set(nparams-1,SQString::Create(_ss(v),"..."));
 		}
-		res->NewSlot(SQString::Create(_ss(v),"native",-1),false);
-		res->NewSlot(SQString::Create(_ss(v),"name",-1),f->_name);
-		res->NewSlot(SQString::Create(_ss(v),"src",-1),f->_sourcename);
-		res->NewSlot(SQString::Create(_ss(v),"parameters",-1),params);
-		res->NewSlot(SQString::Create(_ss(v),"varargs",-1),f->_varparams);
+		res->NewSlot(SQString::Create(_ss(v),"native"),false);
+		res->NewSlot(SQString::Create(_ss(v),"name"),f->_name);
+		res->NewSlot(SQString::Create(_ss(v),"src"),f->_sourcename);
+		res->NewSlot(SQString::Create(_ss(v),"parameters"),params);
+		res->NewSlot(SQString::Create(_ss(v),"varargs"),f->_varparams);
 	}
 	else { //OT_NATIVECLOSURE
 		SQNativeClosure *nc = _nativeclosure(o);
-		res->NewSlot(SQString::Create(_ss(v),"native",-1),true);
-		res->NewSlot(SQString::Create(_ss(v),"name",-1),nc->_name);
-		res->NewSlot(SQString::Create(_ss(v),"paramscheck",-1),nc->_nparamscheck);
+		res->NewSlot(SQString::Create(_ss(v),"native"),true);
+		res->NewSlot(SQString::Create(_ss(v),"name"),nc->_name);
+		res->NewSlot(SQString::Create(_ss(v),"paramscheck"),nc->_nparamscheck);
 		SQObjectPtr typecheck;
 		if(!nc->_typecheck.empty()) {
 			typecheck =
@@ -770,23 +765,22 @@ static SQInteger closure_getinfos(HSQUIRRELVM v) {
 					_array(typecheck)->Set((SQInteger)n,nc->_typecheck[n]);
 			}
 		}
-		res->NewSlot(SQString::Create(_ss(v),"typecheck",-1),typecheck);
+		res->NewSlot(SQString::Create(_ss(v),"typecheck"),typecheck);
 	}
 	v->Push(res);
 	return 1;
 }


-SQRegFunction SQSharedState::_closure_default_delegate_funcz[]={
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_closure_default_delegate_funcz={
 	{"call",closure_call,-1, "c"},
 	{"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, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
 	{"bindenv",closure_bindenv,2, "c x|y|t"},
 	{"getinfos",closure_getinfos,1, "c"},
-	{nullptr,nullptr,0,nullptr}
 };

 //GENERATOR DEFAULT DELEGATE
@@ -801,11 +795,10 @@ static SQInteger generator_getstatus(HSQUIRRELVM v)
 	return 1;
 }

-SQRegFunction SQSharedState::_generator_default_delegate_funcz[]={
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_generator_default_delegate_funcz={
 	{"getstatus",generator_getstatus,1, "g"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
-	{nullptr,nullptr,0,nullptr}
 };

 //THREAD DEFAULT DELEGATE
@@ -871,13 +864,13 @@ static SQInteger thread_getstatus(HSQUIRRELVM v)
 	SQObjectPtr &o = stack_get(v,1);
 	switch(sq_getvmstate(_thread(o))) {
 		case SQ_VMSTATE_IDLE:
-			sq_pushstring(v,"idle",-1);
+			sq_pushstring(v,"idle");
 		break;
 		case SQ_VMSTATE_RUNNING:
-			sq_pushstring(v,"running",-1);
+			sq_pushstring(v,"running");
 		break;
 		case SQ_VMSTATE_SUSPENDED:
-			sq_pushstring(v,"suspended",-1);
+			sq_pushstring(v,"suspended");
 		break;
 		default:
 			return sq_throwerror(v,"internal VM error");
@@ -885,13 +878,12 @@ static SQInteger thread_getstatus(HSQUIRRELVM v)
 	return 1;
 }

-SQRegFunction SQSharedState::_thread_default_delegate_funcz[] = {
+/* static */ const std::initializer_list<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, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
-	{nullptr,nullptr,0,nullptr},
 };

 static SQInteger class_getattributes(HSQUIRRELVM v)
@@ -915,14 +907,13 @@ static SQInteger class_instance(HSQUIRRELVM v)
 	return SQ_ERROR;
 }

-SQRegFunction SQSharedState::_class_default_delegate_funcz[] = {
+/* static */ const std::initializer_list<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, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
 	{"instance",class_instance,1, "y"},
-	{nullptr,nullptr,0,nullptr}
 };

 static SQInteger instance_getclass(HSQUIRRELVM v)
@@ -932,12 +923,11 @@ static SQInteger instance_getclass(HSQUIRRELVM v)
 	return SQ_ERROR;
 }

-SQRegFunction SQSharedState::_instance_default_delegate_funcz[] = {
+/* static */ const std::initializer_list<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, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
-	{nullptr,nullptr,0,nullptr}
 };

 static SQInteger weakref_ref(HSQUIRRELVM v)
@@ -947,11 +937,10 @@ static SQInteger weakref_ref(HSQUIRRELVM v)
 	return 1;
 }

-SQRegFunction SQSharedState::_weakref_default_delegate_funcz[] = {
+/* static */ const std::initializer_list<SQRegFunction> SQSharedState::_weakref_default_delegate_funcz = {
 	{"ref",weakref_ref,1, "r"},
-	{"weakref",obj_delegate_weakref,1, nullptr },
+	{"weakref",obj_delegate_weakref,1, std::nullopt },
 	{"tostring",default_delegate_tostring,1, "."},
-	{nullptr,nullptr,0,nullptr}
 };


@@ -34,7 +34,7 @@ struct SQClass : public CHAINABLE_OBJ
 public:
 	static SQClass* Create(SQSharedState *ss,SQClass *base) {
 		SQClass *newclass = (SQClass *)SQ_MALLOC(sizeof(SQClass));
-		new (newclass) SQClass(ss, base);
+		new (newclass, sizeof(SQClass)) SQClass(ss, base);
 		return newclass;
 	}
 	~SQClass();
@@ -90,7 +90,7 @@ public:

 		SQInteger size = calcinstancesize(theclass);
 		SQInstance *newinst = (SQInstance *)SQ_MALLOC(size);
-		new (newinst) SQInstance(ss, theclass,size);
+		new (newinst, size) SQInstance(ss, theclass,size);
 		if(theclass->_udsize) {
 			newinst->_userpointer = ((unsigned char *)newinst) + (size - theclass->_udsize);
 		}
@@ -100,7 +100,7 @@ public:
 	{
 		SQInteger size = calcinstancesize(_class);
 		SQInstance *newinst = (SQInstance *)SQ_MALLOC(size);
-		new (newinst) SQInstance(ss, this,size);
+		new (newinst, size) SQInstance(ss, this,size);
 		if(_class->_udsize) {
 			newinst->_userpointer = ((unsigned char *)newinst) + (size - _class->_udsize);
 		}
@@ -11,7 +11,7 @@ private:
 public:
 	static SQClosure *Create(SQSharedState *ss,SQFunctionProto *func){
 		SQClosure *nc=(SQClosure*)SQ_MALLOC(sizeof(SQClosure));
-		new (nc) SQClosure(ss,func);
+		new (nc, sizeof(SQClosure)) SQClosure(ss,func);
 		return nc;
 	}
 	void Release() override {
@@ -49,7 +49,7 @@ private:
 public:
 	static SQGenerator *Create(SQSharedState *ss,SQClosure *closure){
 		SQGenerator *nc=(SQGenerator*)SQ_MALLOC(sizeof(SQGenerator));
-		new (nc) SQGenerator(ss,closure);
+		new (nc, sizeof(SQGenerator)) SQGenerator(ss,closure);
 		return nc;
 	}
 	~SQGenerator()
@@ -85,7 +85,7 @@ public:
 	static SQNativeClosure *Create(SQSharedState *ss,SQFUNCTION func)
 	{
 		SQNativeClosure *nc=(SQNativeClosure*)SQ_MALLOC(sizeof(SQNativeClosure));
-		new (nc) SQNativeClosure(ss,func);
+		new (nc, sizeof(SQNativeClosure)) SQNativeClosure(ss,func);
 		return nc;
 	}
 	SQNativeClosure *Clone()
@@ -57,16 +57,12 @@ 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), _debugline(0), _debugop(0)
+	SQCompiler(SQVM *v, SQLEXREADFUNC rg, SQUserPointer up, std::string_view sourcename, bool raiseerror, bool lineinfo) : _token(0), _fs(nullptr), _lex(_ss(v), rg, up), _debugline(0), _debugop(0)
 	{
 		_vm=v;
 		_sourcename = SQString::Create(_ss(v), sourcename);
 		_lineinfo = lineinfo;_raiseerror = raiseerror;
 	}
-	[[noreturn]] void Error(const std::string &msg)
-	{
-		throw CompileException(msg);
-	}
 	void Lex(){	_token = _lex.Lex();}
 	void PushExpState(){ _expstates.push_back(ExpState()); }
 	bool IsDerefToken(SQInteger tok)
@@ -92,7 +88,7 @@ public:
 				//do nothing
 			}
 			else {
-				const SQChar *etypename;
+				std::string_view etypename;
 				if(tok > 255) {
 					switch(tok)
 					{
@@ -109,21 +105,21 @@ public:
 						etypename = "FLOAT";
 						break;
 					default:
-						etypename = _lex.Tok2Str(tok);
+						etypename = _lex.Tok2Str(tok).value_or("<unknown>");
 					}
-					Error(fmt::format("expected '{}'", etypename));
+					throw CompileException(fmt::format("expected '{}'", etypename));
 				}
-				Error(fmt::format("expected '{:c}'", tok));
+				throw CompileException(fmt::format("expected '{:c}'", tok));
 			}
 		}
 		SQObjectPtr ret;
 		switch(tok)
 		{
 		case TK_IDENTIFIER:
-			ret = _fs->CreateString(_lex._svalue);
+			ret = _fs->CreateString(_lex.View());
 			break;
 		case TK_STRING_LITERAL:
-			ret = _fs->CreateString(_lex._svalue,_lex._longstr.size()-1);
+			ret = _fs->CreateString(_lex.View());
 			break;
 		case TK_INTEGER:
 			ret = SQObjectPtr(_lex._nvalue);
@@ -140,7 +136,7 @@ public:
 	{
 		if(_token == ';') { Lex(); return; }
 		if(!IsEndOfStatement()) {
-			Error("end of statement expected (; or lf)");
+			throw CompileException("end of statement expected (; or lf)");
 		}
 	}
 	void MoveIfCurrentTargetIsLocal() {
@@ -233,7 +229,7 @@ public:
 			}
 			break;}
 		case TK_BREAK:
-			if(_fs->_breaktargets.size() <= 0)Error("'break' has to be in a loop block");
+			if(_fs->_breaktargets.size() <= 0)throw CompileException("'break' has to be in a loop block");
 			if(_fs->_breaktargets.top() > 0){
 				_fs->AddInstruction(_OP_POPTRAP, _fs->_breaktargets.top(), 0);
 			}
@@ -243,7 +239,7 @@ public:
 			Lex();
 			break;
 		case TK_CONTINUE:
-			if(_fs->_continuetargets.size() <= 0)Error("'continue' has to be in a loop block");
+			if(_fs->_continuetargets.size() <= 0)throw CompileException("'continue' has to be in a loop block");
 			if(_fs->_continuetargets.top() > 0) {
 				_fs->AddInstruction(_OP_POPTRAP, _fs->_continuetargets.top(), 0);
 			}
@@ -356,19 +352,19 @@ public:
 				SQInteger op = _token;
 				SQInteger ds = _exst._deref;
 				bool freevar = _exst._freevar;
-				if(ds == DEREF_NO_DEREF) Error("can't assign expression");
+				if(ds == DEREF_NO_DEREF) throw CompileException("can't assign expression");
 				Lex(); Expression();

 				switch(op){
 				case TK_NEWSLOT:
-					if(freevar) Error("free variables cannot be modified");
+					if(freevar) throw CompileException("free variables cannot be modified");
 					if(ds == DEREF_FIELD)
 						EmitDerefOp(_OP_NEWSLOT);
 					else //if _derefstate != DEREF_NO_DEREF && DEREF_FIELD so is the index of a local
-						Error("can't 'create' a local slot");
+						throw CompileException("can't 'create' a local slot");
 					break;
 				case '=': //ASSIGN
-					if(freevar) Error("free variables cannot be modified");
+					if(freevar) throw CompileException("free variables cannot be modified");
 					if(ds == DEREF_FIELD)
 						EmitDerefOp(_OP_SET);
 					else {//if _derefstate != DEREF_NO_DEREF && DEREF_FIELD so is the index of a local
@@ -533,7 +529,7 @@ public:
 				if(_token == TK_PARENT) {
 					Lex();
 					if(!NeedGet())
-						Error("parent cannot be set");
+						throw CompileException("parent cannot be set");
 					SQInteger src = _fs->PopTarget();
 					_fs->AddInstruction(_OP_GETPARENT, _fs->PushTarget(), src);
 				}
@@ -546,7 +542,7 @@ public:
 				}
 				break;
 			case '[':
-				if(_lex._prevtoken == '\n') Error("cannot brake deref/or comma needed after [exp]=exp slot declaration");
+				if(_lex._prevtoken == '\n') throw CompileException("cannot brake deref/or comma needed after [exp]=exp slot declaration");
 				Lex(); Expression(); Expect(']');
 				pos = -1;
 				if(NeedGet()) Emit2ArgsOP(_OP_GET);
@@ -598,7 +594,7 @@ public:
 		switch(_token)
 		{
 		case TK_STRING_LITERAL: {
-				_fs->AddInstruction(_OP_LOAD, _fs->PushTarget(), _fs->GetConstant(_fs->CreateString(_lex._svalue,_lex._longstr.size()-1)));
+				_fs->AddInstruction(_OP_LOAD, _fs->PushTarget(), _fs->GetConstant(_fs->CreateString(_lex.View())));
 				Lex();
 			}
 			break;
@@ -618,7 +614,7 @@ public:
 			SQObject id;
 			SQObject constant;
 				switch(_token) {
-					case TK_IDENTIFIER: id = _fs->CreateString(_lex._svalue); break;
+					case TK_IDENTIFIER: id = _fs->CreateString(_lex.View()); break;
 					case TK_THIS: id = _fs->CreateString("this"); break;
 					case TK_CONSTRUCTOR: id = _fs->CreateString("constructor"); break;
 				}
@@ -638,7 +634,7 @@ public:
 							Expect('.'); constid = Expect(TK_IDENTIFIER);
 							if(!_table(constant)->Get(constid,constval)) {
 								constval.Null();
-								Error(fmt::format("invalid constant [{}.{}]", _stringval(id),_stringval(constid)));
+								throw CompileException(fmt::format("invalid constant [{}.{}]", _stringval(id),_stringval(constid)));
 							}
 						}
 						else {
@@ -742,7 +738,7 @@ public:
 		case TK_DELEGATE : DelegateExpr(); break;
 		case '(': Lex(); CommaExpr(); Expect(')');
 			break;
-		default: Error("expression expected");
+		default: throw CompileException("expression expected");
 		}
 		return -1;
 	}
@@ -771,7 +767,7 @@ public:
 			 nargs++;
 			 if(_token == ','){
 				 Lex();
-				 if(_token == ')') Error("expression expected, found ')'");
+				 if(_token == ')') throw CompileException("expression expected, found ')'");
 			 }
 		 }
 		 Lex();
@@ -1082,13 +1078,13 @@ public:
 		_exst._funcarg = false;
 		PrefixedExpr();
 		es = PopExpState();
-		if(es._deref == DEREF_NO_DEREF) Error("invalid class name");
+		if(es._deref == DEREF_NO_DEREF) throw CompileException("invalid class name");
 		if(es._deref == DEREF_FIELD) {
 			ClassExp();
 			EmitDerefOp(_OP_NEWSLOT);
 			_fs->PopTarget();
 		}
-		else Error("cannot create a class in a local with the syntax(class <local>)");
+		else throw CompileException("cannot create a class in a local with the syntax(class <local>)");
 	}
 	SQObject ExpectScalar()
 	{
@@ -1103,7 +1099,7 @@ public:
 				val._unVal.fFloat = _lex._fvalue;
 				break;
 			case TK_STRING_LITERAL:
-				val = _fs->CreateString(_lex._svalue,_lex._longstr.size()-1);
+				val = _fs->CreateString(_lex.View());
 				break;
 			case '-':
 				Lex();
@@ -1118,12 +1114,12 @@ public:
 					val._unVal.fFloat = -_lex._fvalue;
 				break;
 				default:
-					Error("scalar expected : integer,float");
+					throw CompileException("scalar expected : integer,float");
 					val._type = OT_NULL; // Silent compile-warning
 				}
 				break;
 			default:
-				Error("scalar expected : integer,float or string");
+				throw CompileException("scalar expected : integer,float or string");
 				val._type = OT_NULL; // Silent compile-warning
 		}
 		Lex();
@@ -1226,9 +1222,9 @@ public:
 		_exst._funcarg = false;
 		PrefixedExpr();
 		es = PopExpState();
-		if(es._deref == DEREF_NO_DEREF) Error("can't delete an expression");
+		if(es._deref == DEREF_NO_DEREF) throw CompileException("can't delete an expression");
 		if(es._deref == DEREF_FIELD) Emit2ArgsOP(_OP_DELETE);
-		else Error("cannot delete a local");
+		else throw CompileException("cannot delete a local");
 	}
 	void PrefixIncDec(SQInteger token)
 	{
@@ -1255,10 +1251,10 @@ public:
 		SQInteger defparams = 0;
 		while(_token!=')') {
 			if(_token == TK_VARPARAMS) {
-				if(defparams > 0) Error("function with default parameters cannot have variable number of parameters");
+				if(defparams > 0) throw CompileException("function with default parameters cannot have variable number of parameters");
 				funcstate->_varparams = true;
 				Lex();
-				if(_token != ')') Error("expected ')'");
+				if(_token != ')') throw CompileException("expected ')'");
 				break;
 			}
 			else {
@@ -1271,10 +1267,10 @@ public:
 					defparams++;
 				}
 				else {
-					if(defparams > 0) Error("expected '='");
+					if(defparams > 0) throw CompileException("expected '='");
 				}
 				if(_token == ',') Lex();
-				else if(_token != ')') Error("expected ')' or ','");
+				else if(_token != ')') throw CompileException("expected ')' or ','");
 			}
 		}
 		Expect(')');
@@ -1289,7 +1285,7 @@ public:
 				//outers are treated as implicit local variables
 				funcstate->AddOuterValue(paramname);
 				if(_token == ',') Lex();
-				else if(_token != ')') Error("expected ')' or ','");
+				else if(_token != ')') throw CompileException("expected ')' or ','");
 			}
 			Lex();
 		}
@@ -1346,7 +1342,7 @@ private:
 	SQVM *_vm;
 };

-bool Compile(SQVM *vm,SQLEXREADFUNC rg, SQUserPointer up, const SQChar *sourcename, SQObjectPtr &out, bool raiseerror, bool lineinfo)
+bool Compile(SQVM *vm,SQLEXREADFUNC rg, SQUserPointer up, std::string_view sourcename, SQObjectPtr &out, bool raiseerror, bool lineinfo)
 {
 	SQCompiler p(vm, rg, up, sourcename, raiseerror, lineinfo);
 	return p.Compile(out);
@@ -73,5 +73,5 @@ struct SQVM;

 using CompileException = std::runtime_error;

-bool Compile(SQVM *vm, SQLEXREADFUNC rg, SQUserPointer up, const SQChar *sourcename, SQObjectPtr &out, bool raiseerror, bool lineinfo);
+bool Compile(SQVM *vm, SQLEXREADFUNC rg, SQUserPointer up, std::string_view sourcename, SQObjectPtr &out, bool raiseerror, bool lineinfo);
 #endif //_SQCOMPILER_H_
@@ -37,7 +37,7 @@ SQRESULT sq_stackinfos(HSQUIRRELVM v, SQInteger level, SQStackInfos *si)
 {
 	SQInteger cssize = v->_callsstacksize;
 	if (cssize > level) {
-		memset(si, 0, sizeof(SQStackInfos));
+		*si = {};
 		SQVM::CallInfo &ci = v->_callsstack[cssize-level-1];
 		switch (type(ci._closure)) {
 		case OT_CLOSURE:{
@@ -101,15 +101,15 @@ void SQVM::Raise_CompareError(const SQObject &o1, const SQObject &o2)

 void SQVM::Raise_ParamTypeError(SQInteger nparam,SQInteger typemask,SQInteger type)
 {
-	SQObjectPtr exptypes = SQString::Create(_ss(this), "", -1);
+	SQObjectPtr exptypes = SQString::Create(_ss(this), "");
 	SQInteger found = 0;
 	for(SQInteger i=0; i<16; i++)
 	{
 		SQInteger mask = 0x00000001LL << i;
 		if(typemask & (mask)) {
-			if(found>0) StringCat(exptypes,SQString::Create(_ss(this), "|", -1), exptypes);
+			if(found>0) StringCat(exptypes,SQString::Create(_ss(this), "|"), exptypes);
 			found ++;
-			StringCat(exptypes,SQString::Create(_ss(this), IdType2Name((SQObjectType)mask), -1), exptypes);
+			StringCat(exptypes,SQString::Create(_ss(this), IdType2Name((SQObjectType)mask)), exptypes);
 		}
 	}
 	Raise_Error(fmt::format("parameter {} has an invalid type '{}' ; expected: '{}'", nparam, IdType2Name((SQObjectType)type), _stringval(exptypes)));
@@ -99,8 +99,9 @@ public:
 	{
 		SQFunctionProto *f;
 		//I compact the whole class and members in a single memory allocation
-		f = (SQFunctionProto *)sq_vm_malloc(_FUNC_SIZE(ninstructions,nliterals,nparameters,nfunctions,noutervalues,nlineinfos,nlocalvarinfos,ndefaultparams));
-		new (f) SQFunctionProto(ninstructions, nliterals, nparameters, nfunctions, noutervalues, nlineinfos, nlocalvarinfos, ndefaultparams);
+		SQInteger size = _FUNC_SIZE(ninstructions, nliterals, nparameters, nfunctions, noutervalues, nlineinfos, nlocalvarinfos, ndefaultparams);
+		f = (SQFunctionProto *)sq_vm_malloc(size);
+		new (f, size) SQFunctionProto(ninstructions, nliterals, nparameters, nfunctions, noutervalues, nlineinfos, nlocalvarinfos, ndefaultparams);
 		return f;
 	}
 	void Release() override {
@@ -114,7 +115,7 @@ public:
 		this->~SQFunctionProto();
 		sq_vm_free(this,size);
 	}
-	const SQChar* GetLocal(SQVM *v,SQUnsignedInteger stackbase,SQUnsignedInteger nseq,SQUnsignedInteger nop);
+	std::optional<std::string_view> GetLocal(SQVM *v,SQUnsignedInteger stackbase,SQUnsignedInteger nseq,SQUnsignedInteger nop);
 	SQInteger GetLine(SQInstruction *curr);
 	bool Save(SQVM *v,SQUserPointer up,SQWRITEFUNC write);
 	static bool Load(SQVM *v,SQUserPointer up,SQREADFUNC read,SQObjectPtr &ret);
@@ -110,11 +110,6 @@ SQFuncState::SQFuncState(SQSharedState *ss,SQFuncState *parent)

 }

-void SQFuncState::Error(const SQChar *err)
-{
-	throw CompileException(err);
-}
-
 #ifdef _DEBUG_DUMP
 void SQFuncState::Dump(SQFunctionProto *func)
 {
@@ -234,7 +229,7 @@ SQInteger SQFuncState::GetConstant(const SQObject &cons)
 		_nliterals++;
 		if(_nliterals > MAX_LITERALS) {
 			val.Null();
-			Error("internal compiler error: too many literals");
+			throw CompileException("internal compiler error: too many literals");
 		}
 	}
 	return _integer(val);
@@ -264,7 +259,7 @@ SQInteger SQFuncState::AllocStackPos()
 	SQInteger npos=_vlocals.size();
 	_vlocals.push_back(SQLocalVarInfo());
 	if(_vlocals.size()>((SQUnsignedInteger)_stacksize)) {
-		if(_stacksize>MAX_FUNC_STACKSIZE) Error("internal compiler error: too many locals");
+		if(_stacksize>MAX_FUNC_STACKSIZE) throw CompileException("internal compiler error: too many locals");
 		_stacksize=_vlocals.size();
 	}
 	return npos;
@@ -499,9 +494,9 @@ void SQFuncState::AddInstruction(SQInstruction &i)
 	_instructions.push_back(i);
 }

-SQObject SQFuncState::CreateString(const SQChar *s,SQInteger len)
+SQObject SQFuncState::CreateString(std::string_view s)
 {
-	SQObjectPtr ns(SQString::Create(_sharedstate,s,len));
+	SQObjectPtr ns(SQString::Create(_sharedstate,s));
 	_table(_strings)->NewSlot(ns,(SQInteger)1);
 	return std::move(ns);
 }
@@ -539,7 +534,7 @@ SQFunctionProto *SQFuncState::BuildProto()
 	for(SQUnsignedInteger no = 0; no < _lineinfos.size(); no++) f->_lineinfos[no] = _lineinfos[no];
 	for(SQUnsignedInteger no = 0; no < _defaultparams.size(); no++) f->_defaultparams[no] = _defaultparams[no];

-	memcpy(f->_instructions,&_instructions[0],(size_t)_instructions.size()*sizeof(SQInstruction));
+	std::copy_n(&_instructions[0], _instructions.size(), f->_instructions);

 	f->_varparams = _varparams;

@@ -11,7 +11,6 @@ struct SQFuncState
 #ifdef _DEBUG_DUMP
 	void Dump(SQFunctionProto *func);
 #endif
-	[[noreturn]] void Error(const SQChar *err);
 	SQFuncState *PushChildState(SQSharedState *ss);
 	void PopChildState();
 	void AddInstruction(SQOpcode _op,SQInteger arg0=0,SQInteger arg1=0,SQInteger arg2=0,SQInteger arg3=0){SQInstruction i(_op,arg0,arg1,arg2,arg3);AddInstruction(i);}
@@ -43,7 +42,7 @@ struct SQFuncState
 	SQInteger TopTarget();
 	SQInteger GetUpTarget(SQInteger n);
 	bool IsLocal(SQUnsignedInteger stkpos);
-	SQObject CreateString(const SQChar *s,SQInteger len = -1);
+	SQObject CreateString(std::string_view s);
 	SQObject CreateTable();
 	bool IsConstant(const SQObject &name,SQObject &e);
 	SQInteger _returnexp;
@@ -12,6 +12,7 @@
 #include "sqlexer.h"

 #include "../../../core/utf8.hpp"
+#include "../../../core/string_consumer.hpp"

 #include "../../../safeguards.h"

@@ -84,22 +85,16 @@ SQLexer::SQLexer(SQSharedState *ss, SQLEXREADFUNC rg, SQUserPointer up)
 	_prevtoken = -1;
 	_curtoken = -1;

-	_svalue = nullptr;
 	_nvalue = 0;
 	_fvalue = 0;

 	Next();
 }

-[[noreturn]] void SQLexer::Error(const SQChar *err)
-{
-	throw CompileException(err);
-}
-
 void SQLexer::Next()
 {
 	char32_t t = _readf(_up);
-	if(t > MAX_CHAR) Error("Invalid character");
+	if(t > MAX_CHAR) throw CompileException("Invalid character");
 	if(t != 0) {
 		_currdata = t;
 		return;
@@ -107,7 +102,7 @@ void SQLexer::Next()
 	_currdata = SQUIRREL_EOB;
 }

-const SQChar *SQLexer::Tok2Str(SQInteger tok)
+std::optional<std::string_view> SQLexer::Tok2Str(SQInteger tok)
 {
 	SQObjectPtr itr, key, val;
 	SQInteger nitr;
@@ -116,7 +111,7 @@ const SQChar *SQLexer::Tok2Str(SQInteger tok)
 		if(((SQInteger)_integer(val)) == tok)
 			return _stringval(key);
 	}
-	return nullptr;
+	return std::nullopt;
 }

 void SQLexer::LexBlockComment()
@@ -126,7 +121,7 @@ void SQLexer::LexBlockComment()
 		switch(CUR_CHAR) {
 			case '*': { NEXT(); if(CUR_CHAR == '/') { done = true; NEXT(); }}; continue;
 			case '\n': _currentline++; NEXT(); continue;
-			case SQUIRREL_EOB: Error("missing \"*/\" in comment");
+			case SQUIRREL_EOB: throw CompileException("missing \"*/\" in comment");
 			default: NEXT();
 		}
 	}
@@ -195,11 +190,11 @@ SQInteger SQLexer::Lex()
 			SQInteger stype;
 			NEXT();
 			if(CUR_CHAR != '"')
-				Error("string expected");
+				throw CompileException("string expected");
 			if((stype=ReadString('"',true))!=-1) {
 				RETURN_TOKEN(stype);
 			}
-			Error("error parsing the string");
+			throw CompileException("error parsing the string");
 					   }
 		case '"':
 		case '\'': {
@@ -207,7 +202,7 @@ SQInteger SQLexer::Lex()
 			if((stype=ReadString(CUR_CHAR,false))!=-1){
 				RETURN_TOKEN(stype);
 			}
-			Error("error parsing the string");
+			throw CompileException("error parsing the string");
 			}
 		case '{': case '}': case '(': case ')': case '[': case ']':
 		case ';': case ',': case '?': case '^': case '~':
@@ -217,7 +212,7 @@ SQInteger SQLexer::Lex()
 			NEXT();
 			if (CUR_CHAR != '.'){ RETURN_TOKEN('.') }
 			NEXT();
-			if (CUR_CHAR != '.'){ Error("invalid token '..'"); }
+			if (CUR_CHAR != '.'){ throw CompileException("invalid token '..'"); }
 			NEXT();
 			RETURN_TOKEN(TK_VARPARAMS);
 		case '&':
@@ -263,7 +258,7 @@ SQInteger SQLexer::Lex()
 				}
 				else {
 					SQInteger c = CUR_CHAR;
-					if (iscntrl((int)c)) Error("unexpected character(control)");
+					if (iscntrl((int)c)) throw CompileException("unexpected character(control)");
 					NEXT();
 					RETURN_TOKEN(c);
 				}
@@ -274,7 +269,7 @@ SQInteger SQLexer::Lex()
 	return 0;
 }

-SQInteger SQLexer::GetIDType(SQChar *s)
+SQInteger SQLexer::GetIDType(std::string_view s)
 {
 	SQObjectPtr t;
 	if(_keywords->Get(SQString::Create(_sharedstate, s), t)) {
@@ -293,10 +288,10 @@ SQInteger SQLexer::ReadString(char32_t ndelim,bool verbatim)
 		while(CUR_CHAR != ndelim) {
 			switch(CUR_CHAR) {
 			case SQUIRREL_EOB:
-				Error("unfinished string");
+				throw CompileException("unfinished string");
 				return -1;
 			case '\n':
-				if(!verbatim) Error("newline in a constant");
+				if(!verbatim) throw CompileException("newline in a constant");
 				APPEND_CHAR(CUR_CHAR); NEXT();
 				_currentline++;
 				break;
@@ -308,18 +303,18 @@ SQInteger SQLexer::ReadString(char32_t ndelim,bool verbatim)
 					NEXT();
 					switch(CUR_CHAR) {
 					case 'x': NEXT(); {
-						if(!isxdigit(CUR_CHAR)) Error("hexadecimal number expected");
+						if(!isxdigit(CUR_CHAR)) throw CompileException("hexadecimal number expected");
 						const SQInteger maxdigits = 4;
-						SQChar temp[maxdigits+1];
-						SQInteger n = 0;
+						char temp[maxdigits];
+						size_t n = 0;
 						while(isxdigit(CUR_CHAR) && n < maxdigits) {
 							temp[n] = CUR_CHAR;
 							n++;
 							NEXT();
 						}
-						temp[n] = 0;
-						SQChar *sTemp;
-						APPEND_CHAR((SQChar)strtoul(temp,&sTemp,16));
+						auto val = ParseInteger(std::string_view{temp, n}, 16);
+						if (!val.has_value()) throw CompileException("hexadecimal number expected");
+						APPEND_CHAR(static_cast<char>(*val));
 					}
 				    break;
 					case 't': APPEND_CHAR('\t'); NEXT(); break;
@@ -334,7 +329,7 @@ SQInteger SQLexer::ReadString(char32_t ndelim,bool verbatim)
 					case '"': APPEND_CHAR('"'); NEXT(); break;
 					case '\'': APPEND_CHAR('\''); NEXT(); break;
 					default:
-						Error("unrecognised escaper char");
+						throw CompileException("unrecognised escaper char");
 					break;
 					}
 				}
@@ -353,49 +348,16 @@ SQInteger SQLexer::ReadString(char32_t ndelim,bool verbatim)
 			break;
 		}
 	}
-	TERMINATE_BUFFER();
-	SQInteger len = _longstr.size()-1;
 	if(ndelim == '\'') {
-		if(len == 0) Error("empty constant");
-		if(len > 1) Error("constant too long");
+		if(_longstr.empty()) throw CompileException("empty constant");
+		if(_longstr.size() > 1) throw CompileException("constant too long");
 		_nvalue = _longstr[0];
 		return TK_INTEGER;
 	}
-	_svalue = &_longstr[0];
 	return TK_STRING_LITERAL;
 }

-void LexHexadecimal(const SQChar *s,SQUnsignedInteger *res)
-{
-	*res = 0;
-	while(*s != 0)
-	{
-		if(isdigit(*s)) *res = (*res)*16+((*s++)-'0');
-		else if(isxdigit(*s)) *res = (*res)*16+(toupper(*s++)-'A'+10);
-		else { assert(0); }
-	}
-}
-
-void LexInteger(const SQChar *s,SQUnsignedInteger *res)
-{
-	*res = 0;
-	while(*s != 0)
-	{
-		*res = (*res)*10+((*s++)-'0');
-	}
-}
-
-SQInteger scisodigit(SQChar c) { return c >= '0' && c <= '7'; }
-
-void LexOctal(const SQChar *s,SQUnsignedInteger *res)
-{
-	*res = 0;
-	while(*s != 0)
-	{
-		if(scisodigit(*s)) *res = (*res)*8+((*s++)-'0');
-		else { assert(0); }
-	}
-}
+SQInteger scisodigit(char c) { return c >= '0' && c <= '7'; }

 SQInteger isexponent(SQInteger c) { return c == 'e' || c=='E'; }

@@ -409,7 +371,6 @@ SQInteger SQLexer::ReadNumber()
 #define TSCIENTIFIC 4
 #define TOCTAL 5
 	SQInteger type = TINT, firstchar = CUR_CHAR;
-	SQChar *sTemp;
 	INIT_TEMP_STRING();
 	NEXT();
 	if(firstchar == '0' && (toupper(CUR_CHAR) == 'X' || scisodigit(CUR_CHAR)) ) {
@@ -419,7 +380,7 @@ SQInteger SQLexer::ReadNumber()
 				APPEND_CHAR(CUR_CHAR);
 				NEXT();
 			}
-			if(isdigit(CUR_CHAR)) Error("invalid octal number");
+			if(isdigit(CUR_CHAR)) throw CompileException("invalid octal number");
 		}
 		else {
 			NEXT();
@@ -428,7 +389,7 @@ SQInteger SQLexer::ReadNumber()
 				APPEND_CHAR(CUR_CHAR);
 				NEXT();
 			}
-			if(_longstr.size() > MAX_HEX_DIGITS) Error("too many digits for an Hex number");
+			if(_longstr.size() > MAX_HEX_DIGITS) throw CompileException("too many digits for an Hex number");
 		}
 	}
 	else {
@@ -436,7 +397,7 @@ SQInteger SQLexer::ReadNumber()
 		while (CUR_CHAR == '.' || isdigit(CUR_CHAR) || isexponent(CUR_CHAR)) {
            if(CUR_CHAR == '.' || isexponent(CUR_CHAR)) type = TFLOAT;
 			if(isexponent(CUR_CHAR)) {
-				if(type != TFLOAT) Error("invalid numeric format");
+				if(type != TFLOAT) throw CompileException("invalid numeric format");
 				type = TSCIENTIFIC;
 				APPEND_CHAR(CUR_CHAR);
 				NEXT();
@@ -444,27 +405,29 @@ SQInteger SQLexer::ReadNumber()
 					APPEND_CHAR(CUR_CHAR);
 					NEXT();
 				}
-				if(!isdigit(CUR_CHAR)) Error("exponent expected");
+				if(!isdigit(CUR_CHAR)) throw CompileException("exponent expected");
 			}

 			APPEND_CHAR(CUR_CHAR);
 			NEXT();
 		}
 	}
-	TERMINATE_BUFFER();
 	switch(type) {
 	case TSCIENTIFIC:
-	case TFLOAT:
-		_fvalue = (SQFloat)strtod(&_longstr[0],&sTemp);
+	case TFLOAT: {
+		std::string str{View()};
+		char *sTemp;
+		_fvalue = (SQFloat)strtod(str.c_str(),&sTemp);
 		return TK_FLOAT;
+	}
 	case TINT:
-		LexInteger(&_longstr[0],(SQUnsignedInteger *)&_nvalue);
+		_nvalue = ParseInteger<SQUnsignedInteger>(View(), 10).value_or(0);
 		return TK_INTEGER;
 	case THEX:
-		LexHexadecimal(&_longstr[0],(SQUnsignedInteger *)&_nvalue);
+		_nvalue = ParseInteger<SQUnsignedInteger>(View(), 16).value_or(0);
 		return TK_INTEGER;
 	case TOCTAL:
-		LexOctal(&_longstr[0],(SQUnsignedInteger *)&_nvalue);
+		_nvalue = ParseInteger<SQUnsignedInteger>(View(), 8).value_or(0);
 		return TK_INTEGER;
 	}
 	return 0;
@@ -478,10 +441,6 @@ SQInteger SQLexer::ReadID()
 		APPEND_CHAR(CUR_CHAR);
 		NEXT();
 	} while(isalnum(CUR_CHAR) || CUR_CHAR == '_');
-	TERMINATE_BUFFER();
-	res = GetIDType(&_longstr[0]);
-	if(res == TK_IDENTIFIER || res == TK_CONSTRUCTOR) {
-		_svalue = &_longstr[0];
-	}
+	res = GetIDType(View());
 	return res;
 }
@@ -6,11 +6,10 @@ struct SQLexer
 {
 	~SQLexer();
 	SQLexer(SQSharedState *ss,SQLEXREADFUNC rg,SQUserPointer up);
-	[[noreturn]] void Error(const SQChar *err);
 	SQInteger Lex();
-	const SQChar *Tok2Str(SQInteger tok);
+	std::optional<std::string_view> Tok2Str(SQInteger tok);
 private:
-	SQInteger GetIDType(SQChar *s);
+	SQInteger GetIDType(std::string_view s);
 	SQInteger ReadString(char32_t ndelim,bool verbatim);
 	SQInteger ReadNumber();
 	void LexBlockComment();
@@ -20,21 +19,21 @@ private:
 	SQTable *_keywords;
 	void INIT_TEMP_STRING() { _longstr.resize(0); }
 	void APPEND_CHAR(char32_t c);
-	void TERMINATE_BUFFER() { _longstr.push_back('\0'); }

 public:
 	SQInteger _prevtoken;
 	SQInteger _currentline;
 	SQInteger _lasttokenline;
 	SQInteger _currentcolumn;
-	const SQChar *_svalue;
 	SQInteger _nvalue;
 	SQFloat _fvalue;
 	SQLEXREADFUNC _readf;
 	SQUserPointer _up;
 	char32_t _currdata;
 	SQSharedState *_sharedstate;
-	sqvector<SQChar> _longstr;
+	sqvector<char> _longstr;
+
+	std::string_view View() const { return std::string_view(_longstr._vals, _longstr.size()); }
 };

 #endif
@@ -18,7 +18,7 @@
 #include "../../../safeguards.h"


-const SQChar *IdType2Name(SQObjectType type)
+std::string_view IdType2Name(SQObjectType type)
 {
 	switch(_RAW_TYPE(type))
 	{
@@ -42,25 +42,25 @@ const SQChar *IdType2Name(SQObjectType type)
 	case _RT_INSTANCE: return "instance";
 	case _RT_WEAKREF: return "weakref";
 	default:
-		return nullptr;
+		NOT_REACHED();
 	}
 }

-const SQChar *GetTypeName(const SQObjectPtr &obj1)
+std::string_view GetTypeName(const SQObjectPtr &obj1)
 {
 	return IdType2Name(type(obj1));
 }

-SQString *SQString::Create(SQSharedState *ss,const SQChar *s,SQInteger len)
+SQString *SQString::Create(SQSharedState *ss,std::string_view s)
 {
-	SQString *str=ADD_STRING(ss,s,len);
+	SQString *str=ss->_stringtable->Add(s);
 	str->_sharedstate=ss;
 	return str;
 }

 void SQString::Release()
 {
-	REMOVE_STRING(_sharedstate,this);
+	_sharedstate->_stringtable->Remove(this);
 }

 SQInteger SQString::Next(const SQObjectPtr &refpos, SQObjectPtr &outkey, SQObjectPtr &outval)
@@ -91,7 +91,8 @@ SQUnsignedInteger TranslateIndex(const SQObjectPtr &idx)
 SQWeakRef *SQRefCounted::GetWeakRef(SQObjectType type)
 {
 	if(!_weakref) {
-		sq_new(_weakref,SQWeakRef);
+		_weakref = (SQWeakRef *)sq_vm_malloc(sizeof(SQWeakRef));
+		new (_weakref, sizeof(SQWeakRef)) SQWeakRef();
 		_weakref->_obj._type = type;
 		_weakref->_obj._unVal.pRefCounted = this;
 	}
@@ -202,24 +203,21 @@ void SQArray::Extend(const SQArray *a){
 			Append(a->_values[i]);
 }

-const SQChar* SQFunctionProto::GetLocal(SQVM *vm,SQUnsignedInteger stackbase,SQUnsignedInteger nseq,SQUnsignedInteger nop)
+std::optional<std::string_view> SQFunctionProto::GetLocal(SQVM *vm,SQUnsignedInteger stackbase,SQUnsignedInteger nseq,SQUnsignedInteger nop)
 {
 	SQUnsignedInteger nvars=_nlocalvarinfos;
-	const SQChar *res=nullptr;
 	if(nvars>=nseq){
 		for(SQUnsignedInteger i=0;i<nvars;i++){
-			if(_localvarinfos[i]._start_op<=nop && _localvarinfos[i]._end_op>=nop)
-			{
+			if(_localvarinfos[i]._start_op<=nop && _localvarinfos[i]._end_op>=nop) {
 				if(nseq==0){
 					vm->Push(vm->_stack[stackbase+_localvarinfos[i]._pos]);
-					res=_stringval(_localvarinfos[i]._name);
-					break;
+					return _stringval(_localvarinfos[i]._name);
 				}
 				nseq--;
 			}
 		}
 	}
-	return res;
+	return std::nullopt;
 }

 SQInteger SQFunctionProto::GetLine(SQInstruction *curr)
@@ -273,10 +271,13 @@ bool WriteObject(HSQUIRRELVM v,SQUserPointer up,SQWRITEFUNC write,SQObjectPtr &o
 {
 	_CHECK_IO(SafeWrite(v,write,up,&type(o),sizeof(SQObjectType)));
 	switch(type(o)){
-	case OT_STRING:
-		_CHECK_IO(SafeWrite(v,write,up,&_string(o)->_len,sizeof(SQInteger)));
-		_CHECK_IO(SafeWrite(v,write,up,_stringval(o),_string(o)->_len));
+	case OT_STRING: {
+		auto str = _string(o)->Span();
+		SQInteger len = str.size();
+		_CHECK_IO(SafeWrite(v,write,up,&len,sizeof(len)));
+		_CHECK_IO(SafeWrite(v,write,up,str.data(),len));
 		break;
+	}
 	case OT_INTEGER:
 		_CHECK_IO(SafeWrite(v,write,up,&_integer(o),sizeof(SQInteger)));break;
 	case OT_FLOAT:
@@ -297,11 +298,11 @@ bool ReadObject(HSQUIRRELVM v,SQUserPointer up,SQREADFUNC read,SQObjectPtr &o)
 	switch(t){
 	case OT_STRING:{
 		SQInteger len;
-		_CHECK_IO(SafeRead(v,read,up,&len,sizeof(SQInteger)));
-		_CHECK_IO(SafeRead(v,read,up,_ss(v)->GetScratchPad(len),len));
-		o=SQString::Create(_ss(v),_ss(v)->GetScratchPad(-1),len);
-				   }
+		_CHECK_IO(SafeRead(v,read,up,&len,sizeof(len)));
+		_CHECK_IO(SafeRead(v,read,up,_ss(v)->GetScratchPad(len).data(),len));
+		o=SQString::Create(_ss(v),std::string_view(_ss(v)->GetScratchPad(-1).data(),len));
 		break;
+	}
 	case OT_INTEGER:{
 		SQInteger i;
 		_CHECK_IO(SafeRead(v,read,up,&i,sizeof(SQInteger))); o = i; break;
@@ -323,7 +324,7 @@ bool ReadObject(HSQUIRRELVM v,SQUserPointer up,SQREADFUNC read,SQObjectPtr &o)
 bool SQClosure::Save(SQVM *v,SQUserPointer up,SQWRITEFUNC write)
 {
 	_CHECK_IO(WriteTag(v,write,up,SQ_CLOSURESTREAM_HEAD));
-	_CHECK_IO(WriteTag(v,write,up,sizeof(SQChar)));
+	_CHECK_IO(WriteTag(v,write,up,sizeof(char)));
 	_CHECK_IO(_funcproto(_function)->Save(v,up,write));
 	_CHECK_IO(WriteTag(v,write,up,SQ_CLOSURESTREAM_TAIL));
 	return true;
@@ -332,7 +333,7 @@ bool SQClosure::Save(SQVM *v,SQUserPointer up,SQWRITEFUNC write)
 bool SQClosure::Load(SQVM *v,SQUserPointer up,SQREADFUNC read,SQObjectPtr &ret)
 {
 	_CHECK_IO(CheckTag(v,read,up,SQ_CLOSURESTREAM_HEAD));
-	_CHECK_IO(CheckTag(v,read,up,sizeof(SQChar)));
+	_CHECK_IO(CheckTag(v,read,up,sizeof(char)));
 	SQObjectPtr func;
 	_CHECK_IO(SQFunctionProto::Load(v,up,read,func));
 	_CHECK_IO(CheckTag(v,read,up,SQ_CLOSURESTREAM_TAIL));
@@ -64,22 +64,19 @@ struct SQRefCounted
 	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)
+	inline void *operator new([[maybe_unused]] size_t size, void *ptr, [[maybe_unused]] size_t real_size)
 	{
-		place->size = size;
-		return place;
+		assert(size <= real_size);
+		return ptr;
 	}

-	inline void operator delete(void *ptr, SQRefCounted *place)
+	inline void operator delete(void *ptr, void *, size_t real_size)
 	{
-		SQ_FREE(ptr, place->size);
+		SQ_FREE(ptr, real_size);
 	}

 	/* Never used but required. */
 	inline void operator delete(void *) { NOT_REACHED(); }
-
-private:
-	size_t size = 0;
 };

 struct SQWeakRef : SQRefCounted
@@ -138,7 +135,7 @@ struct SQObjectPtr;
 #define _refcounted(obj) ((obj)._unVal.pRefCounted)
 #define _rawval(obj) ((obj)._unVal.raw)

-#define _stringval(obj) (obj)._unVal.pString->_val
+#define _stringval(obj) (obj)._unVal.pString->View()
 #define _userdataval(obj) (obj)._unVal.pUserData->_val

 #define tofloat(num) ((type(num)==OT_INTEGER)?(SQFloat)_integer(num):_float(num))
@@ -357,7 +354,7 @@ struct SQObjectPtr : public SQObject
 		return *this;
 	}
 	private:
-		SQObjectPtr(const SQChar *){} //safety
+		SQObjectPtr(const char *) = delete; //safety
 };

 inline void _Swap(SQObject &a,SQObject &b)
@@ -449,8 +446,8 @@ struct SQDelegable : public CHAINABLE_OBJ {
 SQUnsignedInteger TranslateIndex(const SQObjectPtr &idx);
 typedef sqvector<SQObjectPtr> SQObjectPtrVec;
 typedef sqvector<SQInteger> SQIntVec;
-const SQChar *GetTypeName(const SQObjectPtr &obj1);
-const SQChar *IdType2Name(SQObjectType type);
+std::string_view GetTypeName(const SQObjectPtr &obj1);
+std::string_view IdType2Name(SQObjectType type);



@@ -87,7 +87,7 @@ enum SQOpcode
 };

 struct SQInstructionDesc {
-	const SQChar *name;
+	std::string_view name;
 };

 struct SQInstruction
@@ -14,6 +14,7 @@
 #include "sqarray.h"
 #include "squserdata.h"
 #include "sqclass.h"
+#include "../../../core/string_consumer.hpp"

 #include "../../../safeguards.h"

@@ -32,14 +33,12 @@ SQObjectPtr _minusone_((SQInteger)-1);
 	_table(_metamethodsmap)->NewSlot(_metamethods->back(),(SQInteger)(_metamethods->size()-1)); \
 	}

-bool CompileTypemask(SQIntVec &res,const SQChar *typemask)
+bool CompileTypemask(SQIntVec &res,std::string_view typemask)
 {
-	SQInteger i = 0;
-
 	SQInteger mask = 0;
-	while(typemask[i] != 0) {
-
-		switch(typemask[i]){
+	StringConsumer consumer{typemask};
+	while (consumer.AnyBytesLeft()) {
+		switch(consumer.ReadChar()){
 				case 'o': mask |= _RT_NULL; break;
 				case 'i': mask |= _RT_INTEGER; break;
 				case 'f': mask |= _RT_FLOAT; break;
@@ -56,37 +55,32 @@ bool CompileTypemask(SQIntVec &res,const SQChar *typemask)
 				case 'x': mask |= _RT_INSTANCE; break;
 				case 'y': mask |= _RT_CLASS; break;
 				case 'r': mask |= _RT_WEAKREF; break;
-				case '.': mask = -1; res.push_back(mask); i++; mask = 0; continue;
-				case ' ': i++; continue; //ignores spaces
+				case '.': mask = -1; res.push_back(mask); mask = 0; continue;
+				case ' ': continue; //ignores spaces
 				default:
 					return false;
 		}
-		i++;
-		if(typemask[i] == '|') {
-			i++;
-			if(typemask[i] == 0)
-				return false;
+
+		if(consumer.ReadCharIf('|')) {
+			if(!consumer.AnyBytesLeft()) return false;
 			continue;
 		}
 		res.push_back(mask);
 		mask = 0;
-
 	}
 	return true;
 }

-SQTable *CreateDefaultDelegate(SQSharedState *ss,SQRegFunction *funcz)
+SQTable *CreateDefaultDelegate(SQSharedState *ss,const std::initializer_list<SQRegFunction> &funcz)
 {
-	SQInteger i=0;
 	SQTable *t=SQTable::Create(ss,0);
-	while(funcz[i].name!=nullptr){
-		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))
+	for (auto &func : funcz) {
+		SQNativeClosure *nc = SQNativeClosure::Create(ss,func.f);
+		nc->_nparamscheck = func.nparamscheck;
+		nc->_name = SQString::Create(ss,func.name);
+		if(func.typemask.has_value() && !CompileTypemask(nc->_typecheck,*func.typemask))
 			return nullptr;
-		t->NewSlot(SQString::Create(ss,funcz[i].name),nc);
-		i++;
+		t->NewSlot(SQString::Create(ss,func.name),nc);
 	}
 	return t;
 }
@@ -97,8 +91,6 @@ SQSharedState::SQSharedState()
 	_printfunc = nullptr;
 	_debuginfo = false;
 	_notifyallexceptions = false;
-	_scratchpad=nullptr;
-	_scratchpadsize=0;
 	_collectable_free_processing = false;
 #ifndef NO_GARBAGE_COLLECTOR
 	_gc_chain=nullptr;
@@ -212,7 +204,6 @@ SQSharedState::~SQSharedState()
 	sq_delete(_systemstrings,SQObjectPtrVec);
 	sq_delete(_metamethods,SQObjectPtrVec);
 	sq_delete(_stringtable,SQStringTable);
-	if(_scratchpad)SQ_FREE(_scratchpad,_scratchpadsize);
 }


@@ -357,19 +348,16 @@ void SQCollectable::RemoveFromChain(SQCollectable **chain,SQCollectable *c)
 }
 #endif

-SQChar* SQSharedState::GetScratchPad(SQInteger size)
+std::span<char> SQSharedState::GetScratchPad(SQInteger size)
 {
 	SQInteger newsize;
 	if(size>0) {
-		if(_scratchpadsize < size) {
+		if(_scratchpad.size() < static_cast<size_t>(size)) {
 			newsize = size + (size>>1);
-			_scratchpad = (SQChar *)SQ_REALLOC(_scratchpad,_scratchpadsize,newsize);
-			_scratchpadsize = newsize;
-
-		}else if(_scratchpadsize >= (size<<5)) {
-			newsize = _scratchpadsize >> 1;
-			_scratchpad = (SQChar *)SQ_REALLOC(_scratchpad,_scratchpadsize,newsize);
-			_scratchpadsize = newsize;
+			_scratchpad.resize(newsize);
+		}else if(_scratchpad.size() >= static_cast<size_t>(size<<5)) {
+			newsize = _scratchpad.size() >> 1;
+			_scratchpad.resize(newsize);
 		}
 	}
 	return _scratchpad;
@@ -550,36 +538,36 @@ void SQStringTable::AllocNodes(SQInteger size)
 {
 	_numofslots = size;
 	_strings = (SQString**)SQ_MALLOC(sizeof(SQString*)*_numofslots);
-	memset(_strings,0,sizeof(SQString*)*(size_t)_numofslots);
+	std::fill_n(_strings, _numofslots, nullptr);
 }

-SQString *SQStringTable::Add(const SQChar *news,SQInteger len)
+static const std::hash<std::string_view> string_table_hash{};
+
+SQString *SQStringTable::Add(std::string_view new_string)
 {
-	if(len<0)
-		len = (SQInteger)strlen(news);
-	SQHash h = ::_hashstr(news,(size_t)len)&(_numofslots-1);
+	size_t len = new_string.size();
+	auto slot = string_table_hash(new_string) & (_numofslots-1);
 	SQString *s;
-	for (s = _strings[h]; s; s = s->_next){
-		if(s->_len == len && (!memcmp(news,s->_val,(size_t)len)))
-			return s; //found
+	for (s = _strings[slot]; s; s = s->_next){
+		if(s->View() == new_string) return s; //found
 	}

 	SQString *t=(SQString *)SQ_MALLOC(len+sizeof(SQString));
-	new (t) SQString(news, len);
-	t->_next = _strings[h];
-	_strings[h] = t;
+	new (t, len+sizeof(SQString)) SQString(new_string);
+	t->_next = _strings[slot];
+	_strings[slot] = t;
 	_slotused++;
 	if (_slotused > _numofslots)  /* too crowded? */
 		Resize(_numofslots*2);
 	return t;
 }

-SQString::SQString(const SQChar *news, SQInteger len)
+SQString::SQString(std::string_view new_string)
 {
-	memcpy(_val,news,(size_t)len);
-	_val[len] = '\0';
-	_len = len;
-	_hash = ::_hashstr(news,(size_t)len);
+	std::ranges::copy(new_string, _val);
+	_val[new_string.size()] = '\0';
+	_len = new_string.size();
+	_hash = string_table_hash(new_string);
 	_next = nullptr;
 	_sharedstate = nullptr;
 }
@@ -615,7 +603,7 @@ void SQStringTable::Remove(SQString *bs)
 			else
 				_strings[h] = s->_next;
 			_slotused--;
-			SQInteger slen = s->_len;
+			size_t slen = s->View().size();
 			s->~SQString();
 			SQ_FREE(s,sizeof(SQString) + slen);
 			return;
@@ -13,7 +13,7 @@ struct SQStringTable
 {
 	SQStringTable();
 	~SQStringTable();
-	SQString *Add(const SQChar *,SQInteger len);
+	SQString *Add(std::string_view str);
 	void Remove(SQString *);
 private:
 	void Resize(SQInteger size);
@@ -49,9 +49,6 @@ private:
 	RefNode **_buckets;
 };

-#define ADD_STRING(ss,str,len) ss->_stringtable->Add(str,len)
-#define REMOVE_STRING(ss,bstr) ss->_stringtable->Remove(bstr)
-
 struct SQObjectPtr;

 struct SQSharedState
@@ -59,7 +56,7 @@ struct SQSharedState
 	SQSharedState();
 	~SQSharedState();
 public:
-	SQChar* GetScratchPad(SQInteger size);
+	std::span<char> GetScratchPad(SQInteger size);
 	SQInteger GetMetaMethodIdxByName(const SQObjectPtr &name);
 	void DelayFinalFree(SQCollectable *collectable);
 #ifndef NO_GARBAGE_COLLECTOR
@@ -84,33 +81,32 @@ public:
 #endif
 	SQObjectPtr _root_vm;
 	SQObjectPtr _table_default_delegate;
-	static SQRegFunction _table_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _table_default_delegate_funcz;
 	SQObjectPtr _array_default_delegate;
-	static SQRegFunction _array_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _array_default_delegate_funcz;
 	SQObjectPtr _string_default_delegate;
-	static SQRegFunction _string_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _string_default_delegate_funcz;
 	SQObjectPtr _number_default_delegate;
-	static SQRegFunction _number_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _number_default_delegate_funcz;
 	SQObjectPtr _generator_default_delegate;
-	static SQRegFunction _generator_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _generator_default_delegate_funcz;
 	SQObjectPtr _closure_default_delegate;
-	static SQRegFunction _closure_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _closure_default_delegate_funcz;
 	SQObjectPtr _thread_default_delegate;
-	static SQRegFunction _thread_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _thread_default_delegate_funcz;
 	SQObjectPtr _class_default_delegate;
-	static SQRegFunction _class_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _class_default_delegate_funcz;
 	SQObjectPtr _instance_default_delegate;
-	static SQRegFunction _instance_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _instance_default_delegate_funcz;
 	SQObjectPtr _weakref_default_delegate;
-	static SQRegFunction _weakref_default_delegate_funcz[];
+	static const std::initializer_list<SQRegFunction> _weakref_default_delegate_funcz;

 	SQCOMPILERERROR _compilererrorhandler;
 	SQPRINTFUNCTION _printfunc;
 	bool _debuginfo;
 	bool _notifyallexceptions;
 private:
-	SQChar *_scratchpad;
-	SQInteger _scratchpadsize;
+	std::vector<char> _scratchpad;
 };

 #define _sp(s) (_sharedstate->GetScratchPad(s))
@@ -133,6 +129,6 @@ extern SQObjectPtr _false_;
 extern SQObjectPtr _one_;
 extern SQObjectPtr _minusone_;

-bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
+bool CompileTypemask(SQIntVec &res,std::string_view typemask);

 #endif //_SQSTATE_H_
@@ -2,29 +2,23 @@
 #ifndef _SQSTRING_H_
 #define _SQSTRING_H_

-inline SQHash _hashstr (const SQChar *s, size_t l)
-{
-		SQHash h = (SQHash)l;  /* seed */
-		size_t step = (l>>5)|1;  /* if string is too long, don't hash all its chars */
-		for (; l>=step; l-=step)
-			h = h ^ ((h<<5)+(h>>2)+(unsigned short)*(s++));
-		return h;
-}
-
 struct SQString : public SQRefCounted
 {
-	SQString(const SQChar *news, SQInteger len);
+	SQString(std::string_view str);
 	~SQString(){}
 public:
-	static SQString *Create(SQSharedState *ss, const SQChar *, SQInteger len = -1 );
-	static SQString *Create(SQSharedState *ss, const std::string &str) { return Create(ss, str.data(), str.size()); }
+	static SQString *Create(SQSharedState *ss, std::string_view str);
 	SQInteger Next(const SQObjectPtr &refpos, SQObjectPtr &outkey, SQObjectPtr &outval);
 	void Release() override;
 	SQSharedState *_sharedstate;
 	SQString *_next; //chain for the string table
+	std::size_t _hash;
+
+	std::string_view View() const { return std::string_view(this->_val, this->_len); }
+	std::span<char> Span() { return std::span<char>(this->_val, this->_len); }
+private:
 	SQInteger _len;
-	SQHash _hash;
-	SQChar _val[1];
+	char _val[1];
 };


@@ -46,7 +46,7 @@ public:
 	static SQTable* Create(SQSharedState *ss,SQInteger nInitialSize)
 	{
 		SQTable *newtable = (SQTable*)SQ_MALLOC(sizeof(SQTable));
-		new (newtable) SQTable(ss, nInitialSize);
+		new (newtable, sizeof(SQTable)) SQTable(ss, nInitialSize);
 		newtable->_delegate = nullptr;
 		return newtable;
 	}
@@ -14,7 +14,7 @@ struct SQUserData : SQDelegable
 	static SQUserData* Create(SQSharedState *ss, SQInteger size)
 	{
 		SQUserData* ud = (SQUserData*)SQ_MALLOC(sizeof(SQUserData)+(size-1));
-		new (ud) SQUserData(ss, size);
+		new (ud, sizeof(SQUserData)+(size-1)) SQUserData(ss, size);
 		return ud;
 	}
 #ifndef NO_GARBAGE_COLLECTOR
@@ -31,7 +31,7 @@ struct SQUserData : SQDelegable
 	SQInteger _size;
 	SQRELEASEHOOK _hook;
 	SQUserPointer _typetag;
-	SQChar _val[1];
+	char _val[1];
 };

 #endif //_SQUSERDATA_H_
@@ -93,7 +93,7 @@ public:
 	{
 		_vals[idx].~T();
 		if(idx < (_size - 1)) {
-			memmove(static_cast<void *>(&_vals[idx]), &_vals[idx+1], sizeof(T) * (_size - (size_t)idx - 1));
+			std::move(&_vals[idx + 1], &_vals[_size], &_vals[idx]);
 		}
 		_size--;
 	}
@@ -117,7 +117,6 @@ SQVM::SQVM(SQSharedState *ss)
 	_in_stackoverflow = false;
 	_ops_till_suspend = 0;
 	_ops_till_suspend_error_threshold = INT64_MIN;
-	_ops_till_suspend_error_label = nullptr;
 	_callsstack = nullptr;
 	_callsstacksize = 0;
 	_alloccallsstacksize = 0;
@@ -198,7 +197,7 @@ bool SQVM::ObjCmp(const SQObjectPtr &o1,const SQObjectPtr &o2,SQInteger &result)
 		SQObjectPtr res;
 		switch(type(o1)){
 		case OT_STRING:
-			_RET_SUCCEED(strcmp(_stringval(o1),_stringval(o2)));
+			_RET_SUCCEED(_stringval(o1).compare(_stringval(o2)));
 		case OT_INTEGER:
 			/* FS#3954: wrong integer comparison */
 			_RET_SUCCEED((_integer(o1)<_integer(o2))?-1:(_integer(o1)==_integer(o2))?0:1);
@@ -302,11 +301,7 @@ bool SQVM::StringCat(const SQObjectPtr &str,const SQObjectPtr &obj,SQObjectPtr &
 	SQObjectPtr a, b;
 	ToString(str, a);
 	ToString(obj, b);
-	SQInteger l = _string(a)->_len , ol = _string(b)->_len;
-	SQChar *s = _sp(l + ol + 1);
-	memcpy(s, _stringval(a), (size_t)l);
-	memcpy(s + l, _stringval(b), (size_t)ol);
-	dest = SQString::Create(_ss(this), _spval, l + ol);
+	dest = SQString::Create(_ss(this), fmt::format("{}{}", _stringval(a), _stringval(b)));
 	return true;
 }

@@ -1253,7 +1248,8 @@ bool SQVM::Get(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPtr &dest,
 	if(fetchroot) {
 		if(_rawval(STK(0)) == _rawval(self) &&
 			type(STK(0)) == type(self)) {
-				return _table(_roottable)->Get(key,dest);
+				if (_table(_roottable)->Get(key,dest)) return true;
+				return _table(_ss(this)->_consts)->Get(key,dest);
 		}
 	}
 	return false;
@@ -1288,9 +1284,10 @@ bool SQVM::FallBackGet(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPt
 	case OT_STRING:
 		if(sq_isnumeric(key)){
 			SQInteger n=tointeger(key);
-			if(abs((int)n)<_string(self)->_len){
-				if(n<0)n=_string(self)->_len-n;
-				dest=SQInteger(_stringval(self)[n]);
+			std::string_view str = _stringval(self);
+			if(std::abs(n) < static_cast<SQInteger>(str.size())){
+				if(n<0)n=str.size()+n;
+				dest=SQInteger(str[n]);
 				return true;
 			}
 			return false;
@@ -169,7 +169,7 @@ public:
 	SQBool _can_suspend;
 	SQInteger _ops_till_suspend;
 	SQInteger _ops_till_suspend_error_threshold;
-	const char *_ops_till_suspend_error_label;
+	std::string_view _ops_till_suspend_error_label;
 	SQBool _in_stackoverflow;

 	bool ShouldSuspend()
@@ -91,6 +91,7 @@ add_files(
    bridge_gui.cpp
    bridge_map.cpp
    bridge_map.h
+    bridge_type.h
    build_vehicle_gui.cpp
    cachecheck.cpp
    cargo_type.h
@@ -187,7 +188,6 @@ add_files(
    fios_gui.cpp
    fontcache.cpp
    fontcache.h
-    fontdetection.h
    framerate_gui.cpp
    framerate_type.h
    gamelog.cpp
@@ -279,6 +279,10 @@ add_files(
    newgrf_animation_type.h
    newgrf_badge.cpp
    newgrf_badge.h
+    newgrf_badge_config.cpp
+    newgrf_badge_config.h
+    newgrf_badge_gui.cpp
+    newgrf_badge_gui.h
    newgrf_badge_type.h
    newgrf_callbacks.h
    newgrf_canal.cpp
@@ -450,6 +454,7 @@ add_files(
    spritecache.cpp
    spritecache.h
    spritecache_internal.h
+    spritecache_type.h
    station.cpp
    station_base.h
    station_cmd.cpp
@@ -458,6 +463,7 @@ add_files(
    station_gui.cpp
    station_gui.h
    station_kdtree.h
+    station_layout_type.h
    station_map.h
    station_type.h
    statusbar_gui.cpp
@@ -28,7 +28,7 @@


 /** Widgets for the configure AI window. */
-static constexpr NWidgetPart _nested_ai_config_widgets[] = {
+static constexpr std::initializer_list<NWidgetPart> _nested_ai_config_widgets = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_MAUVE),
 		NWidget(WWT_CAPTION, COLOUR_MAUVE), SetStringTip(STR_AI_CONFIG_CAPTION_AI, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
@@ -84,7 +84,7 @@ static constexpr NWidgetPart _nested_ai_config_widgets[] = {

 /** Window definition for the configure AI window. */
 static WindowDesc _ai_config_desc(
-	WDP_CENTER, nullptr, 0, 0,
+	WDP_CENTER, {}, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
 	{},
 	_nested_ai_config_widgets
@@ -142,7 +142,7 @@ struct AIConfigWindow : public Window {

 			case WID_AIC_LIST:
 				this->line_height = GetCharacterHeight(FS_NORMAL) + padding.height;
-				resize.height = this->line_height;
+				fill.height = resize.height = this->line_height;
 				size.height = 8 * this->line_height;
 				break;
 		}
@@ -218,7 +218,7 @@ struct AIConfigWindow : public Window {
 		if (widget >= WID_AIC_TEXTFILE && widget < WID_AIC_TEXTFILE + TFT_CONTENT_END) {
 			if (this->selected_slot == CompanyID::Invalid() || AIConfig::GetConfig(this->selected_slot) == nullptr) return;

-			ShowScriptTextfileWindow((TextfileType)(widget - WID_AIC_TEXTFILE), this->selected_slot);
+			ShowScriptTextfileWindow(this, static_cast<TextfileType>(widget - WID_AIC_TEXTFILE), this->selected_slot);
 			return;
 		}

@@ -250,23 +250,23 @@ 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 = static_cast<CompanyID>(this->vscroll->GetScrolledRowFromWidget(pt.y, this, widget));
 				this->InvalidateData();
-				if (click_count > 1 && IsEditable(this->selected_slot)) ShowScriptListWindow((CompanyID)this->selected_slot, _ctrl_pressed);
+				if (click_count > 1 && IsEditable(this->selected_slot)) ShowScriptListWindow(this->selected_slot, _ctrl_pressed);
 				break;
 			}

 			case WID_AIC_MOVE_UP:
-				if (IsEditable(this->selected_slot) && IsEditable((CompanyID)(this->selected_slot - 1))) {
+				if (IsEditable(this->selected_slot) && IsEditable(static_cast<CompanyID>(this->selected_slot - 1))) {
 					std::swap(GetGameSettings().script_config.ai[this->selected_slot], GetGameSettings().script_config.ai[this->selected_slot - 1]);
-					this->selected_slot = CompanyID(this->selected_slot - 1);
+					this->selected_slot = static_cast<CompanyID>(this->selected_slot - 1);
 					this->vscroll->ScrollTowards(this->selected_slot.base());
 					this->InvalidateData();
 				}
 				break;

 			case WID_AIC_MOVE_DOWN:
-				if (IsEditable(this->selected_slot) && IsEditable((CompanyID)(this->selected_slot + 1))) {
+				if (IsEditable(this->selected_slot) && IsEditable(static_cast<CompanyID>(this->selected_slot + 1))) {
 					std::swap(GetGameSettings().script_config.ai[this->selected_slot], GetGameSettings().script_config.ai[this->selected_slot + 1]);
 					++this->selected_slot;
 					this->vscroll->ScrollTowards(this->selected_slot.base());
@@ -282,11 +282,11 @@ struct AIConfigWindow : public Window {
 			}

 			case WID_AIC_CHANGE:  // choose other AI
-				if (IsEditable(this->selected_slot)) ShowScriptListWindow((CompanyID)this->selected_slot, _ctrl_pressed);
+				if (IsEditable(this->selected_slot)) ShowScriptListWindow(this->selected_slot, _ctrl_pressed);
 				break;

 			case WID_AIC_CONFIGURE: // change the settings for an AI
-				ShowScriptSettingsWindow((CompanyID)this->selected_slot);
+				ShowScriptSettingsWindow(this->selected_slot);
 				break;

 			case WID_AIC_CONTENT_DOWNLOAD:
@@ -320,8 +320,8 @@ struct AIConfigWindow : public Window {
 		this->SetWidgetDisabledState(WID_AIC_INCREASE_INTERVAL, GetGameSettings().difficulty.competitors_interval == MAX_COMPETITORS_INTERVAL);
 		this->SetWidgetDisabledState(WID_AIC_CHANGE, !IsEditable(this->selected_slot));
 		this->SetWidgetDisabledState(WID_AIC_CONFIGURE, this->selected_slot == CompanyID::Invalid() || config->GetConfigList()->empty());
-		this->SetWidgetDisabledState(WID_AIC_MOVE_UP, !IsEditable(this->selected_slot) || !IsEditable((CompanyID)(this->selected_slot - 1)));
-		this->SetWidgetDisabledState(WID_AIC_MOVE_DOWN, !IsEditable(this->selected_slot) || !IsEditable((CompanyID)(this->selected_slot + 1)));
+		this->SetWidgetDisabledState(WID_AIC_MOVE_UP, !IsEditable(this->selected_slot) || !IsEditable(static_cast<CompanyID>(this->selected_slot - 1)));
+		this->SetWidgetDisabledState(WID_AIC_MOVE_DOWN, !IsEditable(this->selected_slot) || !IsEditable(static_cast<CompanyID>(this->selected_slot + 1)));

 		this->SetWidgetDisabledState(WID_AIC_OPEN_URL, this->selected_slot == CompanyID::Invalid() || config->GetInfo() == nullptr || config->GetInfo()->GetURL().empty());
 		for (TextfileType tft = TFT_CONTENT_BEGIN; tft < TFT_CONTENT_END; tft++) {
@@ -27,14 +27,14 @@ static bool CheckAPIVersion(const std::string &api_version)
 	return std::ranges::find(AIInfo::ApiVersions, api_version) != std::end(AIInfo::ApiVersions);
 }

-template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq_pushstring(vm, "AIInfo", -1); return 1; }
+template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq_pushstring(vm, "AIInfo"); return 1; }

-/* static */ void AIInfo::RegisterAPI(Squirrel *engine)
+/* static */ void AIInfo::RegisterAPI(Squirrel &engine)
 {
 	/* Create the AIInfo class, and add the RegisterAI function */
 	DefSQClass<AIInfo, ScriptType::AI> SQAIInfo("AIInfo");
 	SQAIInfo.PreRegister(engine);
-	SQAIInfo.AddConstructor<void (AIInfo::*)(), 1>(engine, "x");
+	SQAIInfo.AddConstructor<void (AIInfo::*)()>(engine, "x");
 	SQAIInfo.DefSQAdvancedMethod(engine, &AIInfo::AddSetting, "AddSetting");
 	SQAIInfo.DefSQAdvancedMethod(engine, &AIInfo::AddLabels, "AddLabels");
 	SQAIInfo.DefSQConst(engine, ScriptConfigFlags{}.base(), "CONFIG_NONE");
@@ -50,8 +50,8 @@ template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq
 	SQAIInfo.DefSQConst(engine, ScriptConfigFlags{ScriptConfigFlag::InGame}.base(), "AICONFIG_INGAME");

 	SQAIInfo.PostRegister(engine);
-	engine->AddMethod("RegisterAI", &AIInfo::Constructor, 2, "tx");
-	engine->AddMethod("RegisterDummyAI", &AIInfo::DummyConstructor, 2, "tx");
+	engine.AddMethod("RegisterAI", &AIInfo::Constructor, "tx");
+	engine.AddMethod("RegisterDummyAI", &AIInfo::DummyConstructor, "tx");
 }

 /* static */ SQInteger AIInfo::Constructor(HSQUIRRELVM vm)
@@ -61,11 +61,12 @@ template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq
 	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");
 	AIInfo *info = (AIInfo *)instance;

-	SQInteger res = ScriptInfo::Constructor(vm, info);
+	SQInteger res = ScriptInfo::Constructor(vm, *info);
 	if (res != 0) return res;

 	if (info->engine->MethodExists(info->SQ_instance, "MinVersionToLoad")) {
 		if (!info->engine->CallIntegerMethod(info->SQ_instance, "MinVersionToLoad", &info->min_loadable_version, MAX_GET_OPS)) return SQ_ERROR;
+		if (info->min_loadable_version < 0) return SQ_ERROR;
 	} else {
 		info->min_loadable_version = info->GetVersion();
 	}
@@ -89,7 +90,7 @@ template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq
 	/* Remove the link to the real instance, else it might get deleted by RegisterAI() */
 	sq_setinstanceup(vm, 2, nullptr);
 	/* Register the AI to the base system */
-	info->GetScanner()->RegisterScript(info);
+	info->GetScanner()->RegisterScript(std::unique_ptr<AIInfo>{info});
 	return 0;
 }

@@ -101,13 +102,13 @@ template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq
 	AIInfo *info = (AIInfo *)instance;
 	info->api_version = *std::rbegin(AIInfo::ApiVersions);

-	SQInteger res = ScriptInfo::Constructor(vm, info);
+	SQInteger res = ScriptInfo::Constructor(vm, *info);
 	if (res != 0) return res;

 	/* Remove the link to the real instance, else it might get deleted by RegisterAI() */
 	sq_setinstanceup(vm, 2, nullptr);
 	/* Register the AI to the base system */
-	static_cast<AIScannerInfo *>(info->GetScanner())->SetDummyAI(info);
+	static_cast<AIScannerInfo *>(info->GetScanner())->SetDummyAI(std::unique_ptr<AIInfo>(info));
 	return 0;
 }

@@ -124,33 +125,32 @@ bool AIInfo::CanLoadFromVersion(int version) const
 }


-/* static */ void AILibrary::RegisterAPI(Squirrel *engine)
+/* static */ void AILibrary::RegisterAPI(Squirrel &engine)
 {
 	/* Create the AILibrary class, and add the RegisterLibrary function */
-	engine->AddClassBegin("AILibrary");
-	engine->AddClassEnd();
-	engine->AddMethod("RegisterLibrary", &AILibrary::Constructor, 2, "tx");
+	engine.AddClassBegin("AILibrary");
+	engine.AddClassEnd();
+	engine.AddMethod("RegisterLibrary", &AILibrary::Constructor, "tx");
 }

 /* static */ SQInteger AILibrary::Constructor(HSQUIRRELVM vm)
 {
 	/* Create a new library */
-	AILibrary *library = new AILibrary();
+	auto library = std::make_unique<AILibrary>();

-	SQInteger res = ScriptInfo::Constructor(vm, library);
+	SQInteger res = ScriptInfo::Constructor(vm, *library);
 	if (res != 0) {
-		delete library;
 		return res;
 	}

 	/* Cache the category */
 	if (!library->CheckMethod("GetCategory") || !library->engine->CallStringMethod(library->SQ_instance, "GetCategory", &library->category, MAX_GET_OPS)) {
-		delete library;
 		return SQ_ERROR;
 	}

 	/* Register the Library to the base system */
-	library->GetScanner()->RegisterScript(library);
+	ScriptScanner *scanner = library->GetScanner();
+	scanner->RegisterScript(std::move(library));

 	return 0;
 }
@@ -23,7 +23,7 @@ public:
 	/**
 	 * Register the functions of this class.
 	 */
-	static void RegisterAPI(Squirrel *engine);
+	static void RegisterAPI(Squirrel &engine);

 	/**
 	 * Create an AI, using this AIInfo as start-template.
@@ -64,7 +64,7 @@ public:
 	/**
 	 * Register the functions of this class.
 	 */
-	static void RegisterAPI(Squirrel *engine);
+	static void RegisterAPI(Squirrel &engine);

 	/**
 	 * Create an AI, using this AIInfo as start-template.
@@ -27,7 +27,7 @@
 #include "table/strings.h"

 /* Manually include the Text glue. */
-#include "../script/api/template/template_text.hpp.sq"
+#include "../script/api/template/template_text.sq.hpp"

 /* Convert all AI related classes to Squirrel data. */
 #include "../script/api/ai/ai_includes.hpp"
@@ -43,7 +43,7 @@ void AIInstance::Initialize(AIInfo *info)
 	this->api_version = info->GetAPIVersion();

 	/* Register the AIController (including the "import" command) */
-	SQAIController_Register(this->engine);
+	SQAIController_Register(*this->engine);

 	ScriptInstance::Initialize(info->GetMainScript(), info->GetInstanceName(), _current_company);
 }
@@ -53,7 +53,7 @@ void AIInstance::RegisterAPI()
 	ScriptInstance::RegisterAPI();

 	/* Register all classes */
-	SQAI_RegisterAll(this->engine);
+	SQAI_RegisterAll(*this->engine);

 	if (!this->LoadCompatibilityScripts(AI_DIR, AIInfo::ApiVersions)) this->Died();
 }
@@ -83,7 +83,7 @@ void AIInstance::Died()

 void AIInstance::LoadDummyScript()
 {
-	ScriptAllocatorScope alloc_scope(this->engine);
+	ScriptAllocatorScope alloc_scope(this->engine.get());
 	Script_CreateDummy(this->engine->GetVM(), STR_ERROR_AI_NO_AI_FOUND, "AI");
 }

@@ -22,39 +22,31 @@
 #include "../safeguards.h"


-AIScannerInfo::AIScannerInfo() :
-	ScriptScanner(),
-	info_dummy(nullptr)
-{
-}
+AIScannerInfo::AIScannerInfo() = default;
+AIScannerInfo::~AIScannerInfo() = default;

 void AIScannerInfo::Initialize()
 {
 	ScriptScanner::Initialize("AIScanner");

-	ScriptAllocatorScope alloc_scope(this->engine);
+	ScriptAllocatorScope alloc_scope(this->engine.get());

 	/* Create the dummy AI */
 	this->main_script = "%_dummy";
 	Script_CreateDummyInfo(this->engine->GetVM(), "AI", "ai");
 }

-void AIScannerInfo::SetDummyAI(class AIInfo *info)
+void AIScannerInfo::SetDummyAI(std::unique_ptr<class AIInfo> &&info)
 {
-	this->info_dummy = info;
+	this->info_dummy = std::move(info);
 }

-AIScannerInfo::~AIScannerInfo()
+std::string AIScannerInfo::GetScriptName(ScriptInfo &info)
 {
-	delete this->info_dummy;
+	return info.GetName();
 }

-std::string AIScannerInfo::GetScriptName(ScriptInfo *info)
-{
-	return info->GetName();
-}
-
-void AIScannerInfo::RegisterAPI(class Squirrel *engine)
+void AIScannerInfo::RegisterAPI(class Squirrel &engine)
 {
 	AIInfo::RegisterAPI(engine);
 }
@@ -63,7 +55,7 @@ AIInfo *AIScannerInfo::SelectRandomAI() const
 {
 	if (_game_mode == GM_MENU) {
 		Debug(script, 0, "The intro game should not use AI, loading 'dummy' AI.");
-		return this->info_dummy;
+		return this->info_dummy.get();
 	}

 	/* Filter for AIs suitable as Random AI. */
@@ -72,7 +64,7 @@ AIInfo *AIScannerInfo::SelectRandomAI() const
 	uint num_random_ais = std::ranges::distance(random_ais);
 	if (num_random_ais == 0) {
 		Debug(script, 0, "No suitable AI found, loading 'dummy' AI.");
-		return this->info_dummy;
+		return this->info_dummy.get();
 	}

 	/* Pick a random AI */
@@ -125,13 +117,13 @@ void AIScannerLibrary::Initialize()
 	ScriptScanner::Initialize("AIScanner");
 }

-std::string AIScannerLibrary::GetScriptName(ScriptInfo *info)
+std::string AIScannerLibrary::GetScriptName(ScriptInfo &info)
 {
-	AILibrary *library = static_cast<AILibrary *>(info);
-	return fmt::format("{}.{}", library->GetCategory(), library->GetInstanceName());
+	AILibrary &library = static_cast<AILibrary &>(info);
+	return fmt::format("{}.{}", library.GetCategory(), library.GetInstanceName());
 }

-void AIScannerLibrary::RegisterAPI(class Squirrel *engine)
+void AIScannerLibrary::RegisterAPI(class Squirrel &engine)
 {
 	AILibrary::RegisterAPI(engine);
 }
@@ -145,5 +137,5 @@ AILibrary *AIScannerLibrary::FindLibrary(const std::string &library, int version
 	ScriptInfoList::iterator it = this->info_list.find(library_name);
 	if (it == this->info_list.end()) return nullptr;

-	return static_cast<AILibrary *>((*it).second);
+	return static_cast<AILibrary *>(it->second);
 }
@@ -37,17 +37,17 @@ public:
 	/**
 	 * Set the Dummy AI.
 	 */
-	void SetDummyAI(class AIInfo *info);
+	void SetDummyAI(std::unique_ptr<class AIInfo> &&info);

 protected:
-	std::string GetScriptName(ScriptInfo *info) override;
-	const char *GetFileName() const override { return PATHSEP "info.nut"; }
+	std::string GetScriptName(ScriptInfo &info) override;
+	std::string_view GetFileName() const override { return PATHSEP "info.nut"; }
 	Subdirectory GetDirectory() const override { return AI_DIR; }
-	const char *GetScannerName() const override { return "AIs"; }
-	void RegisterAPI(class Squirrel *engine) override;
+	std::string_view GetScannerName() const override { return "AIs"; }
+	void RegisterAPI(class Squirrel &engine) override;

 private:
-	AIInfo *info_dummy; ///< The dummy AI.
+	std::unique_ptr<AIInfo> info_dummy; ///< The dummy AI.
 };

 class AIScannerLibrary : public ScriptScanner {
@@ -63,11 +63,11 @@ public:
 	class AILibrary *FindLibrary(const std::string &library, int version);

 protected:
-	std::string GetScriptName(ScriptInfo *info) override;
-	const char *GetFileName() const override { return PATHSEP "library.nut"; }
+	std::string GetScriptName(ScriptInfo &info) override;
+	std::string_view GetFileName() const override { return PATHSEP "library.nut"; }
 	Subdirectory GetDirectory() const override { return AI_LIBRARY_DIR; }
-	const char *GetScannerName() const override { return "AI Libraries"; }
-	void RegisterAPI(class Squirrel *engine) override;
+	std::string_view GetScannerName() const override { return "AI Libraries"; }
+	void RegisterAPI(class Squirrel &engine) override;
 };

 #endif /* AI_SCANNER_HPP */
@@ -16,7 +16,6 @@
 #include "news_func.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
-#include "spritecache.h"
 #include "error_func.h"
 #include "strings_func.h"
 #include "command_func.h"
@@ -48,10 +47,7 @@

 void Aircraft::UpdateDeltaXY()
 {
-	this->x_offs = -1;
-	this->y_offs = -1;
-	this->x_extent = 2;
-	this->y_extent = 2;
+	this->bounds = {{-1, -1, 0}, {2, 2, 0}, {}};

 	switch (this->subtype) {
 		default: NOT_REACHED();
@@ -64,21 +60,21 @@ void Aircraft::UpdateDeltaXY()
 				case LANDING:
 				case HELILANDING:
 				case FLYING:
-					this->x_extent = 24;
-					this->y_extent = 24;
+					/* Bounds are not centred on the aircraft. */
+					this->bounds.extent.x = 24;
+					this->bounds.extent.y = 24;
 					break;
 			}
-			this->z_extent = 5;
+			this->bounds.extent.z = 5;
 			break;

 		case AIR_SHADOW:
-			this->z_extent = 1;
-			this->x_offs = 0;
-			this->y_offs = 0;
+			this->bounds.extent.z = 1;
+			this->bounds.origin = {};
 			break;

 		case AIR_ROTOR:
-			this->z_extent = 1;
+			this->bounds.extent.z = 1;
 			break;
 	}
 }
@@ -134,12 +130,14 @@ static StationID FindNearestHangar(const Aircraft *v)
 	const Station *next_dest = nullptr;
 	if (max_range != 0) {
 		if (v->current_order.IsType(OT_GOTO_STATION) ||
-				(v->current_order.IsType(OT_GOTO_DEPOT) && (v->current_order.GetDepotActionType() & ODATFB_NEAREST_DEPOT) == 0)) {
+				(v->current_order.IsType(OT_GOTO_DEPOT) && !v->current_order.GetDepotActionType().Test(OrderDepotActionFlag::NearestDepot))) {
 			last_dest = Station::GetIfValid(v->last_station_visited);
 			next_dest = Station::GetIfValid(v->current_order.GetDestination().ToStationID());
 		} else {
 			last_dest = GetTargetAirportIfValid(v);
-			next_dest = Station::GetIfValid(v->GetNextStoppingStation().value);
+			std::vector<StationID> next_station;
+			v->GetNextStoppingStation(next_station);
+			if (!next_station.empty()) next_dest = Station::GetIfValid(next_station.back());
 		}
 	}

@@ -175,7 +173,7 @@ void Aircraft::GetImage(Direction direction, EngineImageType image_type, Vehicle
 {
 	uint8_t spritenum = this->spritenum;

-	if (is_custom_sprite(spritenum)) {
+	if (IsCustomVehicleSpriteNum(spritenum)) {
 		GetCustomVehicleSprite(this, direction, image_type, result);
 		if (result->IsValid()) return;

@@ -191,7 +189,7 @@ void GetRotorImage(const Aircraft *v, EngineImageType image_type, VehicleSpriteS
 	assert(v->subtype == AIR_HELICOPTER);

 	const Aircraft *w = v->Next()->Next();
-	if (is_custom_sprite(v->spritenum)) {
+	if (IsCustomVehicleSpriteNum(v->spritenum)) {
 		GetCustomRotorSprite(v, image_type, result);
 		if (result->IsValid()) return;
 	}
@@ -203,9 +201,9 @@ void GetRotorImage(const Aircraft *v, EngineImageType image_type, VehicleSpriteS
 static void GetAircraftIcon(EngineID engine, EngineImageType image_type, VehicleSpriteSeq *result)
 {
 	const Engine *e = Engine::Get(engine);
-	uint8_t spritenum = e->u.air.image_index;
+	uint8_t spritenum = e->VehInfo<AircraftVehicleInfo>().image_index;

-	if (is_custom_sprite(spritenum)) {
+	if (IsCustomVehicleSpriteNum(spritenum)) {
 		GetCustomVehicleIcon(engine, DIR_W, image_type, result);
 		if (result->IsValid()) return;

@@ -270,7 +268,7 @@ void GetAircraftSpriteSize(EngineID engine, uint &width, uint &height, int &xoff
 */
 CommandCost CmdBuildAircraft(DoCommandFlags flags, TileIndex tile, const Engine *e, Vehicle **ret)
 {
-	const AircraftVehicleInfo *avi = &e->u.air;
+	const AircraftVehicleInfo *avi = &e->VehInfo<AircraftVehicleInfo>();
 	const Station *st = Station::GetByTile(tile);

 	/* Prevent building aircraft types at places which can't handle them */
@@ -430,7 +428,7 @@ static void CheckIfAircraftNeedsService(Aircraft *v)

 	/* only goto depot if the target airport has a depot */
 	if (st->airport.HasHangar() && CanVehicleUseStation(v, st)) {
-		v->current_order.MakeGoToDepot(st->index, ODTFB_SERVICE);
+		v->current_order.MakeGoToDepot(st->index, OrderDepotTypeFlag::Service);
 		SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP);
 	} else if (v->current_order.IsType(OT_GOTO_DEPOT)) {
 		v->current_order.MakeDummy();
@@ -441,7 +439,7 @@ static void CheckIfAircraftNeedsService(Aircraft *v)
 Money Aircraft::GetRunningCost() const
 {
 	const Engine *e = this->GetEngine();
-	uint cost_factor = GetVehicleProperty(this, PROP_AIRCRAFT_RUNNING_COST_FACTOR, e->u.air.running_cost);
+	uint cost_factor = GetVehicleProperty(this, PROP_AIRCRAFT_RUNNING_COST_FACTOR, e->VehInfo<AircraftVehicleInfo>().running_cost);
 	return GetPrice(PR_RUNNING_AIRCRAFT, cost_factor, e->GetGRF());
 }

@@ -990,7 +988,7 @@ static bool AircraftController(Aircraft *v)
 	}

 	/* Get distance from destination pos to current pos. */
-	uint dist = abs(x + amd.x - v->x_pos) +  abs(y + amd.y - v->y_pos);
+	uint dist = abs(x + amd.x - v->x_pos) + abs(y + amd.y - v->y_pos);

 	/* Need exact position? */
 	if (!amd.flags.Test(AirportMovingDataFlag::ExactPosition) && dist <= (amd.flags.Test(AirportMovingDataFlag::SlowTurn) ? 8U : 4U)) return true;
@@ -1023,10 +1021,21 @@ static bool AircraftController(Aircraft *v)
 	uint speed_limit = SPEED_LIMIT_TAXI;
 	bool hard_limit = true;

-	if (amd.flags.Test(AirportMovingDataFlag::NoSpeedClamp)) speed_limit = SPEED_LIMIT_NONE;
-	if (amd.flags.Test(AirportMovingDataFlag::Hold)) { speed_limit = SPEED_LIMIT_HOLD;     hard_limit = false; }
-	if (amd.flags.Test(AirportMovingDataFlag::Land)) { speed_limit = SPEED_LIMIT_APPROACH; hard_limit = false; }
-	if (amd.flags.Test(AirportMovingDataFlag::Brake)) { speed_limit = SPEED_LIMIT_TAXI;     hard_limit = false; }
+	if (amd.flags.Test(AirportMovingDataFlag::NoSpeedClamp)) {
+		speed_limit = SPEED_LIMIT_NONE;
+	}
+	if (amd.flags.Test(AirportMovingDataFlag::Hold)) {
+		speed_limit = SPEED_LIMIT_HOLD;
+		hard_limit = false;
+	}
+	if (amd.flags.Test(AirportMovingDataFlag::Land)) {
+		speed_limit = SPEED_LIMIT_APPROACH;
+		hard_limit = false;
+	}
+	if (amd.flags.Test(AirportMovingDataFlag::Brake)) {
+		speed_limit = SPEED_LIMIT_TAXI;
+		hard_limit = false;
+	}

 	int count = UpdateAircraftSpeed(v, speed_limit, hard_limit);
 	if (count == 0) return false;
@@ -1125,6 +1134,15 @@ static bool AircraftController(Aircraft *v)
 		}

 		if (amd.flags.Test(AirportMovingDataFlag::Land)) {
+			if (st->airport.blocks.Test(AirportBlock::Zeppeliner)) {
+				/* Zeppeliner blocked the runway, abort landing */
+				v->state = FLYING;
+				UpdateAircraftCache(v);
+				SetAircraftPosition(v, gp.x, gp.y, GetAircraftFlightLevel(v));
+				v->pos = v->previous_pos;
+				continue;
+			}
+
 			if (st->airport.tile == INVALID_TILE) {
 				/* Airport has been removed, abort the landing procedure */
 				v->state = FLYING;
@@ -1174,7 +1192,7 @@ static bool HandleCrashedAircraft(Aircraft *v)
 	Station *st = GetTargetAirportIfValid(v);

 	/* make aircraft crash down to the ground */
-	if (v->crashed_counter < 500 && st == nullptr && ((v->crashed_counter % 3) == 0) ) {
+	if (v->crashed_counter < 500 && st == nullptr && ((v->crashed_counter % 3) == 0)) {
 		int z = GetSlopePixelZ(Clamp(v->x_pos, 0, Map::MaxX() * TILE_SIZE), Clamp(v->y_pos, 0, Map::MaxY() * TILE_SIZE));
 		v->z_pos -= 1;
 		if (v->z_pos <= z) {
@@ -1430,7 +1448,7 @@ static void AircraftLandAirplane(Aircraft *v)

 	v->UpdateDeltaXY();

-	AirportTileAnimationTrigger(st, vt, AAT_STATION_AIRPLANE_LAND);
+	TriggerAirportTileAnimation(st, vt, AirportAnimationTrigger::AirplaneTouchdown);

 	if (!PlayVehicleSound(v, VSE_TOUCHDOWN)) {
 		SndPlayVehicleFx(SND_17_SKID_PLANE, v);
@@ -1668,7 +1686,7 @@ static void AircraftEventHandler_Flying(Aircraft *v, const AirportFTAClass *apc)
 			if (current->heading == landingtype) {
 				/* save speed before, since if AirportHasBlock is false, it resets them to 0
 				 * we don't want that for plane in air
-				 * hack for speed thingie */
+				 * hack for speed thingy */
 				uint16_t tcur_speed = v->cur_speed;
 				uint16_t tsubspeed = v->subspeed;
 				if (!AirportHasBlock(v, current, apc)) {
@@ -1782,6 +1800,11 @@ static void AirportClearBlock(const Aircraft *v, const AirportFTAClass *apc)
 	if (apc->layout[v->previous_pos].blocks != apc->layout[v->pos].blocks) {
 		Station *st = Station::Get(v->targetairport);

+		if (st->airport.blocks.Test(AirportBlock::Zeppeliner) &&
+				apc->layout[v->previous_pos].blocks == AirportBlock::RunwayIn) {
+			return;
+		}
+
 		st->airport.blocks.Reset(apc->layout[v->previous_pos].blocks);
 	}
 }
@@ -1802,7 +1825,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 {} is not valid for current airport. Max position is {}", v->pos, apc->nofelements - 1);
 		assert(v->pos < apc->nofelements);
 	}

@@ -2164,7 +2187,7 @@ void UpdateAirplanesOnNewStation(const Station *st)
 		Order *o = &v->current_order;
 		/* The aircraft is heading to a hangar, but the new station doesn't have one,
 		 * or the aircraft can't land on the new station. Cancel current order. */
-		if (o->IsType(OT_GOTO_DEPOT) && !(o->GetDepotOrderType() & ODTFB_PART_OF_ORDERS) && o->GetDestination() == st->index &&
+		if (o->IsType(OT_GOTO_DEPOT) && !o->GetDepotOrderType().Test(OrderDepotTypeFlag::PartOfOrders) && o->GetDestination() == st->index &&
 				(!st->airport.HasHangar() || !CanVehicleUseStation(v, st))) {
 			o->MakeDummy();
 			SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP);
@@ -14,7 +14,6 @@
 #include "strings_func.h"
 #include "vehicle_func.h"
 #include "window_gui.h"
-#include "spritecache.h"
 #include "zoom_func.h"

 #include "table/strings.h"
@@ -82,7 +81,7 @@ void DrawAircraftImage(const Vehicle *v, const Rect &r, VehicleID selection, Eng
 	int x_offs = UnScaleGUI(rect.left);
 	int x = rtl ? r.right - width - x_offs : r.left - x_offs;
 	/* This magic -1 offset is related to the sprite_y_offsets in build_vehicle_gui.cpp */
-	int y = ScaleSpriteTrad(-1) + CenterBounds(r.top, r.bottom, 0);
+	int y = ScaleSpriteTrad(-1) + CentreBounds(r.top, r.bottom, 0);
 	bool helicopter = v->subtype == AIR_HELICOPTER;

 	int heli_offs = 0;
@@ -44,7 +44,7 @@ enum AirportTypes : uint8_t {
 };

 /** Flags for airport movement data. */
-enum AirportMovingDataFlag : uint8_t {
+enum class AirportMovingDataFlag : uint8_t {
 	NoSpeedClamp, ///< No speed restrictions.
 	Takeoff, ///< Takeoff movement.
 	SlowTurn, ///< Turn slowly (mostly used in the air).
@@ -127,6 +127,7 @@ enum class AirportBlock : uint8_t {
 	/* end of new blocks */

 	Nothing          = 30,
+	Zeppeliner       = 62, ///< Block for the zeppeliner disaster vehicle.
 	AirportClosed    = 63, ///< Dummy block for indicating a closed airport.
 };
 using AirportBlocks = EnumBitSet<AirportBlock, uint64_t>;
--- a/Show More
+++ b/Show More