Update: Changelog for 1.11.2 release

In FluidSynth 2.2.0 an extra state was added to denote stopping. To transition
from this state to a stopped state the rendering needs to be running. Since
04ce1f07 locking was added that skipped the rendering when something else held
a lock, so the state would never get to stopped and join would never return.

.dorpsgek.yml

@@ -8,13 +8,8 @@ notifications:
     only:
     - master
     only-by:
-    - eints-sync\[bot\]
+    - DorpsGek
   commit-comment:
-  discussion:
   pull-request:
   issue:
   tag-created:
-  workflow-run:
-    only:
-    - .github/workflows/release.yml
-    - .github/workflows/ci-nightly.yml

.editorconfig

@@ -7,471 +7,3 @@ trim_trailing_whitespace = true
 [*.{c,cpp,h,hpp}]
 indent_style = tab
 charset = utf-8
-#indent_size = <integer>
-#tab_width = <integer>
-#end_of_line = <lf, cf, crlf>
-
-### C++ specific editor config rules ###
-## Visual Studio ## https://learn.microsoft.com/en-us/visualstudio/ide/cpp-editorconfig-properties?view=vs-2019 ##
-# Indentation #
-# Do not indent braces
-cpp_indent_braces = false
-# When a new line is typed, it's indented relatively to the innermost open parenthesis
-cpp_indent_multi_line_relative_to = innermost_parenthesis
-# Indent new lines within parenthesis
-cpp_indent_within_parentheses = indent
-# In existing code, do not use the setting for alignment of new lines within parentheses
-cpp_indent_preserve_within_parentheses = true
-# Indent case contents
-cpp_indent_case_contents = true
-# Indent case labels
-cpp_indent_case_labels = true
-# Do not indent braces following a case statement
-cpp_indent_case_contents_when_block = false
-# Do not indent braces of lambdas used as parameters
-cpp_indent_lambda_braces_when_parameter = false
-# No override for "Position of goto labels" (Unspecified)
-#cpp_indent_goto_labels
-# Move preprocessor directives to the leftmost column
-cpp_indent_preprocessor = leftmost_column
-# Do not indent access specifiers
-cpp_indent_access_specifiers = false
-# Indent namespace contents
-cpp_indent_namespace_contents = true
-# Preserve indentation of comments
-cpp_indent_preserve_comments = true
-
-# Newline #
-# Keep open braces for namespaces on the same line, but add a space before the brace
-cpp_new_line_before_open_brace_namespace = same_line
-# Keep open braces for types/classes on the same line, but add a space before the brace
-cpp_new_line_before_open_brace_type = same_line
-# Move open braces for functions to a new line
-cpp_new_line_before_open_brace_function = new_line
-# Keep open braces for control blocks on the same line, but add a space before the brace
-cpp_new_line_before_open_brace_block = same_line
-# Keep open braces for lambdas on the same line, but add a space before the brace
-cpp_new_line_before_open_brace_lambda = same_line
-# Place scope braces on separate lines
-cpp_new_line_scope_braces_on_separate_lines = true
-# Do not move closing braces to the same line as opening braces for empty types
-cpp_new_line_close_brace_same_line_empty_type = false
-# Do not move closing braces to the same line as opening braces for empty function bodies
-cpp_new_line_close_brace_same_line_empty_function = false
-# Do not place 'catch' and similar keywords on a new line
-cpp_new_line_before_catch = false
-# Do not place 'else' on a new line
-cpp_new_line_before_else = false
-# Do not place 'while' in a do-while loop on a new line
-cpp_new_line_before_while_in_do_while = false
-
-# Spacing #
-# Remove spaces between function names and opening parentheses of argument lists
-cpp_space_before_function_open_parenthesis = remove
-# Do not insert a space within parentheses of an argument list
-cpp_space_within_parameter_list_parentheses = false
-# Do not insert a space between parentheses when argument list is empty
-cpp_space_between_empty_parameter_list_parentheses = false
-# Insert space between keyword and opening parenthesis in control flow statements
-cpp_space_after_keywords_in_control_flow_statements = true
-# Do not insert a space within parentheses of a control statement
-cpp_space_within_control_flow_statement_parentheses = false
-# Do not insert a space before opening parenthesis of lambda argument lists
-cpp_space_before_lambda_open_parenthesis = false
-# Do not insert a space within parentheses of a C-style cast
-cpp_space_within_cast_parentheses = false
-# Do not insert a space after closing parenthesis of C-style cast
-cpp_space_after_cast_close_parenthesis = false
-# Do not insert a space within parentheses of a parenthesized expression
-cpp_space_within_expression_parentheses = false
-# Insert space before opening brace of blocks
-cpp_space_before_block_open_brace = true
-# Do not insert a space between empty braces
-cpp_space_between_empty_braces = false
-# Do not insert a space before opening brace of uniform initialization and initializer lists
-cpp_space_before_initializer_list_open_brace = false
-# No override for "Insert space within braces of uniform initialization and initializer lists" (Spacing for this varies)
-#cpp_space_within_initializer_list_braces
-# Preserve spaces inside uniform initialization and initializer lists
-cpp_space_preserve_in_initializer_list = true
-# Do not insert space before opening square brackets
-cpp_space_before_open_square_bracket = false
-# Do not insert space within square bracket
-cpp_space_within_square_brackets = false
-# Do not insert space before empty square brackets
-cpp_space_before_empty_square_brackets = false
-# Do not insert space between empty square brackets
-cpp_space_between_empty_square_brackets = false
-# Group square brackets for multi-dimensional arrays together
-cpp_space_group_square_brackets = true
-# Do not insert space within square brackets for lambdas
-cpp_space_within_lambda_brackets = false
-# Do not insert space between empty lambda brackets
-cpp_space_between_empty_lambda_brackets = false
-# Do not insert space before commas
-cpp_space_before_comma = false
-# Insert space after commas
-cpp_space_after_comma = true
-# Remove spaces before and after member operators
-cpp_space_remove_around_member_operators = true
-# Insert space before colon for base in type declarations
-cpp_space_before_inheritance_colon = true
-# Insert space before colon for constructors
-cpp_space_before_constructor_colon = true
-# Remove space before semicolons
-cpp_space_remove_before_semicolon = true
-# No override for "Insert space after semicolons" (Depends on if loop is unconditional)
-#cpp_space_after_semicolon
-# Remove spaces between unary operators and their operands
-cpp_space_remove_around_unary_operator = true
-# Insert spaces before and after binary operators
-cpp_space_around_binary_operator = insert
-# Insert spaces around assignment operators
-cpp_space_around_assignment_operator = insert
-# Align pointer/reference symbol to the right
-cpp_space_pointer_reference_alignment = right
-# Insert spaces around conditional operators
-cpp_space_around_ternary_operator = insert
-
-# Wrapping #
-# Always apply New Lines settings for blocks
-cpp_wrap_preserve_blocks = never
-
-
-
-## Rider & ReSharper ## https://www.jetbrains.com/help/resharper/EditorConfig_CPP_CppBlankLinesPageScheme.html ##
-# Blank Lines #
-# No override for "Max blank lines in declarations" (Unspecified; Not consistent across source code)
-#cpp_keep_blank_lines_in_declarations
-# No override for "Max blank lines in rest of source code" (Unspecified; Not consistent across source code)
-#cpp_keep_blank_lines_in_code
-# No override for "Number of blank lines around class/struct/enum definition" (Unspecified; Not consistent across source code)
-#cpp_blank_lines_around_class_definition
-# No override for "Number of blank lines around function declarations" (Unspecified; Not consistent across source code)
-#cpp_blank_lines_around_function_declaration
-# No override for "Number of blank lines around function definitions" (Unspecified; Not consistent across source code)
-#cpp_blank_lines_around_function_definition
-# No override for "Number of blank lines around single line function definitions" (Unspecified; Not consistent across source code)
-#cpp_blank_lines_around_single_line_function_definition
-# No override for "Number of blank lines around namespaces" (Unspecified; Not consistent across source code)
-#cpp_blank_lines_around_namespace
-# No override for "Number of blank lines around other definitions and declarations" (Unspecified; Not consistent across source code)
-#cpp_blank_lines_around_other_declaration
-
-# Braces Layout #
-# Keep open braces for namespace declarations on the same line, but add a space before the brace
-cpp_namespace_declaration_braces = end_of_line
-# Keep open braces for linkage declarations on the same line, but add a space before the brace
-cpp_linkage_specification_braces = end_of_line
-# Keep open braces for types/classes on the same line, but add a space before the brace
-cpp_type_declaration_braces = end_of_line
-# Keep open braces for namespace definitions on the same line (does not modify spacing before the brace)
-cpp_place_namespace_definitions_on_same_line = true
-# Move open braces for functions to a new line
-cpp_invocable_declaration_braces = next_line
-# Keep open braces for lambdas on the same line, but add a space before the brace
-cpp_anonymous_method_declaration_braces = end_of_line
-# Keep open braces for case blocks on the same line, but add a space before the brace
-cpp_case_block_braces = end_of_line
-# No override for "Requires expression braces" style (requires expressions are a C++20 feature)
-#cpp_requires_expression_braces
-# Keep open braces for all other blocks on the same line, but add a space before the brace
-cpp_other_braces = end_of_line
-# Only indent the insides of multi-line expression braces
-cpp_expression_braces = inside
-# Place the braces of empty blocks together and on the same line
-cpp_empty_block_style = together_same_line
-# Force line breaks within simple compound statements
-cpp_simple_block_style = line_break
-# No override for "Regular expression for macros starting a block" (Marco blocks aren't used)
-#cpp_macro_block_begin
-# No override for "Regular expression for macros ending a block" (Marco blocks aren't used)
-#cpp_macro_block_end
-
-# Tabs and indents #
-# Redundant override (Already overriden globally by 'indent_style')
-#cpp_indent_style
-# Redundant override (Already overriden globally by 'indent_size')
-#cpp_indent_size
-# Redundant override (Already overriden globally by 'tab_width')
-#cpp_tab_width
-# Use spaces instead of tabs as indentation for precise alignment
-cpp_alignment_tab_fill_style = use_spaces
-# Allow alignment even if construct is located too far to the right, more than 2/3 of 'Hard wrap at' limit
-cpp_allow_far_alignment = true
-
-# Indentation and Alignment #
-# No override for "Continuous line indent" (Varies throughout source code)
-#cpp_continuous_line_indent
-# Do not use continuous line indent in function declaration and invocation parentheses
-cpp_use_continuous_line_indent_in_method_pars = false
-# Do not use continuous line indent in initializer lists
-cpp_use_continuous_line_indent_in_expression_braces = false
-# Indent namespace members (including nested ones)
-cpp_namespace_indentation = all
-# No override for "Indent linkage specification block members" (Unspecified)
-#cpp_linkage_specification_indentation
-# Do not indent access specifier from class
-cpp_indent_access_specifiers_from_class = false
-# Indent class member from access specifier
-cpp_indent_class_members_from_access_specifiers = true
-# Do not indent if a function definition or declaration is wrapped after the type
-cpp_indent_wrapped_function_names = false
-# Indent 'case' labels from 'switch'
-cpp_indent_switch_labels = true
-# No override for "Indent function declarations' parentheses" (Varies throughout source code)
-#cpp_indent_method_decl_pars
-# No override for "Indent method calls' parentheses" (Varies throughout source code)
-#cpp_indent_invocation_pars
-# No override for "Indent statement (if, while, for, etc) parentheses" (Varies throughout source code)
-#cpp_indent_statement_pars
-# Do not change preprocessor directives indenting
-cpp_indent_preprocessor_directives = do_not_change
-# No override for "Indent C++/CLI generic constraints" (C++/CLI is not used)
-#cpp_indent_type_constraints
-# Align/indent comments started at the first column
-cpp_indent_comment = true
-# Comments that comment out code will use the indentation level of the commented code.
-cpp_place_comments_at_first_column = false
-# Align multiline declarators in declaration
-cpp_align_multiple_declaration = true
-# Align multiline function parameters
-cpp_align_multiline_parameter = true
-# Align multiline call arguments
-cpp_align_multiline_argument = true
-# Do not align first of multiline call arguments with the opening parentheses
-cpp_align_first_arg_by_paren = false
-# Align multiline initializer list arguments
-cpp_align_multiline_expression_brace = true
-# No override for "Align multiline template parameters in template declaration" (Unspecified)
-#cpp_align_multiline_type_parameter
-# No override for "Align multiline template arguments" (Unspecified)
-#cpp_align_multiline_type_argument
-# Align multiline base classes in class base clause
-cpp_align_multiline_extends_list = true
-# Align multiline member initializers in member initializer lists
-cpp_align_multiline_ctor_init = true
-# Outdent commas placed on new line
-cpp_outdent_commas = true
-# Do not align multiline ?: operator with first line (since alignment is incorrect)
-cpp_align_ternary = none
-# Do not indent aligned ?: operator (since indentation varies)
-cpp_indent_aligned_ternary = false
-# No override for "Align multiline chained method calls" (Unspecified)
-#cpp_align_multiline_calls_chain
-# No override for "Outdent '.' and '->' in chained method calls on new lines" (Unspecified)
-#cpp_outdent_dots
-# Do not align multiline chained binary expressions
-cpp_align_multiline_binary_expressions_chain = false
-# Fix column alignment in adjacent lines
-cpp_int_align_fix_in_adjacent = true
-# Align assignments with adjacent assignments
-cpp_int_align_eq = true
-# Do not align declaration names with adjacent declaration names
-cpp_int_align_declaration_names = false
-# Align end-of-line comments with adjacent end-of-line comments
-cpp_int_align_comments = true
-
-# Spaces #
-# Do not put space before ANY commas
-cpp_space_before_comma = false
-# Put space after ALL commas
-cpp_space_after_comma = true
-# Put space before ptr in declaration of variable
-cpp_space_before_ptr_in_data_member = true
-# Do not put space after ptr in declaration of variable
-cpp_space_after_ptr_in_data_member = false
-# Put space before ptr in declaration of multiple variables
-cpp_space_before_ptr_in_data_members = true
-# Do not put space after ptr in declaration of multiple variables
-cpp_space_after_ptr_in_data_members = false
-# Put space before ptr in return type of function
-cpp_space_before_ptr_in_method = true
-# Do not put space after ptr in return type of function
-cpp_space_after_ptr_in_method = false
-# Do not put space before ptr in abstract declaration
-cpp_space_before_ptr_in_abstract_decl = false
-# Put space before ref in declaration of variable
-cpp_space_before_ref_in_data_member = true
-# Do not put space after ref in declaration of variable
-cpp_space_after_ref_in_data_member = false
-# Put space before ref in declaration of multiple variables
-cpp_space_before_ref_in_data_members = true
-# Do not put space after ref in declaration of multiple variables
-cpp_space_after_ref_in_data_members = false
-# Do not put space before ref in return type of function
-cpp_space_before_ref_in_method = false
-# Put space after ref in return type of function
-cpp_space_after_ref_in_method = true
-# Do not put space before ref in abstract declaration
-cpp_space_before_ref_in_abstract_decl = false
-# Do not put space before parentheses in function parameters
-cpp_space_between_method_declaration_name_and_open_parenthesis = false
-# Do not put space before parentheses in lambda parameters
-cpp_space_before_lambda_parentheses = false
-# Do not put space within parentheses in function parameters
-cpp_space_between_method_declaration_parameter_list_parentheses = false
-# Do not put space within empty parentheses in function parameters
-cpp_space_between_method_declaration_empty_parameter_list_parentheses = false
-# Do not put space before angle brackets in template parameters
-cpp_space_before_template_params = false
-# Do not put space within angle brackets in template parameters
-cpp_space_within_template_params = false
-# Do not put space within empty angle brackets in template parameters
-cpp_space_within_empty_template_params = false
-# Do not put space before angle brackets in template arguments
-cpp_space_before_template_args = false
-# Do not put space within angle brackets in template arguments
-cpp_space_within_template_args = false
-# Do not put space between closing angle brackets in template arguments
-cpp_space_between_closing_angle_brackets_in_template_args = false
-# Put space around '=' in alias declaration and namespace alias
-cpp_space_around_alias_eq = true
-# Do not put space around '->' in trailing return types
-cpp_space_around_deref_in_trailing_return_type = false
-# Put space before base types list colon
-cpp_space_before_colon_in_inheritance_clause = true
-# Put space after base types list colon
-cpp_space_after_colon_in_inheritance_clause = true
-# No override for "Before C++/CLI generic constraint colon" (Unspecified)
-#cpp_space_before_type_parameter_constraint_colon
-# No override for "After C++/CLI generic constraint colon" (Unspecified)
-#cpp_space_after_type_parameter_constraint_colon
-# Put space before parentheses of control statements
-cpp_space_after_keywords_in_control_flow_statements = true
-# Do not put space within parentheses of control statements
-cpp_space_between_parentheses_of_control_flow_statements = false
-# Do not put space before semicolon in 'for' statements
-cpp_space_before_semicolon_in_for_statement = false
-# Put space after semicolon in 'for' statements
-cpp_space_after_semicolon_in_for_statement = true
-# Put space before ':' in range-based for loop
-cpp_space_before_for_colon = true
-# Put space after ':' in range-based for loop
-cpp_space_after_for_colon = true
-# Do not put space before colon in switch case or label statement
-cpp_space_before_colon_in_case = false
-# Put space after colon in switch case or label statement
-cpp_space_after_colon_in_case = true
-# Put space around binary operator
-cpp_space_around_binary_operator = true
-# Put space around assignment operator
-cpp_space_around_assignment_operator = true
-# Do not put space around dot, '->', '.*' and '->.'
-cpp_space_around_member_access_operator = false
-# Do not put space within any parentheses
-cpp_space_within_parentheses = false
-# Do not put space before array subscript brackets
-cpp_space_before_open_square_brackets = false
-# Do not put space within array subscript brackets
-cpp_space_between_square_brackets = false
-# Do not put space before empty parentheses in function call and initialization
-cpp_space_between_method_call_name_and_opening_parenthesis = false
-# Do not put space within parentheses in cast expressions
-cpp_space_between_typecast_parentheses = false
-# Do not put space after parentheses in cast expressions
-cpp_space_after_cast = false
-# Do not put space within parentheses in function call and initialization
-cpp_space_between_method_call_parameter_list_parentheses = false
-# Do not put space within empty parentheses in function call and initialization
-cpp_space_between_method_call_empty_parameter_list_parentheses = false
-# Put space in ternary operator '? :' before '?'
-cpp_space_before_ternary_quest = true
-# Put space in ternary operator '? :' after '?'
-cpp_space_after_ternary_quest = true
-# Put space in ternary operator '? :' before ':'
-cpp_space_before_ternary_colon = true
-# Put space in ternary operator '? :' after ':'
-cpp_space_after_ternary_colon = true
-# Do not put space before uniform initialization braces
-cpp_space_before_initializer_braces = false
-# Do not put space within uniform initialization braces
-cpp_space_within_initializer_braces = false
-# Do not put space within empty uniform initialization braces
-cpp_space_within_empty_initializer_braces = false
-# Put space before end of line comment
-cpp_space_before_trailing_comment = true
-# Preserve spaces before end of line comment
-cpp_disable_space_changes_before_trailing_comment = true
-
-# Line breaks and Wrapping #
-# Redundant override (Already overriden globally by 'insert_final_newline')
-#cpp_insert_final_newline
-# Redundant override (Already overriden earlier in Visual Studio section)
-#cpp_new_line_before_else
-# Do not place 'while' in a do-while loop on a new line
-cpp_new_line_before_while = false
-# Redundant override (Already overriden earlier in Visual Studio section)
-#cpp_new_line_before_catch
-# Do not change the line breaks of single embedded statements
-cpp_simple_embedded_statement_style = do_not_change
-# Do not change the line breaks of simple 'case' statement
-cpp_simple_case_statement_style = do_not_change
-# Put member function definition return type on same line
-cpp_function_definition_return_type_style = on_single_line
-# Put top-level function definition return type on same line
-cpp_toplevel_function_definition_return_type_style = on_single_line
-# Put member function declaration return type on same line
-cpp_function_declaration_return_type_style = on_single_line
-# Put top-level function declaration return type on same line
-cpp_toplevel_function_declaration_return_type_style = on_single_line
-# Force template<...> of a template declaration on new line
-cpp_break_template_declaration = line_break
-# No override for "Break line before the requires-clause" (requires-clause is a C++20 feature)
-#cpp_line_break_before_requires_clause
-# Do not change the line break before the colon in member initializer lists
-cpp_member_initializer_list_style = do_not_change
-# Do not change the line break after the colon in member initializer lists
-cpp_line_break_after_colon_in_member_initializer_lists = do_not_change
-# No override for "Break line before comma in member initializer lists" (Varies throughout source code)
-#cpp_line_break_before_comma_in_member_initializer_lists
-# No override for "Break line after comma in member initializer lists" (Varies throughout source code)
-#cpp_line_break_after_comma_in_member_initializer_lists
-# No override for "Allow C++/CLI generic constraints on the same line" (C++/CLI is not used)
-#cpp_place_type_constraints_on_same_line
-# No override for "Keep existing line breaks" (Varies throughout source code; depends on developer preference)
-#cpp_keep_user_linebreaks
-# No override for "Hard wrap at _ characters" (Unspecified)
-#cpp_max_line_length
-# Do not prefer wrap before ','
-cpp_wrap_before_comma = false
-# Do not prefer wrap before ',' in base clause
-cpp_wrap_before_comma_in_base_clause = false
-# No override for "Wrap ternary expression" (Varies throughout source code)
-#cpp_wrap_ternary_expr_style
-# No override for "Prefer wrap before '?' and ':' in ternary expressions" (Varies throughout source code)
-#cpp_wrap_before_ternary_opsigns
-# No override for "Prefer wrap before ':'" (Varies throughout source code)
-#cpp_wrap_before_colon
-# No override for "Prefer wrap before first C++/CLI generic constraint" (C++/CLI is not used)
-#cpp_wrap_before_first_type_parameter_constraint
-# No override for "Wrap multiple C++/CLI generic constraints" (C++/CLI is not used)
-#cpp_wrap_multiple_type_parameter_constraints_style
-# No override for "Wrap enum definition" (Varies throughout source code)
-#cpp_wrap_enumeration_style
-# No override for "Wrap braced initializer list" (Varies throughout source code)
-#cpp_wrap_braced_init_list_style
-# No override for "Wrap base classes list" (Varies throughout source code)
-#cpp_wrap_base_clause_style
-# No override for "Wrap constructor initializer" (Varies throughout source code)
-#cpp_wrap_ctor_initializer_style
-# No override for "Wrap formal parameters" (Varies throughout source code)
-#cpp_wrap_parameters_style
-# Do not prefer wrap before '(' in declaration
-cpp_wrap_before_declaration_lpar = false
-# Prefer wrap after '(' in declaration
-cpp_wrap_after_declaration_lpar = true
-# Do not prefer wrap before ')' in declaration
-cpp_wrap_before_declaration_rpar = false
-# No override for "Wrap invocation arguments" (Varies throughout source code)
-#cpp_wrap_arguments_style
-# Do not prefer wrap before '(' in invocation
-cpp_wrap_before_invocation_lpar = false
-# Prefer wrap after '(' in invocation
-cpp_wrap_after_invocation_lpar = true
-# Do not prefer wrap before ')' in invocation
-cpp_wrap_before_invocation_rpar = false
-# Prefer wrap after '{' in initializer lists
-cpp_wrap_after_expression_lbrace = true
-# Do not prefer wrap before '}' in initializer lists
-cpp_wrap_before_expression_rbrace = false

.github/ISSUE_TEMPLATE.md

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

.github/ISSUE_TEMPLATE/bug.yaml

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/crash.yaml

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

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,13 +1,3 @@
-<!--
-Commit message:
-
-- Please use Feature / Add / Change / Fix for player-facing changes. E.g.: "Feature: My cool new feature".
-- Please use Feature / Add / Change / Fix followed by "[NewGRF]" or "[Script]" for moddable changes. E.g.: "Feature: [NewGRF] My cool new NewGRF addition".
-- Please use Codechange / Codefix for developer-facing changes. E.g.: "Codefix #1234: Validate against nullptr properly".
-
-See https://github.com/OpenTTD/OpenTTD/blob/master/CODINGSTYLE.md#commit-message for more details.
--->
-
 ## Motivation / Problem
 
 <!--
@@ -49,9 +39,9 @@ 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.
+    * ai_changelog.hpp, gs_changelog.hpp need updating.
     * The compatibility wrappers (compat_*.nut) need updating.
 * This PR affects the NewGRF API? (label 'needs review: NewGRF')
     * newgrf_debug_data.h may need updating.

.github/changelog.py

@@ -1,36 +0,0 @@
-import sys
-
-"""
-This script assumes changelogs use the following format:
-    ## <major>.x (eg. "## 15.x") to indicate a major version series
-    ### <major>.<minor>[-<suffix>] <date etc> (eg. "## 15.0 (2025-04-01)", "### 15.1-beta1 (2024-12-25)") to indicate an individual version
-"""
-
-def main():
-    current_version = sys.argv[1]
-    stable_version = current_version.split("-")[0]
-    major_version = current_version.split(".")[0]
-    # set when current version is found
-    current_found = False
-
-    with open("changelog.md", "r") as file:
-        for line in file:
-            if line.startswith("### "):
-                if not line.startswith(f"### {current_version} ") and not current_found:
-                    # First version in changelog should be the current one
-                    sys.stderr.write(f"Changelog doesn't start with current version ({current_version})\n")
-                    sys.exit(1)
-                if not line.startswith(f"### {stable_version}"):
-                    # Reached a previous stable version
-                    break
-                if line.startswith(f"### {current_version} "):
-                    current_found = True
-            elif line.startswith("## "):
-                if not line.startswith(f"## {major_version}.x"):
-                    # Reached a previous major version
-                    break
-
-            print(line.rstrip())
-
-if __name__ == '__main__':
-    main()

.github/changelog.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+tag=$(git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null | sed 's@\^0$@@')
+
+# If we are a tag, show the part of the changelog till (but excluding) the last stable
+if [ -n "$tag" ]; then
+    grep='^[0-9]\+\.[0-9]\+\.[0-9]\+[^-]'
+    next=$(cat changelog.txt | grep '^[0-9]' | awk 'BEGIN { show="false" } // { if (show=="true") print $0; if ($1=="'$tag'") show="true"} ' | grep "$grep" | head -n1 | sed 's/ .*//')
+    cat changelog.txt | awk 'BEGIN { show="false" } /^[0-9]+.[0-9]+.[0-9]+/ { if ($1=="'$next'") show="false"; if ($1=="'$tag'") show="true";} // { if (show=="true") print $0 }'
+    exit 0
+fi
+
+# In all other cases, show the git log of the last 7 days
+revdate=$(git log -1 --pretty=format:"%ci")
+last_week=$(date -d "$revdate -7days" +"%Y-%m-%d %H:%M")
+git log --after="${last_week}" --pretty=fuller

.github/codeql/codeql-config.yml

@@ -1,12 +0,0 @@
-name: openttd
-queries:
-- uses: security-and-quality
-query-filters:
-- exclude:
-    id:
-    # Only feasible way is to move away from fopen; fopen_s is optional C11 and not implemented on most platforms.
-    - cpp/world-writable-file-creation
-    # Basically OpenTTD's coding style for adding things like ..._INVALID to enumerations
-    - 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

.github/dependabot.yml

@@ -1,10 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: "monthly"
-  groups:
-    actions:
-      patterns:
-      - "*"

.github/script-missing-mode-enforcement.py

@@ -1,71 +0,0 @@
-"""
-Script to scan the OpenTTD's script API for functions that miss checks for the
-function being called from the right mode (deity or company mode).
-
-When a function calls either ScriptObject::Command or ScriptObject::GetCompany
-then the function is considered dangerous. When one of the mode enforcement
-macros from script_error.hpp, i.e. EnforceDeityMode, EnforceCompanyModeValid or
-EnforceDeityOrCompanyModeValid, are called in the function, then we consider
-that the function has mode enforcement.
-
-Any dangerous function for which no enforcement is found are emitted as errors.
-"""
-
-import glob
-import re
-import sys
-
-
-def check_mode_enforcement(path):
-    errors = []
-    with open(path, "r") as reader:
-        mode_enforcement_found = False
-        dangerous_function = False
-        for line in reader:
-            # Line does not start with a tab and have <word>::<word>. That looks like the begin of a function, so reset the state.
-            if re.match(r"^[^\t].*\w::\w", line):
-                mode_enforcement_found = False
-                dangerous_function = False
-                currentFunction = line
-                continue
-
-            if re.match(
-                r"\t(EnforceDeityMode|EnforceCompanyModeValid|EnforceCompanyModeValid_Void|EnforceDeityOrCompanyModeValid|EnforceDeityOrCompanyModeValid_Void)\(",
-                line,
-            ):
-                # Mode enforcement macro found
-                mode_enforcement_found = True
-                continue
-
-            if re.match(r".*(ScriptObject::Command|ScriptObject::GetCompany).*", line):
-                # Dangerous function found
-                dangerous_function = True
-                continue
-
-            # Line with only a closing bracket. That looks like the end of a function, so check for the dangerous function without mode enforcement
-            if re.match(r"^}$", line) and dangerous_function and not mode_enforcement_found:
-                function_name = currentFunction.rstrip("\n").replace("/* static */ ", "")
-                errors.append(f"{path}: {function_name}")
-
-    return errors
-
-
-def main():
-    errors = []
-    for path in sorted(glob.glob("src/script/api/*.cpp")):
-        # Skip a number of files that yield only false positives
-        if path.endswith(("script_object.cpp", "script_companymode.cpp", "script_controller.cpp", "script_game.cpp")):
-            continue
-
-        errors.extend(check_mode_enforcement(path))
-
-    if errors:
-        print("Mode enforcement was expected in the following files/functions:")
-        print("\n".join(errors))
-        sys.exit(1)
-
-    print("OK")
-
-
-if __name__ == "__main__":
-    main()

.github/stale.yml

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

.github/unused-strings.py

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

.github/workflows/ci-build.yml

@@ -1,4 +1,4 @@
-name: CI - Build
+name: CI
 
 on:
   pull_request:
@@ -9,100 +9,309 @@ on:
 env:
   CTEST_OUTPUT_ON_FAILURE: 1
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
-
 jobs:
   emscripten:
     name: Emscripten
 
-    uses: ./.github/workflows/ci-emscripten.yml
-    secrets: inherit
-
-  linux:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - name: Clang
-          compiler: clang
-          cxxcompiler: clang++
-          libraries: libsdl2-dev
-        - name: GCC - SDL2
-          compiler: gcc
-          cxxcompiler: g++
-          libraries: libsdl2-dev
-        - name: GCC - Dedicated
-          compiler: gcc
-          cxxcompiler: g++
-          libraries: grfcodec
-          extra-cmake-parameters: -DOPTION_DEDICATED=ON -DCMAKE_CXX_FLAGS_INIT="-DRANDOM_DEBUG" -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
-          # Compile without SDL / SDL2, as that should compile fine too.
-
-    name: Linux (${{ matrix.name }})
-
-    uses: ./.github/workflows/ci-linux.yml
-    secrets: inherit
-
-    with:
-      compiler: ${{ matrix.compiler }}
-      cxxcompiler: ${{ matrix.cxxcompiler }}
-      libraries: ${{ matrix.libraries }}
-      extra-cmake-parameters: ${{ matrix.extra-cmake-parameters }}
-
-  macos:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - name: arm64 - Debug
-          arch: arm64
-          full_arch: arm64
-          extra-cmake-parameters: -DCMAKE_BUILD_TYPE=Debug
-        - name: arm64 - Release
-          arch: arm64
-          full_arch: arm64
-          extra-cmake-parameters: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPTION_USE_ASSERTS=OFF
-
-    name: Mac OS (${{ matrix.name }})
-
-    uses: ./.github/workflows/ci-macos.yml
-    secrets: inherit
-
-    with:
-      arch: ${{ matrix.arch }}
-      full_arch: ${{ matrix.full_arch }}
-      extra-cmake-parameters: ${{ matrix.extra-cmake-parameters }}
-
-  windows:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - arch: x86
-        - arch: x64
-
-    name: Windows (${{ matrix.arch }})
-
-    uses: ./.github/workflows/ci-windows.yml
-    secrets: inherit
-
-    with:
-      arch: ${{ matrix.arch }}
-
-  check_annotations:
-    name: Check Annotations
-    needs:
-    - emscripten
-    - linux
-    - macos
-    - windows
-
-    if: always() && github.event_name == 'pull_request'
-
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
+    container:
+      # If you change this version, change the number in the cache step too.
+      image: emscripten/emsdk:2.0.10
 
     steps:
-    - name: Check annotations
-      uses: OpenTTD/actions/annotation-check@v5
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup cache
+      uses: actions/cache@v2
+      with:
+        path: /emsdk/upstream/emscripten/cache
+        key: 2.0.10-${{ runner.os }}
+
+    - name: Build (host tools)
+      run: |
+        mkdir build-host
+        cd build-host
+
+        echo "::group::CMake"
+        cmake .. -DOPTION_TOOLS_ONLY=ON
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(nproc) cores"
+        cmake --build . -j $(nproc) --target tools
+        echo "::endgroup::"
+
+    - name: Install GCC problem matcher
+      uses: ammaraskar/gcc-problem-matcher@master
+
+    - name: Build
+      run: |
+        mkdir build
+        cd build
+
+        echo "::group::CMake"
+        emcmake cmake .. -DHOST_BINARY_DIR=../build-host
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(nproc) cores"
+        cmake --build . -j $(nproc)
+        echo "::endgroup::"
+
+  linux:
+    name: Linux
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - compiler: clang
+          cxxcompiler: clang++
+          libsdl: libsdl2-dev
+        - compiler: gcc
+          cxxcompiler: g++
+          libsdl: libsdl2-dev
+        - compiler: gcc
+          cxxcompiler: g++
+          libsdl: libsdl1.2-dev
+        - compiler: gcc
+          cxxcompiler: g++
+          extra-cmake-parameters: -DOPTION_DEDICATED=ON
+
+    runs-on: ubuntu-20.04
+    env:
+      CC: ${{ matrix.compiler }}
+      CXX: ${{ matrix.cxxcompiler }}
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Install dependencies
+      run: |
+        echo "::group::Update apt"
+        sudo apt-get update
+        echo "::endgroup::"
+
+        echo "::group::Install dependencies"
+        sudo apt-get install -y --no-install-recommends \
+          liballegro4-dev \
+          libfontconfig-dev \
+          libicu-dev \
+          liblzma-dev \
+          liblzo2-dev \
+          ${{ matrix.libsdl }} \
+          zlib1g-dev \
+          # EOF
+        echo "::endgroup::"
+      env:
+        DEBIAN_FRONTEND: noninteractive
+
+    - name: Get OpenGFX
+      run: |
+        mkdir -p ~/.local/share/openttd/baseset
+        cd ~/.local/share/openttd/baseset
+
+        echo "::group::Download OpenGFX"
+        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip
+        echo "::endgroup::"
+
+        echo "::group::Unpack OpenGFX"
+        unzip opengfx-all.zip
+        echo "::endgroup::"
+
+        rm -f opengfx-all.zip
+
+    - name: Install GCC problem matcher
+      uses: ammaraskar/gcc-problem-matcher@master
+
+    - name: Build
+      run: |
+        mkdir build
+        cd build
+
+        echo "::group::CMake"
+        cmake .. ${{ matrix.extra-cmake-parameters }}
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(nproc) cores"
+        cmake --build . -j $(nproc)
+        echo "::endgroup::"
+
+    - name: Test
+      run: |
+        cd build
+        ctest -j $(nproc) --timeout 120
+
+  macos:
+    name: Mac OS
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - arch: x64
+          full_arch: x86_64
+
+    runs-on: macos-latest
+    env:
+      MACOSX_DEPLOYMENT_TARGET: 10.9
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Prepare cache key
+      id: key
+      run: |
+        echo "::set-output name=image::$ImageOS-$ImageVersion"
+
+    - name: Enable vcpkg cache
+      uses: actions/cache@v2
+      with:
+        path: /usr/local/share/vcpkg/installed
+        key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-0 # Increase the number whenever dependencies are modified
+        restore-keys: |
+          ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}
+
+    - name: Prepare vcpkg
+      run: |
+        vcpkg install --triplet=${{ matrix.arch }}-osx \
+          liblzma \
+          libpng \
+          lzo \
+          zlib \
+          # EOF
+
+    - name: Install OpenGFX
+      run: |
+        mkdir -p ~/Documents/OpenTTD/baseset
+        cd ~/Documents//OpenTTD/baseset
+
+        echo "::group::Download OpenGFX"
+        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip
+        echo "::endgroup::"
+
+        echo "::group::Unpack OpenGFX"
+        unzip opengfx-all.zip
+        echo "::endgroup::"
+
+        rm -f opengfx-all.zip
+
+    - name: Install GCC problem matcher
+      uses: ammaraskar/gcc-problem-matcher@master
+
+    - name: Build
+      run: |
+        mkdir build
+        cd build
+
+        echo "::group::CMake"
+        cmake ${GITHUB_WORKSPACE} \
+          -DCMAKE_OSX_ARCHITECTURES=${{ matrix.full_arch }} \
+          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-osx \
+          -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
+          # EOF
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(sysctl -n hw.logicalcpu) cores"
+        cmake --build . -j $(sysctl -n hw.logicalcpu)
+        echo "::endgroup::"
+
+    - name: Test
+      run: |
+        cd build
+        ctest -j $(sysctl -n hw.logicalcpu) --timeout 120
+
+  windows:
+    name: Windows
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, windows-2016]
+        arch: [x86, x64]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Prepare cache key
+      id: key
+      shell: powershell
+      run: |
+        # Work around caching failure with GNU tar
+        New-Item -Type Junction -Path vcpkg -Target c:\vcpkg
+
+        Write-Output "::set-output name=image::$env:ImageOS-$env:ImageVersion"
+
+    - name: Enable vcpkg cache
+      uses: actions/cache@v2
+      with:
+        path: vcpkg/installed
+        key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-0 # Increase the number whenever dependencies are modified
+        restore-keys: |
+          ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}
+
+    - name: Prepare vcpkg
+      shell: bash
+      run: |
+        vcpkg install --triplet=${{ matrix.arch }}-windows-static \
+          liblzma \
+          libpng \
+          lzo \
+          zlib \
+          # EOF
+
+    - name: Install OpenGFX
+      shell: bash
+      run: |
+        mkdir -p "C:/Users/Public/Documents/OpenTTD/baseset"
+        cd "C:/Users/Public/Documents/OpenTTD/baseset"
+
+        echo "::group::Download OpenGFX"
+        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip
+        echo "::endgroup::"
+
+        echo "::group::Unpack OpenGFX"
+        unzip opengfx-all.zip
+        echo "::endgroup::"
+
+        rm -f opengfx-all.zip
+
+    - name: Install MSVC problem matcher
+      uses: ammaraskar/msvc-problem-matcher@master
+
+    - name: Configure developer command prompt for ${{ matrix.arch }}
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: ${{ matrix.arch }}
+
+    - name: Build
+      shell: bash
+      run: |
+        mkdir build
+        cd build
+
+        echo "::group::CMake"
+        cmake .. \
+          -GNinja \
+          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
+          -DCMAKE_TOOLCHAIN_FILE="c:\vcpkg\scripts\buildsystems\vcpkg.cmake" \
+          # EOF
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        cmake --build .
+        echo "::endgroup::"
+
+    - name: Test
+      shell: bash
+      run: |
+        cd ${GITHUB_WORKSPACE}/build
+        ctest --timeout 120

.github/workflows/ci-emscripten.yml

@@ -1,75 +0,0 @@
-name: CI (Emscripten)
-
-on:
-  workflow_call:
-
-env:
-  CTEST_OUTPUT_ON_FAILURE: 1
-
-jobs:
-  emscripten:
-    name: CI
-
-    runs-on: ubuntu-latest
-    container:
-      # If you change this version, change the numbers in the cache step,
-      # .github/workflows/preview-build.yml (2x) and os/emscripten/Dockerfile too.
-      image: emscripten/emsdk:3.1.57
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Fix dubious ownership
-      run: |
-        git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-    - name: Update to modern GCC
-      run: |
-        apt-get update
-        apt-get install -y gcc-12 g++-12
-        update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100
-        update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100
-
-    - name: Setup cache
-      uses: actions/cache@v4
-      with:
-        # If you change this version, change the numbers in the image configuration step,
-        # .github/workflows/preview-build.yml (2x) and os/emscripten/Dockerfile too.
-        path: /emsdk/upstream/emscripten/cache
-        key: 3.1.57-${{ runner.os }}
-
-    - name: Add liblzma support
-      run: |
-        cp ${GITHUB_WORKSPACE}/os/emscripten/ports/liblzma.py /emsdk/upstream/emscripten/tools/ports/contrib/
-
-    - name: Build (host tools)
-      run: |
-        mkdir build-host
-        cd build-host
-
-        echo "::group::CMake"
-        cmake .. -DOPTION_TOOLS_ONLY=ON
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        cmake --build . -j $(nproc) --target tools
-        echo "::endgroup::"
-
-    - name: Install GCC problem matcher
-      uses: ammaraskar/gcc-problem-matcher@master
-
-    - name: Build
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        emcmake cmake .. -DHOST_BINARY_DIR=../build-host
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        cmake --build . -j $(nproc) --target openttd
-        echo "::endgroup::"

.github/workflows/ci-linux.yml

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

.github/workflows/ci-macos.yml

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

.github/workflows/ci-mingw.yml

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

.github/workflows/ci-nightly.yml

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

.github/workflows/ci-windows.yml

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

.github/workflows/codeql.yml

@@ -1,122 +0,0 @@
-name: CodeQL
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches:
-    - master
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Setup vcpkg caching
-      uses: actions/github-script@v7
-      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;x-gha,readwrite')
-
-    - name: Install vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg
-        ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
-
-    - name: Install dependencies
-      run: |
-        echo "::group::Update apt"
-        sudo apt-get update
-        echo "::endgroup::"
-
-        echo "::group::Install dependencies"
-        sudo apt-get install -y --no-install-recommends \
-          liballegro4-dev \
-          libcurl4-openssl-dev \
-          libfontconfig-dev \
-          libharfbuzz-dev \
-          libicu-dev \
-          liblzma-dev \
-          liblzo2-dev \
-          libopus-dev \
-          libopusfile-dev \
-          libsdl2-dev \
-          zlib1g-dev \
-          # EOF
-
-        echo "::group::Install vcpkg dependencies"
-
-        # Disable vcpkg integration, as we mostly use system libraries.
-        mv vcpkg.json vcpkg-disabled.json
-
-        # We only use breakpad from vcpkg, as its CMake files
-        # are a bit special. So the Ubuntu's variant doesn't work.
-        ${{ runner.temp }}/vcpkg/vcpkg install breakpad
-
-        echo "::endgroup::"
-      env:
-        DEBIAN_FRONTEND: noninteractive
-
-    - name: Prepare build
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake
-        echo "::endgroup::"
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: cpp
-        config-file: ./.github/codeql/codeql-config.yml
-        trap-caching: false
-
-    - name: Build
-      run: |
-        cd build
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        cmake --build . -j $(nproc)
-        echo "::endgroup::"
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: /language:cpp
-        upload: False
-        output: sarif-results
-
-    - name: Filter out table & generated code
-      uses: advanced-security/filter-sarif@v1
-      with:
-        patterns: |
-          +**/*.*
-          -**/table/*.*
-          -**/generated/**/*.*
-          -**/tests/*.*
-        input: sarif-results/cpp.sarif
-        output: sarif-results/cpp.sarif
-
-    - name: Upload results
-      uses: github/codeql-action/upload-sarif@v3
-      with:
-        sarif_file: sarif-results/cpp.sarif

.github/workflows/commit-checker.yml

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

.github/workflows/preview-build.yml

@@ -1,112 +0,0 @@
-name: Preview build
-
-on:
-  workflow_call:
-    secrets:
-      PREVIEW_CLOUDFLARE_API_TOKEN:
-        description: API token to upload a preview to Cloudflare Pages
-        required: true
-      PREVIEW_CLOUDFLARE_ACCOUNT_ID:
-        description: Account ID to upload a preview to Cloudflare Pages
-        required: true
-
-jobs:
-  preview:
-    name: Build preview
-
-    environment:
-      name: preview
-      url: https://preview.openttd.org/pr${{ github.event.pull_request.number }}/
-
-    runs-on: ubuntu-latest
-    container:
-      # If you change this version, change the numbers in the cache step,
-      # .github/workflows/ci-emscripten.yml (2x) and os/emscripten/Dockerfile too.
-      image: emscripten/emsdk:3.1.57
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-
-    - name: Name branch
-      run: |
-        git config --global --add safe.directory ${GITHUB_WORKSPACE}
-        git checkout -b pr${{ github.event.pull_request.number }}
-
-    - name: Update to modern GCC
-      run: |
-        apt-get update
-        apt-get install -y gcc-12 g++-12
-        update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100
-        update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100
-
-    - name: Setup cache
-      uses: actions/cache@v4
-      with:
-        path: /emsdk/upstream/emscripten/cache
-        # If you change this version, change the numbers in the image configuration step,
-        # .github/workflows/ci-emscripten.yml (2x) and os/emscripten/Dockerfile too.
-        key: 3.1.57-${{ runner.os }}
-
-    - name: Add liblzma support
-      run: |
-        cp ${GITHUB_WORKSPACE}/os/emscripten/ports/liblzma.py /emsdk/upstream/emscripten/tools/ports/contrib/
-
-    - name: Build (host tools)
-      run: |
-        mkdir build-host
-        cd build-host
-
-        echo "::group::CMake"
-        cmake .. -DOPTION_TOOLS_ONLY=ON
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        make -j$(nproc) tools
-        echo "::endgroup::"
-
-    - name: Install GCC problem matcher
-      uses: ammaraskar/gcc-problem-matcher@master
-
-    - name: Build
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        emcmake cmake .. \
-          -DHOST_BINARY_DIR=../build-host \
-          -DCMAKE_BUILD_TYPE=Release \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        cmake --build . -j $(nproc) --target openttd
-        echo "::endgroup::"
-
-    - name: Prepare preview
-      run: |
-        mkdir public
-
-        cp build/openttd.data public/
-        cp build/openttd.html public/
-        cp build/openttd.js public/
-        cp build/openttd.wasm public/
-
-        # Ensure we use the latest version of npm; the one we get with current
-        # emscripten doesn't allow running "npx wrangler" as root.
-        # Current emscripten can't install npm>=10.0.0 because node is too old.
-        npm install -g npm@9
-
-    - name: Publish preview
-      uses: cloudflare/pages-action@v1
-      with:
-        apiToken: ${{ secrets.PREVIEW_CLOUDFLARE_API_TOKEN }}
-        accountId: ${{ secrets.PREVIEW_CLOUDFLARE_ACCOUNT_ID }}
-        projectName: ${{ vars.PREVIEW_CLOUDFLARE_PROJECT_NAME }}
-        directory: public
-        branch: pr${{ github.event.pull_request.number }}

.github/workflows/preview.yml

@@ -1,21 +0,0 @@
-name: Preview
-
-on:
-  pull_request_target:
-    types:
-    - labeled
-    - synchronize
-    branches:
-    - master
-    - release/**
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
-jobs:
-  preview:
-    if: ${{ (github.event.action == 'labeled' && github.event.label.name == 'preview') || (github.event.action != 'labeled' && contains(github.event.pull_request.labels.*.name, 'preview')) }}
-    name: Preview
-    uses: ./.github/workflows/preview-build.yml
-    secrets: inherit

.github/workflows/preview_build.yml

@@ -0,0 +1,133 @@
+name: Preview build
+
+on:
+  repository_dispatch:
+    types:
+    - Preview*
+
+jobs:
+  preview:
+    name: Build preview
+
+    runs-on: ubuntu-20.04
+    container:
+      # If you change this version, change the number in the cache step too.
+      image: emscripten/emsdk:2.0.10
+      # uid=1001(runner) gid=121(docker)
+      options: -u 1001:121
+
+    steps:
+    - name: Update deployment status to in progress
+      uses: octokit/request-action@v2.x
+      with:
+        route: POST /repos/{owner}/{repo}/deployments/{deployment_id}/statuses
+        mediaType: |
+          previews:
+          - ant-man
+          - flash
+        owner: ${{ github.event.repository.owner.login }}
+        repo: ${{ github.event.repository.name }}
+        deployment_id: ${{ github.event.client_payload.deployment_id }}
+        state: in_progress
+      env:
+        GITHUB_TOKEN: ${{ secrets.PREVIEW_GITHUB_TOKEN }}
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        ref: ${{ github.event.client_payload.sha }}
+
+    - name: Name branch
+      run: |
+        name=$(echo "${{ github.event.client_payload.folder }}")
+        git checkout -b ${name}
+
+    - name: Setup cache
+      uses: actions/cache@v2
+      with:
+        path: /emsdk/upstream/emscripten/cache
+        key: 2.0.10-${{ runner.os }}
+
+    - name: Build (host tools)
+      run: |
+        mkdir build-host
+        cd build-host
+
+        echo "::group::CMake"
+        cmake .. -DOPTION_TOOLS_ONLY=ON
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(nproc) cores"
+        make -j$(nproc) tools
+        echo "::endgroup::"
+
+    - name: Install GCC problem matcher
+      uses: ammaraskar/gcc-problem-matcher@master
+
+    - name: Build
+      run: |
+        mkdir build
+        cd build
+
+        echo "::group::CMake"
+        emcmake cmake .. \
+          -DHOST_BINARY_DIR=../build-host \
+          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+          # EOF
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(nproc) cores"
+        emmake make -j$(nproc)
+        echo "::endgroup::"
+
+    - name: Publish preview
+      run: |
+        # setuptools is missing in this Docker image, which breaks installing
+        # awscli. So we need to do this in two steps to recover sanity.
+        pip3 install setuptools
+        pip3 install awscli
+
+        ~/.local/bin/aws s3 cp --only-show-errors build/openttd.data s3://${{ secrets.PREVIEW_S3_BUCKET }}/${{ github.event.client_payload.folder }}/
+        ~/.local/bin/aws s3 cp --only-show-errors build/openttd.html s3://${{ secrets.PREVIEW_S3_BUCKET }}/${{ github.event.client_payload.folder }}/
+        ~/.local/bin/aws s3 cp --only-show-errors build/openttd.js s3://${{ secrets.PREVIEW_S3_BUCKET }}/${{ github.event.client_payload.folder }}/
+        ~/.local/bin/aws s3 cp --only-show-errors build/openttd.wasm s3://${{ secrets.PREVIEW_S3_BUCKET }}/${{ github.event.client_payload.folder }}/
+
+        # Invalidate the cache of the CloudFront distribution
+        ~/.local/bin/aws cloudfront create-invalidation --distribution-id ${{ secrets.PREVIEW_CF_DISTRIBUTION_ID }} --paths "/${{ github.event.client_payload.folder }}/*"
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+    - name: Update deployment status to success
+      uses: octokit/request-action@v2.x
+      with:
+        route: POST /repos/{owner}/{repo}/deployments/{deployment_id}/statuses
+        mediaType: |
+          previews:
+          - ant-man
+          - flash
+        owner: ${{ github.event.repository.owner.login }}
+        repo: ${{ github.event.repository.name }}
+        deployment_id: ${{ github.event.client_payload.deployment_id }}
+        state: success
+        environment_url: https://preview.openttd.org/${{ github.event.client_payload.folder }}/
+      env:
+        GITHUB_TOKEN: ${{ secrets.PREVIEW_GITHUB_TOKEN }}
+
+    - if: failure()
+      name: Update deployment status to failure
+      uses: octokit/request-action@v2.x
+      with:
+        route: POST /repos/{owner}/{repo}/deployments/{deployment_id}/statuses
+        mediaType: |
+          previews:
+          - ant-man
+          - flash
+        owner: ${{ github.event.repository.owner.login }}
+        repo: ${{ github.event.repository.name }}
+        deployment_id: ${{ github.event.client_payload.deployment_id }}
+        state: failure
+      env:
+        GITHUB_TOKEN: ${{ secrets.PREVIEW_GITHUB_TOKEN }}

.github/workflows/preview_label.yml

@@ -0,0 +1,66 @@
+name: Preview label
+
+on:
+  pull_request_target:
+    types:
+    - labeled
+
+env:
+  TEAM_CORE_DEVELOPER: core-developers
+
+jobs:
+  check_preview_label:
+    name: Check for preview label
+    if: github.event.action == 'labeled' && github.event.label.name == 'preview'
+
+    runs-on: ubuntu-20.04
+
+    steps:
+    - name: Check if label was added by core developer
+      id: core_developer
+      continue-on-error: true
+      uses: octokit/request-action@v2.x
+      with:
+        route: GET /orgs/OpenTTD/teams/${{ env.TEAM_CORE_DEVELOPER }}/memberships/${{ github.event.sender.login }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.PREVIEW_GITHUB_TOKEN }}
+
+    - if: steps.core_developer.outcome == 'failure'
+      name: Remove preview label if not core developer
+      uses: octokit/request-action@v2.x
+      with:
+        route: DELETE /repos/{owner}/{repo}/issues/{issue_number}/labels/preview
+        owner: ${{ github.event.repository.owner.login }}
+        repo: ${{ github.event.repository.name }}
+        issue_number: ${{ github.event.number }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.PREVIEW_GITHUB_TOKEN }}
+
+    - if: steps.core_developer.outcome == 'success'
+      name: Create deployment
+      id: deployment
+      uses: octokit/request-action@v2.x
+      with:
+        route: POST /repos/{owner}/{repo}/deployments
+        mediaType: |
+          previews:
+          - ant-man
+          - flash
+        owner: ${{ github.event.repository.owner.login }}
+        repo: ${{ github.event.repository.name }}
+        ref: ${{ github.event.pull_request.head.sha }}
+        task: deploy:preview
+        auto_merge: false
+        required_contexts: "[]"
+        environment: preview-pr-${{ github.event.number }}
+        description: "Preview for Pull Request #${{ github.event.number }}"
+      env:
+        GITHUB_TOKEN: ${{ secrets.PREVIEW_GITHUB_TOKEN }}
+
+    - if: steps.core_developer.outcome == 'success'
+      name: Trigger 'preview build'
+      uses: peter-evans/repository-dispatch@v1
+      with:
+        token: ${{ secrets.PREVIEW_GITHUB_TOKEN }}
+        event-type: "Preview build #${{ github.event.number }}"
+        client-payload: '{"folder": "pr${{ github.event.number }}", "sha": "${{ github.event.pull_request.head.sha }}", "deployment_id": "${{ fromJson(steps.deployment.outputs.data).id }}"}'

.github/workflows/preview_push.yml

@@ -0,0 +1,66 @@
+name: Preview push
+
+on:
+  pull_request_target:
+    types:
+    - synchronize
+
+jobs:
+  check_new_preview:
+    name: Check preview needs update
+
+    runs-on: ubuntu-20.04
+
+    steps:
+    - name: Check if earlier preview exists
+      id: earlier_preview
+      uses: octokit/request-action@v2.x
+      with:
+        route: GET /repos/{owner}/{repo}/deployments
+        owner: ${{ github.event.repository.owner.login }}
+        repo: ${{ github.event.repository.name }}
+        environment: preview-pr-${{ github.event.number }}
+        per_page: 1
+      env:
+        GITHUB_TOKEN: ${{ secrets.PREVIEW_GITHUB_TOKEN }}
+
+    - if: toJson(fromJson(steps.earlier_preview.outputs.data)) != '[]'
+      name: Check for preview label
+      id: preview_label
+      uses: octokit/request-action@v2.x
+      with:
+        route: GET /repos/{owner}/{repo}/issues/{issue_number}/labels
+        owner: ${{ github.event.repository.owner.login }}
+        repo: ${{ github.event.repository.name }}
+        issue_number: ${{ github.event.number }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.PREVIEW_GITHUB_TOKEN }}
+
+    - if: toJson(fromJson(steps.earlier_preview.outputs.data)) != '[]' && contains(fromJson(steps.preview_label.outputs.data).*.name, 'preview')
+      name: Create deployment
+      id: deployment
+      uses: octokit/request-action@v2.x
+      with:
+        route: POST /repos/{owner}/{repo}/deployments
+        mediaType: |
+          previews:
+          - ant-man
+          - flash
+        owner: ${{ github.event.repository.owner.login }}
+        repo: ${{ github.event.repository.name }}
+        ref: ${{ github.event.pull_request.head.sha }}
+        task: deploy:preview
+        auto_merge: false
+        required_contexts: "[]"
+        environment: preview-pr-${{ github.event.number }}
+        description: "Preview for Pull Request #${{ github.event.number }}"
+      env:
+        GITHUB_TOKEN: ${{ secrets.PREVIEW_GITHUB_TOKEN }}
+
+    - if: toJson(fromJson(steps.earlier_preview.outputs.data)) != '[]' && contains(fromJson(steps.preview_label.outputs.data).*.name, 'preview')
+      name: Trigger 'preview build'
+      uses: peter-evans/repository-dispatch@v1
+      with:
+        token: ${{ secrets.PREVIEW_GITHUB_TOKEN }}
+        event-type: "Preview build #${{ github.event.number }}"
+        client-payload: '{"folder": "pr${{ github.event.number }}", "sha": "${{ github.event.pull_request.head.sha }}", "deployment_id": "${{ fromJson(steps.deployment.outputs.data).id }}"}'

.github/workflows/rebase-checker.yml

@@ -1,19 +0,0 @@
-name: "Update 'work: needs rebase' label status"
-on:
-  # So that PRs touching the same files as the push are updated
-  push:
-  # So that the `dirtyLabel` is removed if conflicts are resolve
-  # We recommend `pull_request_target` so that github secrets are available.
-  # In `pull_request` we wouldn't be able to change labels of fork PRs
-  pull_request_target:
-    types: [synchronize]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: check if prs are in need of a rebase
-        uses: eps1lon/actions-label-merge-conflict@v3
-        with:
-          dirtyLabel: "work: needs rebase"
-          repoToken: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/release-docs.yml

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

.github/workflows/release-linux.yml

@@ -1,182 +0,0 @@
-name: Release (Linux)
-
-on:
-  workflow_call:
-    inputs:
-      survey_key:
-        required: false
-        type: string
-        default: ""
-
-jobs:
-  linux:
-    name: Linux (Generic)
-
-    runs-on: ubuntu-latest
-    container:
-      # manylinux_2_28 is based on AlmaLinux 8, and already has a lot of things
-      # installed and preconfigured. It makes it easier to build OpenTTD.
-      # This distro is based on glibc 2.28, released in 2018.
-      image: quay.io/pypa/manylinux_2_28_x86_64
-
-    steps:
-    - name: Download source
-      uses: actions/download-artifact@v4
-      with:
-        name: internal-source
-
-    - name: Unpack source
-      run: |
-        tar -xf source.tar.gz --strip-components=1
-
-    - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@stable
-
-    - 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"
-        # perl-IPC-Cmd, wget, and zip are needed to run vcpkg.
-        # autoconf-archive is needed to build ICU.
-        yum install -y \
-          autoconf-archive \
-          perl-IPC-Cmd \
-          wget \
-          zip \
-          # EOF
-
-        # aclocal looks first in /usr/local/share/aclocal, and if that doesn't
-        # exist only looks in /usr/share/aclocal. We have files in both that
-        # are important. So copy the latter to the first, and we are good to
-        # go.
-        cp /usr/share/aclocal/* /usr/local/share/aclocal/
-        echo "::endgroup::"
-
-        # The yum variant of fluidsynth depends on all possible audio drivers,
-        # like jack, ALSA, pulseaudio, etc. This is not really useful for us,
-        # as we route the output of fluidsynth back via our sound driver, and
-        # as such do not use these audio driver outputs at all.
-        # The vcpkg variant of fluidsynth depends on ALSA. Similar issue here.
-        # So instead, we compile fluidsynth ourselves, with as few
-        # dependencies as possible. We do it before anything else is installed,
-        # to make sure it doesn't pick up on any of the drivers.
-        echo "::group::Install fluidsynth"
-        wget https://github.com/FluidSynth/fluidsynth/archive/v2.4.4.tar.gz
-        tar xf v2.4.4.tar.gz
-        (
-          cd fluidsynth-2.4.4
-          mkdir build
-          cd build
-          cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-          cmake --build . -j $(nproc)
-          cmake --install .
-        )
-
-        echo "::group::Install audio drivers"
-        # These audio libs are to make sure the SDL version of vcpkg adds
-        # sound-support; these libraries are not added to the resulting
-        # binary, but the headers are used to enable them in SDL.
-        yum install -y \
-          alsa-lib-devel \
-          pulseaudio-libs-devel \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Install video drivers"
-        # These video libs are to make sure the SDL version of vcpkg adds
-        # video-support; these libraries are not added to the resulting
-        # binary, but the headers are used to enable them in SDL.
-        yum install -y \
-          libX11-devel \
-          libXcursor-devel \
-          libXext-devel \
-          libXfixes-devel \
-          libXi-devel \
-          libxkbcommon-devel \
-          libXrandr-devel \
-          libXScrnSaver-devel \
-          mesa-libEGL-devel \
-          mesa-libGL-devel \
-          mesa-libGLES-devel \
-          wayland-devel \
-          wayland-protocols-devel \
-          # 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: Install GCC problem matcher
-      uses: ammaraskar/gcc-problem-matcher@master
-
-    - name: Build
-      run: |
-        mkdir -p build
-        cd build
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \
-          -DOPTION_PACKAGE_DEPENDENCIES=ON \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        cmake --build . -j $(nproc) --target openttd
-        echo "::endgroup::"
-
-    - name: Create breakpad symbols
-      run: |
-        cd build
-        dump_syms ./openttd --inlines --store symbols
-
-    - name: Create bundles
-      run: |
-        cd ${GITHUB_WORKSPACE}/build
-        echo "::group::Run CPack"
-        cpack
-        echo "::endgroup::"
-
-        echo "::group::Cleanup"
-        # Remove the sha256 files CPack generates; we will do this ourself at
-        # the end of this workflow.
-        rm -f bundles/*.sha256
-        echo "::endgroup::"
-
-    - name: Store bundles
-      uses: actions/upload-artifact@v4
-      with:
-        name: openttd-linux-generic
-        path: build/bundles
-        retention-days: 5
-
-    - name: Store symbols
-      uses: actions/upload-artifact@v4
-      with:
-        name: symbols-linux-generic
-        path: build/symbols
-        retention-days: 5

.github/workflows/release-macos.yml

@@ -1,226 +0,0 @@
-name: Release (MacOS)
-
-on:
-  workflow_call:
-    inputs:
-      survey_key:
-        required: false
-        type: string
-        default: ""
-
-jobs:
-  macos:
-    name: MacOS
-
-    runs-on: macos-latest
-    env:
-      MACOSX_DEPLOYMENT_TARGET: 10.13
-
-    steps:
-    - name: Setup Xcode version
-      uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: latest-stable
-
-    - name: Download source
-      uses: actions/download-artifact@v4
-      with:
-        name: internal-source
-
-    - name: Unpack source
-      run: |
-        tar -xf source.tar.gz --strip-components=1
-
-    - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@stable
-
-    - 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 vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg
-        ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
-
-    - name: Install dependencies
-      env:
-        HOMEBREW_NO_AUTO_UPDATE: 1
-        HOMEBREW_NO_INSTALL_CLEANUP: 1
-      run: |
-        echo "::group::Install brew dependencies"
-        brew install \
-          pandoc \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Install breakpad dependencies"
-        cargo install --locked dump_syms
-        echo "::endgroup::"
-
-    - name: Install GCC problem matcher
-      uses: ammaraskar/gcc-problem-matcher@master
-
-    - name: Build tools
-      run: |
-        mkdir build-host
-        cd build-host
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DOPTION_TOOLS_ONLY=ON \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build tools"
-        echo "Running on $(sysctl -n hw.logicalcpu) cores"
-        cmake --build . -j $(sysctl -n hw.logicalcpu) --target tools
-        echo "::endgroup::"
-
-    - name: Import code signing certificates
-      uses: Apple-Actions/import-codesign-certs@v5
-      with:
-        # The certificates in a PKCS12 file encoded as a base64 string
-        p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
-        # The password used to import the PKCS12 file.
-        p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
-      # If this is run on a fork, there may not be a certificate set up - continue in this case
-      continue-on-error: true
-
-    - name: Build arm64
-      run: |
-        mkdir build-arm64
-        cd build-arm64
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -DCMAKE_OSX_ARCHITECTURES=arm64 \
-          -DVCPKG_TARGET_TRIPLET=arm64-osx \
-          -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
-          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(sysctl -n hw.logicalcpu) cores"
-        cmake --build . -j $(sysctl -n hw.logicalcpu) --target openttd
-        echo "::endgroup::"
-
-    - name: Build x64
-      run: |
-        mkdir build-x64
-        cd build-x64
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -DCMAKE_OSX_ARCHITECTURES=x86_64 \
-          -DVCPKG_TARGET_TRIPLET=x64-osx \
-          -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
-          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \
-          -DCPACK_BUNDLE_APPLE_CERT_APP=${{ secrets.APPLE_DEVELOPER_CERTIFICATE_ID }} \
-          "-DCPACK_BUNDLE_APPLE_CODESIGN_PARAMETER=--deep -f --options runtime" \
-          -DAPPLE_UNIVERSAL_PACKAGE=1 \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(sysctl -n hw.logicalcpu) cores"
-        cmake --build . -j $(sysctl -n hw.logicalcpu) --target openttd
-        echo "::endgroup::"
-
-    - name: Create breakpad symbols
-      run: |
-        cd build-x64
-        mkdir dSYM
-        dsymutil ./openttd -o dSYM/openttd
-        dump_syms ./dSYM/openttd --inlines --store symbols
-
-        cd ../build-arm64
-        mkdir dSYM
-        dsymutil ./openttd -o dSYM/openttd
-        dump_syms ./dSYM/openttd --inlines --store ../build-x64/symbols
-
-    - name: Create bundles
-      run: |
-        cd build-x64
-
-        echo "::group::Create universal binary"
-        # Combine the `openttd` binaries from each build into a single file
-        lipo -create -output openttd-universal ../build-*/openttd
-        mv openttd-universal openttd
-        echo "::endgroup::"
-
-        echo "::group::Run CPack"
-        cpack
-        echo "::endgroup::"
-
-        echo "::group::Cleanup"
-        # Remove the sha256 files CPack generates; we will do this ourself at
-        # the end of this workflow.
-        rm -f bundles/*.sha256
-        echo "::endgroup::"
-
-    - name: Notarize
-      env:
-        AC_USERNAME: ${{ secrets.APPLE_DEVELOPER_APP_USERNAME }}
-        AC_PASSWORD: ${{ secrets.APPLE_DEVELOPER_APP_PASSWORD }}
-        AC_TEAM_ID: ${{ secrets.APPLE_DEVELOPER_TEAM_ID }}
-      run: |
-        if [ -z "${AC_USERNAME}" ]; then
-            # We may be running on a fork that doesn't have notarization secrets set up; skip this step
-            echo No notarization secrets set up, skipping.
-            exit 0
-        fi
-
-        xcrun notarytool store-credentials --apple-id "${AC_USERNAME}" --password "${AC_PASSWORD}" --team-id "${AC_TEAM_ID}" openttd
-        cd build-x64
-        ../os/macosx/notarize.sh
-
-    - name: Build zip
-      run: |
-        cd build-x64
-
-        pushd _CPack_Packages/*/Bundle/openttd-*/
-
-        # Remove the Applications symlink from the staging folder
-        rm -f Applications
-
-        # Remove the original dmg built by CPack to avoid a conflict when resolving
-        # the zip_filename variable below
-        rm -f ../*.dmg
-
-        zip_filename=(../openttd-*)
-
-        # Package up the existing, notarised .app into a zip file
-        zip -r -9 ${zip_filename}.zip OpenTTD.app
-
-        popd
-
-        # Now move it into place to be uploaded
-        mv _CPack_Packages/*/Bundle/openttd-*.zip bundles/
-
-    - name: Store bundles
-      uses: actions/upload-artifact@v4
-      with:
-        name: openttd-macos-universal
-        path: build-x64/bundles
-        retention-days: 5
-
-    - name: Store symbols
-      uses: actions/upload-artifact@v4
-      with:
-        name: symbols-macos-universal
-        path: build-x64/symbols
-        retention-days: 5

.github/workflows/release-source.yml

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

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

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

.github/workflows/release-windows.yml

@@ -1,216 +0,0 @@
-name: Release (Windows)
-
-on:
-  workflow_call:
-    inputs:
-      survey_key:
-        required: false
-        type: string
-        default: ""
-      is_tag:
-        required: true
-        type: string
-
-jobs:
-  windows:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - arch: x86
-          host: x86
-        - arch: x64
-          host: x64
-        - arch: arm64
-          host: x64_arm64
-
-    name: Windows (${{ matrix.arch }})
-
-    runs-on: windows-latest
-
-    steps:
-    - name: Download source
-      uses: actions/download-artifact@v4
-      with:
-        name: internal-source
-
-    - name: Unpack source
-      shell: bash
-      run: |
-        tar -xf source.tar.gz --strip-components=1
-
-    - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@stable
-
-    - 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 vcpkg
-      run: |
-        git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}\vcpkg
-        ${{ runner.temp }}\vcpkg\bootstrap-vcpkg.bat -disableMetrics
-
-    - name: Install dependencies
-      shell: bash
-      run: |
-        echo "::group::Install choco dependencies"
-        choco install pandoc
-        echo "::endgroup::"
-
-        echo "::group::Install breakpad dependencies"
-        cargo install --locked dump_syms
-        echo "::endgroup::"
-
-    - name: Install MSVC problem matcher
-      uses: ammaraskar/msvc-problem-matcher@master
-
-    - name: Configure developer command prompt for tools
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x64
-
-    - name: Build tools
-      shell: bash
-      run: |
-        mkdir build-host
-        cd build-host
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -GNinja \
-          -DOPTION_TOOLS_ONLY=ON \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        cmake --build . --target tools
-        echo "::endgroup::"
-
-    - name: Configure developer command prompt for ${{ matrix.arch }}
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: ${{ matrix.host }}
-
-    - name: Build (with installer)
-      if: inputs.is_tag == 'true'
-      shell: bash
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -GNinja \
-          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
-          -DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \
-          -DOPTION_USE_NSIS=ON \
-          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        cmake --build . --target openttd
-        echo "::endgroup::"
-      env:
-        AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-        AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
-        AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
-        AZURE_CODESIGN_ACCOUNT_NAME: ${{ secrets.AZURE_CODESIGN_ACCOUNT_NAME }}
-        AZURE_CODESIGN_ENDPOINT: ${{ secrets.AZURE_CODESIGN_ENDPOINT }}
-        AZURE_CODESIGN_PROFILE_NAME: ${{ secrets.AZURE_CODESIGN_PROFILE_NAME }}
-
-    - name: Build (without installer)
-      if: inputs.is_tag != 'true'
-      shell: bash
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -GNinja \
-          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
-          -DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \
-          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        cmake --build . --target openttd
-        echo "::endgroup::"
-      env:
-        AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-        AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
-        AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
-        AZURE_CODESIGN_ACCOUNT_NAME: ${{ secrets.AZURE_CODESIGN_ACCOUNT_NAME }}
-        AZURE_CODESIGN_ENDPOINT: ${{ secrets.AZURE_CODESIGN_ENDPOINT }}
-        AZURE_CODESIGN_PROFILE_NAME: ${{ secrets.AZURE_CODESIGN_PROFILE_NAME }}
-
-    - name: Create breakpad symbols
-      shell: bash
-      run: |
-        cd build
-        dump_syms openttd.pdb --inlines --store symbols
-
-    - name: Create bundles
-      shell: bash
-      run: |
-        cd ${GITHUB_WORKSPACE}/build
-        echo "::group::Run CPack"
-        cpack
-        echo "::endgroup::"
-
-        echo "::group::Move PDB and exe to symbols"
-        PDB_FOLDER=$(find symbols -mindepth 2 -type d)
-        cp openttd.pdb ${PDB_FOLDER}/
-
-        EXE_FOLDER=symbols/openttd.exe/$(grep "INFO CODE_ID" symbols/*/*/openttd.sym | cut -d\  -f3)
-        mkdir -p ${EXE_FOLDER}
-        cp openttd.exe ${EXE_FOLDER}/
-        echo "::endgroup::"
-
-        echo "::group::Cleanup"
-        # Remove the sha256 files CPack generates; we will do this ourself at
-        # the end of this workflow.
-        rm -f bundles/*.sha256
-        echo "::endgroup::"
-
-    - name: Sign installer
-      if: inputs.is_tag == 'true'
-      shell: bash
-      run: |
-        ${GITHUB_WORKSPACE}/os/windows/sign.bat "${GITHUB_WORKSPACE}/build/bundles"
-      env:
-        AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-        AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
-        AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
-        AZURE_CODESIGN_ACCOUNT_NAME: ${{ secrets.AZURE_CODESIGN_ACCOUNT_NAME }}
-        AZURE_CODESIGN_ENDPOINT: ${{ secrets.AZURE_CODESIGN_ENDPOINT }}
-        AZURE_CODESIGN_PROFILE_NAME: ${{ secrets.AZURE_CODESIGN_PROFILE_NAME }}
-
-    - name: Store bundles
-      uses: actions/upload-artifact@v4
-      with:
-        name: openttd-windows-${{ matrix.arch }}
-        path: build/bundles
-        retention-days: 5
-
-    - name: Store symbols
-      uses: actions/upload-artifact@v4
-      with:
-        name: symbols-windows-${{ matrix.arch }}
-        path: build/symbols
-        retention-days: 5

.github/workflows/script-missing-mode-enforcement.yml

@@ -1,22 +0,0 @@
-name: Script missing mode enforcement
-
-on:
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
-
-jobs:
-  script-missing-mode-enforcement:
-    name: Script missing mode enforcement
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Check for finding script functions that require company/deity mode enforcement/checks
-      run: |
-        set -ex
-        python3 .github/script-missing-mode-enforcement.py

.github/workflows/unused-strings.yml

@@ -1,22 +0,0 @@
-name: Unused strings
-
-on:
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
-
-jobs:
-  unused-strings:
-    name: Unused strings
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Check for unused strings
-      run: |
-        set -ex
-        python3 .github/unused-strings.py

.github/workflows/upload-cdn.yml

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

.github/workflows/upload-gog.yml

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

.github/workflows/upload-steam.yml

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

.gitignore

@@ -5,4 +5,3 @@ docs/aidocs/*
 docs/gamedocs/*
 docs/source/*
 /out
-/vcpkg_installed

CMakeLists.txt

@@ -1,12 +1,11 @@
-cmake_minimum_required(VERSION 3.17)
+cmake_minimum_required(VERSION 3.9)
 
 if(NOT BINARY_NAME)
     set(BINARY_NAME openttd)
 endif()
 
 project(${BINARY_NAME}
-    VERSION 15.0
-    LANGUAGES CXX
+    VERSION 1.11.2
 )
 
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
@@ -23,7 +22,7 @@ if (EMSCRIPTEN)
 endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
+set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
 
 # Use GNUInstallDirs to allow customisation
 # but set our own default data and bin dir
@@ -42,7 +41,7 @@ set_directory_options()
 include(Static)
 set_static_if_needed()
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 set(CMAKE_CXX_EXTENSIONS NO)
 
@@ -51,6 +50,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS YES)
 # An empty target for the tools
 add_custom_target(tools)
 
+include(Endian)
+add_endian_definition()
+
 include(CompileFlags)
 compile_flags()
 
@@ -74,7 +76,7 @@ add_custom_target(find_version
                 -DCPACK_BINARY_DIR=${CMAKE_BINARY_DIR}
                 -DREV_MAJOR=${PROJECT_VERSION_MAJOR}
                 -DREV_MINOR=${PROJECT_VERSION_MINOR}
-                -DWINDOWS=${WIN32}
+                -DREV_BUILD=${PROJECT_VERSION_PATCH}
                 -P "${CMAKE_SOURCE_DIR}/cmake/scripts/FindVersion.cmake"
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         BYPRODUCTS ${GENERATED_SOURCE_FILES}
@@ -122,40 +124,22 @@ find_package(LibLZMA)
 find_package(LZO)
 find_package(PNG)
 
-if(WIN32 OR EMSCRIPTEN)
-    # Windows uses WinHttp for HTTP requests.
-    # Emscripten uses Javascript for HTTP requests.
-else()
-    # All other targets use libcurl.
-    find_package(CURL)
-endif()
-
-# Breakpad doesn't support emscripten.
-if(NOT EMSCRIPTEN)
-    find_package(unofficial-breakpad NO_MODULE)
-endif()
-
 if(NOT OPTION_DEDICATED)
-    if(WIN32)
-        find_package(Xaudio2)
-    else()
+    if(NOT WIN32)
         find_package(Allegro)
         if(NOT APPLE)
             find_package(Freetype)
             find_package(SDL2)
-            find_package(Fluidsynth)
-            if(Freetype_FOUND)
-                find_package(Fontconfig)
+            if(NOT SDL2_FOUND)
+                find_package(SDL)
             endif()
-            find_package(Harfbuzz)
-            find_package(ICU OPTIONAL_COMPONENTS i18n uc)
+            find_package(Fluidsynth)
+            find_package(Fontconfig)
+            find_package(ICU OPTIONAL_COMPONENTS i18n lx)
         endif()
     endif()
-    find_package(OpusFile)
 endif()
 if(APPLE)
-    enable_language(OBJCXX)
-
     find_package(Iconv)
 
     find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
@@ -173,6 +157,7 @@ if(MSVC)
 endif()
 
 find_package(SSE)
+find_package(Xaudio2)
 
 find_package(Grfcodec)
 
@@ -182,14 +167,8 @@ check_ipo_supported(RESULT IPO_FOUND)
 show_options()
 
 if(UNIX AND NOT APPLE AND NOT OPTION_DEDICATED)
-    if(NOT SDL2_FOUND AND NOT ALLEGRO_FOUND)
-        message(FATAL_ERROR "SDL2 or Allegro is required for this platform")
-    endif()
-    if(HARFBUZZ_FOUND AND NOT ICU_i18n_FOUND)
-        message(WARNING "HarfBuzz depends on ICU i18n to function; HarfBuzz will be disabled")
-    endif()
-    if(NOT HARFBUZZ_FOUND)
-        message(WARNING "Without HarfBuzz and ICU i18n the game will not be able to render right-to-left languages correctly")
+    if(NOT SDL_FOUND AND NOT SDL2_FOUND AND NOT ALLEGRO_FOUND)
+        message(FATAL_ERROR "SDL, SDL2 or Allegro is required for this platform")
     endif()
 endif()
 if(APPLE)
@@ -228,40 +207,24 @@ if(OPTION_PACKAGE_DEPENDENCIES)
     set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 endif()
 
-include(CTest)
 include(SourceList)
 
+# Needed by rev.cpp
+include_directories(${CMAKE_SOURCE_DIR}/src)
 # Needed by everything that uses Squirrel
 include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/squirrel/include)
 
 include(MSVCFilters)
 
-add_library(openttd_lib OBJECT ${GENERATED_SOURCE_FILES})
-add_executable(openttd WIN32)
-add_executable(openttd_test)
+add_executable(openttd WIN32 ${GENERATED_SOURCE_FILES})
 set_target_properties(openttd PROPERTIES OUTPUT_NAME "${BINARY_NAME}")
 # All other files are added via target_sources()
 
 if(MSVC)
     # Add DPI manifest to project; other WIN32 targets get this via ottdres.rc
     target_sources(openttd PRIVATE "${CMAKE_SOURCE_DIR}/os/windows/openttd.manifest")
-
-    # If target -static is used, switch our project to static (/MT) too.
-    # If the target ends on -static-md, it will remain dynamic (/MD).
-    if(VCPKG_TARGET_TRIPLET MATCHES "-static" AND NOT VCPKG_TARGET_TRIPLET MATCHES "-md")
-        set_property(TARGET openttd_lib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-        set_property(TARGET openttd PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-        set_property(TARGET openttd_test PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-     endif()
 endif()
 
-target_precompile_headers(openttd_lib
-    PRIVATE
-    src/stdafx.h
-    src/core/format.hpp
-)
-set_source_files_properties(src/3rdparty/fmt/format.cc PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
-
 add_subdirectory(${CMAKE_SOURCE_DIR}/bin)
 add_subdirectory(${CMAKE_SOURCE_DIR}/src)
 add_subdirectory(${CMAKE_SOURCE_DIR}/media)
@@ -269,37 +232,22 @@ add_subdirectory(${CMAKE_SOURCE_DIR}/media)
 add_dependencies(openttd
     find_version)
 
-target_link_libraries(openttd_lib
+target_link_libraries(openttd
     openttd::languages
     openttd::settings
+    openttd::media
+    openttd::basesets
     openttd::script_api
     Threads::Threads
 )
 
-target_link_libraries(openttd
-    openttd_lib
-    openttd::media
-    openttd::basesets
-)
-
-target_link_libraries(openttd_test PRIVATE openttd_lib)
-if(ANDROID)
-    target_link_libraries(openttd_test PRIVATE log)
-endif()
-
-include(Catch)
-catch_discover_tests(openttd_test)
-
-if(HAIKU)
-    target_link_libraries(openttd_lib "be" "network" "midi")
-endif()
-
 if(IPO_FOUND)
     set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE True)
     set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL True)
     set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO True)
 endif()
 set_target_properties(openttd PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
+process_compile_flags()
 
 include(LinkPackage)
 link_package(PNG TARGET PNG::PNG ENCOURAGED)
@@ -307,25 +255,15 @@ link_package(ZLIB TARGET ZLIB::ZLIB ENCOURAGED)
 link_package(LIBLZMA TARGET LibLZMA::LibLZMA ENCOURAGED)
 link_package(LZO)
 
-if(NOT WIN32 AND NOT EMSCRIPTEN)
-    link_package(CURL ENCOURAGED)
-    target_link_libraries(openttd_lib ${CMAKE_DL_LIBS})
-endif()
-
-if(NOT EMSCRIPTEN)
-    link_package(unofficial-breakpad TARGET unofficial::breakpad::libbreakpad_client)
-endif()
-
 if(NOT OPTION_DEDICATED)
     link_package(Fluidsynth)
+    link_package(SDL)
     link_package(SDL2 TARGET SDL2::SDL2)
     link_package(Allegro)
     link_package(FREETYPE TARGET Freetype::Freetype)
     link_package(Fontconfig TARGET Fontconfig::Fontconfig)
-    link_package(Harfbuzz TARGET harfbuzz::harfbuzz)
+    link_package(ICU_lx)
     link_package(ICU_i18n)
-    link_package(ICU_uc)
-    link_package(OpusFile TARGET OpusFile::opusfile)
 
     if(SDL2_FOUND AND OPENGL_FOUND AND UNIX)
         # SDL2 dynamically loads OpenGL if needed, so do not link to OpenGL when
@@ -338,12 +276,10 @@ if(NOT OPTION_DEDICATED)
     endif()
 endif()
 
-include(3rdparty/llvm/CheckAtomic)
-
 if(APPLE)
     link_package(Iconv TARGET Iconv::Iconv)
 
-    target_link_libraries(openttd_lib
+    target_link_libraries(openttd
         ${AUDIOTOOLBOX_LIBRARY}
         ${AUDIOUNIT_LIBRARY}
         ${COCOA_LIBRARY}
@@ -362,11 +298,10 @@ if(EMSCRIPTEN)
     target_link_libraries(WASM::WASM INTERFACE "-s ALLOW_MEMORY_GROWTH=1")
     target_link_libraries(WASM::WASM INTERFACE "-s INITIAL_MEMORY=33554432")
     target_link_libraries(WASM::WASM INTERFACE "-s DISABLE_EXCEPTION_CATCHING=0")
-    target_link_libraries(WASM::WASM INTERFACE "-s WASM_BIGINT")
     add_definitions(-s DISABLE_EXCEPTION_CATCHING=0)
 
     # Export functions to Javascript.
-    target_link_libraries(WASM::WASM INTERFACE "-s EXPORTED_FUNCTIONS='[\"_main\", \"_em_openttd_add_server\"]' -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'")
+    target_link_libraries(WASM::WASM INTERFACE "-s EXPORTED_FUNCTIONS='[\"_main\", \"_em_openttd_add_server\"]' -s EXTRA_EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'")
 
     # Preload all the files we generate during build.
     # As we do not compile with FreeType / FontConfig, we also have no way to
@@ -378,24 +313,6 @@ if(EMSCRIPTEN)
     target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_BINARY_DIR}/lang/english.lng@/lang/english.lng")
     target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/bin/ai@/ai")
     target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/bin/game@/game")
-    # Documentation files for the in-game text file viewer
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/README.md@/README.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/CREDITS.md@/CREDITS.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/CONTRIBUTING.md@/CONTRIBUTING.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/COPYING.md@/COPYING.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/known-bugs.md@/known-bugs.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/changelog.md@/changelog.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/admin_network.md@/docs/admin_network.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/debugging_desyncs.md@/docs/debugging_desyncs.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/desync.md@/docs/desync.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/directory_structure.md@/docs/directory_structure.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/eints.md@/docs/eints.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/fonts.md@/docs/fonts.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/linkgraph.md@/docs/linkgraph.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/logging_and_performance_metrics.md@/docs/logging_and_performance_metrics.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/multiplayer.md@/docs/multiplayer.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/savegame_format.md@/docs/savegame_format.md")
-    target_link_libraries(WASM::WASM INTERFACE "--preload-file ${CMAKE_SOURCE_DIR}/docs/symbol_server.md@/docs/symbol_server.md")
 
     # We use IDBFS for persistent storage.
     target_link_libraries(WASM::WASM INTERFACE "-lidbfs.js")
@@ -438,27 +355,21 @@ if(WIN32)
         -DUNICODE
         -D_UNICODE
         -DWITH_UNISCRIBE
-        -DPSAPI_VERSION=1
     )
 
-    target_link_libraries(openttd_lib
+    target_link_libraries(openttd
         ws2_32
         winmm
         imm32
-        usp10
-        psapi
-        winhttp
-        bcrypt
     )
 endif()
 
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    add_definitions(-DPOINTER_IS_64BIT)
+    add_definitions(-D_SQ64)
 endif()
 
-enable_testing()
-
-add_subdirectory(regression)
+include(CreateRegression)
+create_regression()
 
 if(APPLE OR WIN32)
     find_package(Pandoc)

CODINGSTYLE.md

@@ -1,544 +0,0 @@
-**Why a set coding style is important** <br>
-This project is an open source project. To get open source working as intended, many people should be able to comprehend the code. This implies that there is a well documented and uniform flow of code.
-That does not necessarily mean that a contributor should not write optimised yet cryptic code - one should always care about performance.  However, other developers need to understand the code which means complicated parts of code **must** have good documentation.
-
-**Why we require that EVERYTHING is documented**<br>
-What is simple to some might appear very complicated to others. Documentation helps these others. Anyone should be able to improve the code. But the main reason is, that when patch contributors want their patches added to the common codebase, the code needs to be reviewed by one or more developers. Documentation makes reviewing much easier.
-
-## Coding style for OpenTTD
-### Functions
-* Function names use [CamelCase](http://www.wikipedia.org/wiki/Camelcase) without underscores.
-* Opening curly bracket **{** for a function starts on the next line.
-* Use Foo() instead of Foo(void).
-* Prefer using "const" for reference and compound parameters when appropriate.
-* If a member function can be a const function, make it so.
-```c++
-void ThisIsAFunction()
-{
-}
-```
-
-### Variables
-* Variable names are all lowercase, and use "_" as separator.
-* Global variables are preceded by an underscore. ("_") Use descriptive names because leading underscores are often used for system / compiler variables.
-* Own members of classes should always be referenced using "this->"
-* Pointers and references should have their reference symbol next to the name (compatibility with current code).
-* Variables that are declared below one another should have their type, name or reference operator, and assignment operator aligned by spaces.
-* There are set names for many variables. Those are (but not limited to): Vehicle *u, *v, *w; Station *st; Town *t; Window *w; Engine *e.
-* For multiple instances, use numbers "*t1, *t2" or postfixes "*st_from, *st_to".
-* Declare variables upon first usage.
-* Declare iterators in their loop.
-* There is a space between '*' and 'const' in "const pointers"
-```c++
-int     number         = 10;
-Vehicle *u_first_wagon = v->next;
-int     value          = v->value;
-
-uint32 _global_variable = 3750;
-
-static const char * const _global_array[] = {
-	"first string",
-	"second string",
-	"another string",
-	"last string followed by comma",
-};
-
-protected:
-	char protected_array[10];
-
-for (int i = 0;;);
-```
-
-* Give the variables expedient names, this increases the readability of the code
-```c++
-bool is_maglev_train = true;
-if (!is_maglev_train) DoSomething();
-```
-
-* Some people like to introduce copies of variables to increase readability, which can waste memory. However, in some cases, especially in code pieces which are often called, it makes sense to cache some calculated variables.
-```c++
-/* Unoptimized code:
- * foo is not touched inside the loop!
- */
-for (uint8 i = 0; i < 100000; i++) {
-	/* Do something */
-	if (value_to_check == (foo * 4) % 5 + 6) DoSomething();
-	/* Do something else */
-}
-
-/* Better:
- * The used value of foo is calculated outside the loop.
- */
-const uint32 bar = (foo * 4) % 5 + 6;
-for (uint8 i = 0; i < 100000; i++) {
-	/* Do something */
-	if (value_to_check == bar) DoSomething();
-	/* Do something else */
-}
-```
-
-### Enumerations / static consts
-* Enumerations store integers that belong logically together (railtypes, string IDs, etc.).
-* Enumeration names also use CamelCase.
-* Unscoped enumerators are all caps with "_" between the words.
-* Scoped enumerators are use CamelCase.
-* Enums are not used to store single numbers.
-* Enums have consecutive numbers OR
-* Enums have consecutive powers of two. Powers of two (bits) are written in hex or with the shift operator.
-* Enums may have special enumerators: "_BEGIN", "\_END", and "INVALID\_").  See example.
-* The invalid always has 0xFF, 0xFFFF, 0xFFFFFFFF as a value.
-* Other special values are consecutively less than the invalid.
-* Variables that hold enumerators should have the type of the enumeration.
-```c++
-enum DiagDirection {
-	DIAGDIR_BEGIN = 0,
-	DIAGDIR_NE  = 0,
-	DIAGDIR_SE  = 1,
-	DIAGDIR_SW  = 2,
-	DIAGDIR_NW  = 3,
-	DIAGDIR_END,
-	INVALID_DIAGDIR = 0xFF,
-	BROKEN_DIAGDIR = 0xFE,
-};
-
-enum {
-	DEPOT_SERVICE       = (1 << 0),
-	DEPOT_MASS_SEND     = (1 << 1),
-	DEPOT_DONT_CANCEL   = (1 << 2),
-	DEPOT_LOCATE_HANGAR = (1 << 3),
-};
-
-DiagDirection enterdir = DIAGDIR_NE;
-```
-
-* Numbers that store single or uncorrelated data are static consts. Those may use the naming conventions of enums.
-Example:
-```c++
-static const int MAXIMUM_STATIONS = 42;
-```
-
-* Enums are useful in GUI code: When widgets are enumerated, they are easier to access during many operations. Additionally changes caused by modified widget sequences require less code adapting. If a widget is used like this, its enum name should be present in a comment behind the corresponding widget definition.
-```c++
-/** Enum referring to the widgets of the build rail depot window */
-enum BuildRailDepotWidgets {
-	BRDW_CLOSEBOX = 0,
-	BRDW_CAPTION,
-	BRDW_BACKGROUND,
-	BRDW_DEPOT_NE,
-	BRDW_DEPOT_SE,
-	BRDW_DEPOT_SW,
-	BRDW_DEPOT_NW,
-};
-/* ... */
-/** Widget definition of the build rail depot window */
-static const Widget _build_depot_widgets[] = {
-{   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5, STR_..},   // BRDW_CLOSEBOX
-{    WWT_CAPTION,   RESIZE_NONE,     7,    11,   139,     0,    13, STR_...,  STR_...},  // BRDW_CAPTION
-{      WWT_PANEL,   RESIZE_NONE,     7,     0,   139,    14,   121, 0x0,      STR_NULL}, // BRDW_BACKGROUND
-{      WWT_PANEL,   RESIZE_NONE,    14,    71,   136,    17,    66, 0x0,      STR_..},   // BRDW_DEPOT_NE
-{      WWT_PANEL,   RESIZE_NONE,    14,    71,   136,    69,   118, 0x0,      STR_..},   // BRDW_DEPOT_SE
-{      WWT_PANEL,   RESIZE_NONE,    14,     3,    68,    69,   118, 0x0,      STR_..},   // BRDW_DEPOT_SW
-{      WWT_PANEL,   RESIZE_NONE,    14,     3,    68,    17,    66, 0x0,      STR_..},   // BRDW_DEPOT_NW
-{   WIDGETS_END},
-};
-```
-
-* Comments on the enum values should start with "///<" to enable doxygen documentation
-```c++
-enum SomeEnumeration {
-	SE_BEGIN = 0,        ///< Begin of the enumeration, used for iterations
-	SE_FOO = 0,          ///< Used for xy
-	SE_BAR,              ///< Another value of the enumeration
-	SE_SUB,              ///< Special case for z
-	SE_END,              ///< End of the enumeration, used for iterations
-};
-```
-
-### Control flow
-* Put a space before the parentheses in **if**, **switch**, **for** and **while** statements.
-* Use curly braces and put the contained statements on their own lines (e.g., don't put them directly after the **if**).
-* Opening curly bracket **{** stays on the first line, closing curly bracket **}** gets a line to itself (except for the **}** preceding an **else**, which should be on the same line as the **else**).
-* When only a single statement is contained, the brackets can be omitted. In this case, put the single statement on the same line as the preceding keyword (**if**, **while**, etc.). Note that this is only allowed for if statements without an **else** clause.
-* Non-trivial fall throughs must be documented, using a `[[fallthrough]]` attribute.
-* The NOT_REACHED() macro can be used in default constructs that should never be reached.
-* Unconditional loops are written with **`for (;;) {`**
-
-```c++
-if (a == b) {
-	Foo();
-} else {
-	Bar();
-}
-
-if (very_large_checks &&
-		spread_over_two_lines) {
-	Foo();
-}
-
-if (a == b) Foo();
-
-switch (a) {
-	case 0: DoSomethingShort(); break;
-
-	case 1:
-		DoSomething();
-		[[fallthrough]];
-
-	case 2:
-		DoMore();
-		b = a;
-		break;
-
-	case 3: {
-		int r = 2;
-
-		DoEvenMore(a);
-		[[fallthrough]];
-	}
-
-	case 4: {
-		int q = 345;
-
-		DoIt();
-		break;
-	}
-
-	default:
-		NOT_REACHED();
-}
-
-for (int i = 0; i < 10; i++) {
-	Foo();
-	Bar();
-}
-```
-
-### Classes
-* Classes names also use CamelCase.
-* Classes should have "public", "protected", and "private" sections.
-* Within these section the order is: types, static const members, static members, members, constructors / destructors, static methods, methods.
-* Deviations from above order are allowed when the code dictates it (e.g. a static const is needed for a typedef)
-* Methods and members ought to be grouped logically.
-* All those sorting rules sometimes conflict which one another. Please use common sense what increases legibility of the code in such a case.
-* The method implementation should indicate if it is virtual or similar by using a comment.
-* Very short methods can have one-line definition (if defined in the class scope).
-```c++
-class ThisIsAClass {
-public:
-	typedef Titem_   *ItemPtr;
-private:
-	static const int MAX_SIZE = 500;
-	int              size;
-	ItemPtr          *items;
-
-public:
-	explicit ThisIsAClass();
-	~ThisIsAClass();
-
-	int GetSize() { return this->size; }
-	virtual void Method();
-};
-
-/*virtual*/ void Class::Method()
-{
-	this->size *= 2;
-}
-```
-
-### Templates
-Templates are a very powerful C++ tool, but they can easily confuse beginners. Thus:
-* Templates are to be documented in a very clear and verbose manner. Never assume anything in the documentation.
-* the template keyword and the template layout get a separate line. typenames are either "T" or preceded by a "T", integers get a single capital letter or a descriptive name preceded by "T".
-```c++
-template <typename T, typename Tsomething, int N, uint8_t Tnumber_of_something>
-int Func();
-```
-
-* If you are writing one or more template class in the dedicated header file, use file.hpp for its name instead of file.h. This will let others know that it is template library (includes also implementation), not just header with declarations.
-
-### Code Comment Vertical Alignment
-
-When adding code or comments to an existing formatted section, follow the existing style if possible without editing the preexisting lines.
-
-If your addition cannot be aligned with existing code, do not align the comments with anything and use only a single space between the code and the comment.
-
-Good:
-
-```c++
-enum Vehicle {
-	BUS,  ///< Take the bus.
-+	CAR,  ///< Drive your car.
-	BIKE, ///< Ride your bike
-+	TRAIN, ///< Catch the train.
-}
-```
-
-"Car" is shorter than Bike which allows you to easily align the new comment. "Train" is longer.  It is *NOT* desirable to change the vertical comment alignment of this enum.
-
-Bad:
-
-```c++
-enum Vehicle {
--	BUS,  ///< Take the bus.
--	BIKE, ///< Ride your bike
-+	BUS,   ///< Take the bus.
-+	CAR,   ///< Drive your car.
-+	BIKE,  ///< Ride your bike
-+	TRAIN, ///< Catch the train.
-}
-```
-
-OpenTTD used to vertically-align inline Doxygen comments as shown above. OpenTTD has since stopped strictly following this rule to keep diffs smaller and reduce pollution to the git blame history for non-functional changes.
-
-### Other important rules
-* Put a space before and after binary operators: "a + b", "a == b", "a & b", "a <<= b", etc.. Exceptions are ".", "->" and "[]" (no spaces) and "," (just space after it).
-* Put parenthesis where it improves readability: "*(b++)" instead of "*b++", and "if ((a & b) && c == 2)" instead of "if (a & b && c == 2)".
-* Do not put external declarations in implementation (i.e. cpp) files.
-* Do not typedef enums and structs.
-* Don't treat non-flags as flags: use "if (char_pointer != nullptr && *char_pointer != '\0')", not "if (char_pointer && *char_pointer)".
-* Use "free(p)" instead of "if (p != nullptr) free(p)". "free(nullptr)" doesn't hurt anyone.
-* No trailing whitespace. The Github workflows will not allow tabs or space on the end of lines.
-* Only use tabs to indent from the start of the line.
-* Line length is unlimited. In practice it may be useful to split a long line. When splitting, add two tabs in front of the second part.
-* The '#' of preprocessor instructions goes into the first column of a line. Indenting is done after the '#' (using tabs again).
-* Use /* */ for single line comments.
-* Use // at the end of a command line to indicate comments.
-** However, use /* */ after # preprocessor statements as // causes warnings in some compilers and/or might have unwanted side effects.
-* C++ is defined using the ASCII character set. Do not use other character sets, not even in comments.
-* OpenTTD includes some Objective-C sources (*.mm, used by OSX), which has a special object method invocation syntax: "[ obj doStuff:foo ]". Please use spaces on the inside of the brackets to differentiate from the C array syntax.
-
-## Documentation
-We use [Doxygen](http://doxygen.org/) to automatically generate documentation from the source code. It scans the source files for *recognizable* comments.
-* **Make your comments recognizable.**
-Doxygen only comments starting with the following style:
-```c++
-/**
-///<
-```
-
-Use /** for multi-line comment blocks. Use ///< for single line comments for variables. Use //!< for single-line comments in the NoAI .hpp files.
-For comments blocks inside a function always use /* */ or //. Use // only if the comment is on the same line as an instruction, otherwise use /* */.
-
-### Files
-* Put a @file command in a JavaDoc style comment at the start of the file, followed by a description.
-```c++
-/**
- * @file
- * This is the brief description.
- * This is the detailed description here and on the following lines.
- */
-```
-> ### Warning
-> If a file lacks a **file comment block** then NO entities in that file will be documented by Doxygen!
-
-### Functions
-* The documentation should be as close to the actual code as possible to maximise the chance of staying in sync.
-	* Comments for functions go in the .cpp file.
-	* Comments for inlines go in the .h/.hpp file.
-* Small inlines can have a short 3 or 4 line JavaDoc style comment.
-* Completely document larger functions.
-* Document obvious parameters and return values too!
-
-```c++
-/**
- * A brief explanation of what the function does and/or what purpose it serves.
- * Then follows a more detailed explanation of the function that can span multiple lines.
- *
- * @param foo Explanation of the foo parameter
- * @param bar Explanation of the bar parameter
- * @return The sum of foo and bar (@return can be omitted if the return type is void)
- *
- * @see SomeOtherFunc()
- * @see SOME_ENUM
- *
- * @bug Some bug description
- * @bug Another bug description which continues in the next line
- *           and ends with the following blank line
- *
- * @todo Some to-do entry
- */
-static int FooBar(int foo, int bar)
-{
-	return foo + bar;
-}
-```
-
-### Classes
-* Document structs similarly to functions:
-```c++
-/**
- * A short description of the struct.
- * More detailed description of the its usage.
- *
- * @see [link to anything of interest]
- */
-struct foo {
-}
-```
-
-### JavaDoc structural commands
-
-This table shows the commands you should use with OpenTTD.  The full list is [here](http://www.stack.nl/~dimitri/doxygen/commands.html).
-
-| Command | Action | Example |
-| ------- | -------- | ------- |
-| **@attention** | Starts a paragraph where a message that needs attention may be entered. The paragraph will be indented. | @attention Whales crossing! |
-| **@brief** | Starts a paragraph that serves as a brief description. For classes and files the brief description will be used in lists and at the start of the documentation page. For class and file members, the brief description will be placed at the declaration of the member and prepended to the detailed description. A brief description may span several lines (although it is advised to keep it brief!). | @brief This is the brief description. |
-| **@bug** | Starts a paragraph where one or more bugs may be reported. The paragraph will be indented. Multiple adjacent @bug commands will be joined into a single paragraph. Each bug description will start on a new line. Alternatively, one @bug command may mention several bugs. | @bug Memory leak in here? |
-| **@note** | Starts a paragraph where a note can be entered. The paragraph will be indented. | @note Might be slow |
-| **@todo** | Starts a paragraph where a TODO item is described. The description will also add an item to a separate TODO list. The two instances of the description will be cross-referenced. Each item in the TODO list will be preceded by a header that indicates the origin of the item. | @todo Better error checking |
-| **@warning** | Starts a paragraph where one or more warning messages may be entered. The paragraph will be indented. | @warning Not thread safe! |
-| | <small>**Function related commands**</small> | |
-| **@return** | Starts a return value description for a function. | @return a character pointer |
-| **@param** | Starts a parameter description for a function parameter with name <parameter-name>. Followed by a description of the parameter. The existence of the parameter is checked and a warning is given if the documentation of this (or any other) parameter is missing or not present in the function declaration or definition.<br><br>The @param command has an optional attribute specifying the direction of the attribute. Possible values are "in" and "out". | @param  n    The number of bytes to copy<br>@param[out] dest The memory area to copy to.<br>@param[in]  src  The memory area to copy from. |
-| **@see** | Starts a paragraph where one or more cross-references to classes, functions, methods, variables, files or URL may be specified. Two names joined by either :: or # are understood as referring to a class and one of its members. One of several overloaded methods or constructors may be selected by including a parenthesized list of argument types after the method name. [Here](http://www.stack.nl/~dimitri/doxygen/autolink.html) you can find detailed information about this feature. | @see OtherFunc() |
-| **@b** | Displays the following word using a bold font. Equivalent to &lt;b&gt;word&lt;/b&gt;. To put multiple words in bold use &lt;b&gt;multiple words&lt;/b&gt;.| ...@b this and @b that... |
-| **@c / @p** | Displays the parameter <word> using a typewriter font. You can use this command to refer to member function parameters in the running text. To have multiple words in typewriter font use &lt;tt&gt;multiple words&lt;/tt&gt;. | ... the @p x and @p y coordinates are used to... |
-| **@arg / @li** | This command has one argument that continues until the first blank line or until another @arg / @li is encountered. The command can be used to generate a simple, not nested list of arguments. Each argument should start with an @arg / @li command. | @arg @c AlignLeft left alignment.<br>@arg @c AlignCenter center alignment.<br>@arg @c AlignRight right alignment |
-| **@n** | Forces a new line. Equivalent to and inspired by the printf function. |@n |
-
-### More on Doxygen and JavaDoc
-
-Doxygen knows two different kinds of comments:
-* *Brief descriptions*: one-liners that describe the function roughly ([example](http://docs.openttd.org/annotated.html))
-* *Detailed descriptions*: as the name suggests, these contain the detailed function/purpose of the entity they describe ([example](http://docs.openttd.org/structBridge.html))
-
-You can omit either one or put them into different places but there's only one brief and one detailed description allowed for the same entity.
-
-Doxygen knows three modes for documenting an entity:
-* Before the entity
-* After the entity
-* In a different file
-
-The latter is a little harder to maintain since the prototype of the entity it describes then is stored in several places (e.g. the .h file and the file with the descriptions). Also while it makes the code easier to read it also makes it easier to omit the important step of updating the description of an entity if it was changed - and we all know why that shouldn't happen ;)<br>
-Because of those reasons, we will only use the first two documentation schemes.
-
-
-Doxygen supports both Qt and JavaDoc comment styles:
-* Qt style example: **int i; //!< The counter for the main loop**
-* JavaDoc style example: **int i; /*\*< The counter for the main loop \*/**
-
-It also supports more comment styles but those two are the ones which are standardized. For OTTD we'll be using the JavaDoc style. One of the reasons is that it has a feature that the Qt style doesn't offer: JavaDoc style comment blocks will automatically start a brief description which ends at the first dot followed by a space or new line. Everything after that will also be part of the detailed description.
-
-The general structure of a JavaDoc style comment is
-```c++
-/**
- * This is the brief description. And this sentence contains some further explanations that will appear in the detailed description only.
- */
-```
-
-and the resulting descriptions of that block would be:
-* *Brief description*: This is the brief description.
-* *Detailed description*: This is the brief description. And this sentence contains some further explanations that will appear in the detailed description only.
-
-The distinction between the brief and detailed descriptions is made by the dot followed by a space/newline, so if you want to use that inside the brief description you need to escape the space/newline:
-```c++
-/**
- * This is a brief description (e.g.\ using only a few words). Details go here.
- */
-```
-
-If you're doing a one-line comment, use:
-```c++
-int i; ///< This is the description.
-```
-
-Also in the comment block you can include so-called structural commands which tell Doxygen what follows. In general, their area of effect begins after the command word and ends when a blank line or some other command is encountered. Also, multiple occurrences of the same structural command within a comment block or the referring entity will be joined in the documentation output usually.
-
-## Commit message
-To achieve a coherent whole and to make changelog writing easier, here are some guidelines for commit messages.
-There is a check-script on the git server (also available for clients, see below) to make sure we all follow those rules.
-
-The first line of a message must match:
-```
-<keyword>( #<issue>|<commit>(, (#<issue>|<commit>))*)?: ([<component>])? <details>
-```
-
-Keywords can either be player-facing, NewGRF / Script author-facing, or developer-facing.
-
-For player-facing changes, we have these keywords:
-* Feature: Adding a significant new functionality to the game. This can be small in code-size, but is meant for the bigger things from a player perspective.
-* Add: Similar to Feature, but for small functionalities.
-* Change: Changing existing behaviour to an extent the player needs to know about it.
-* Fix: Fixing an issue with the game (as seen by the player).
-* Remove: Completely removing a functionality.
-* Revert: Reverting an earlier Feature / Add / Change / Fix / Remove.
-* Doc: Update to (player-facing) documentation, like in the `docs/` folder etc.
-* Update: Translator commits.
-
-For NewGRF / Script author-facing changes, we use the same keywords as player-facing changes, followed by `[NewGRF]` / `[Script]` component.
-This also means the commit is aimed (and worded) towards the NewGRF / Script authors, rather than players.
-
-For developer-facing changes, we have these keywords:
-* Codechange: Changes to the code the player is not going to notice. Refactors, modernization, etc.
-* Cleanup: Similar to Codechange, but when it is more about removing old code, rather than an actual change.
-* Codefix: Fixing problems in earlier commits that the player is not actually going to notice. Wrong comments, missing files, CI changes.
-
-If you commit a `Fix` for an [issue](https://github.com/OpenTTD/OpenTTD/issues), add the corresponding issue number in the form of #NNNNN.
-
-In the case of `Fix`es, if you know the hash of the commit in which the bug was introduced (eg regression), please mention that hash (the first 7 characters) as well just after the keyword (or, if present, after the issue number).
-Finding the trouble-causing commit is highly encouraged as it makes backporting / branching / releases that much easier.
-
-Do not mention two keywords; if two apply, pick one that best represents the commit (for example, "Fix #123" is mostly always better than "Revert", even if both are true).
-
-The `<details>` part starts with a capital and does not end with a dot.
-Try to be descriptive to what the player will notice, not to what is actually being changed in the code.
-See `changelog.md` for inspiration.
-
-To further structure the changelog, you can add components. Example are:
-* "Network" for network specific changes.
-* "NewGRF" for NewGRF additions.
-* "Script" for AI / GS additions.
-* "YAPF", "NPF", for changes in these features.
-* "MacOS", "Linux", "Windows", for OS-specific changes.
-* "CI", "CMake", for changes to the (build) infrastructure.
-
-Further explanations, more details, etc. don't go into the first line. Use a new line for those.
-
-Complete examples:
-* `Fix: [YAPF] Infinite loop in pathfinder`
-* `Fix #5926: [YAPF] Infinite loop in pathfinder`
-* `Codefix 80dffae: Warning about unsigned unary minus`
-* `Fix #6673, 99bb3a9: Store the map variety setting in the savegame`
-* `Codefix #5922: ClientSizeChanged is only called via WndProcGdi which already has the mutex`
-* `Codechange #1264, #2037, #2038, #2110: Rewrite the autoreplace kernel`
-
-
-## Other tips
-### Remove trailing whitespace
-To find out if/where you have trailing whitespace, you can use the following (unix/bash) command:
-```
-grep -n -R --include "*.[ch]" '[ 	]$' * | grep --invert-match ".diff" | grep --invert-match ".patch"
-```
-Automatically removing whitespace is also possible with the following shell script (Note that it only checks .c, .cpp, .h, .hpp and .mm files):
-```
-#!/bin/sh
-IFS='
-'
-for i in Makefile `find . -name \*.c -o -name \*.cpp -o -name \*.h -o -name \*.hpp -o -name \*.mm`
-do
-  (
-	echo '%s/[ 	]\{1,\}$/'
-	echo w
-	echo q
-  ) | ed $i 2> /dev/null > /dev/null
-done
-```
-
-### Install the client-side git commit hooks
-
-The client-side hooks perform various checks when you commit changes locally.
-* Whitespace and indentation checks.
-* **Coding style** checks.
-
-Get the hooks:
-```
-git clone https://github.com/OpenTTD/OpenTTD-git-hooks.git openttd_hooks
-```
-
-Install the hooks, assuming "openttd" is your work tree folder:
-```
-cd openttd/.git/hooks
-ln -s -t . ../../../openttd_hooks/hooks/*
-```
-

COMPILING.md

@@ -4,32 +4,27 @@
 
 OpenTTD makes use of the following external libraries:
 
-- (encouraged) breakpad: creates minidumps on crash
 - (encouraged) zlib: (de)compressing of old (0.3.0-1.0.5) savegames, content downloads,
    heightmaps
 - (encouraged) liblzma: (de)compressing of savegames (1.1.0 and later)
 - (encouraged) libpng: making screenshots and loading heightmaps
 - (optional) liblzo2: (de)compressing of old (pre 0.3.0) savegames
 
-For Linux, the following additional libraries are used:
+For Linux, the following additional libraries are used (for non-dedicated only):
 
-- (encouraged) libcurl: content downloads
 - libSDL2: hardware access (video, sound, mouse)
 - libfreetype: loading generic fonts and rendering them
 - libfontconfig: searching for fonts, resolving font names to actual fonts
-- harfbuzz: handling of right-to-left scripts (e.g. Arabic and Persian) (required libicu)
 - libicu: handling of right-to-left scripts (e.g. Arabic and Persian) and
    natural sorting of strings
 
-If you are building a dedicated-server only, you don't need the last four.
-
 OpenTTD does not require any of the libraries to be present, but without
 liblzma you cannot open most recent savegames and without zlib you cannot
 open most older savegames or use the content downloading system.
 
 ## Windows
 
-You need Microsoft Visual Studio 2022 or more recent.
+You need Microsoft Visual Studio 2017 or more recent.
 
 You can download the free Visual Studio Community Edition from Microsoft at
 https://visualstudio.microsoft.com/vs/community/.
@@ -38,7 +33,7 @@ OpenTTD needs the Platform SDK, if it isn't installed already. This can be
 done during installing Visual Studio, by selecting
 `Visual C++ MFC for x86 and x64` (and possibly
 `Visual C++ ATL for x86 and x64` depending on your version). If not, you
-can get download it as [MS Windows Platform SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk).
+can get download it as [MS Windows Platform SDK](https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk).
 
 Install the SDK by following the instructions as given.
 
@@ -50,7 +45,6 @@ by following the `Quick Start` instructions of their
 After this, you can install the dependencies OpenTTD needs. We advise to use
 the `static` versions, and OpenTTD currently needs the following dependencies:
 
-- breakpad
 - liblzma
 - libpng
 - lzo
@@ -59,13 +53,13 @@ the `static` versions, and OpenTTD currently needs the following dependencies:
 To install both the x64 (64bit) and x86 (32bit) variants (though only one is necessary), you can use:
 
 ```ps
-.\vcpkg install --triplet=x64-windows-static
-.\vcpkg install --triplet=x86-windows-static
+.\vcpkg install liblzma:x64-windows-static libpng:x64-windows-static lzo:x64-windows-static zlib:x64-windows-static
+.\vcpkg install liblzma:x86-windows-static libpng:x86-windows-static lzo:x86-windows-static zlib:x86-windows-static
 ```
 
 You can open the folder (as a CMake project). CMake will be detected, and you can compile from there.
 If libraries are installed but not found, you need to set VCPKG_TARGET_TRIPLET in CMake parameters.
-For Visual Studio 2022 you also need to set CMAKE_TOOLCHAIN_FILE.
+For Visual Studio 2017 you also need to set CMAKE_TOOLCHAIN_FILE.
 (Typical values are shown in the MSVC project file command line example)
 
 Alternatively, you can create a MSVC project file via CMake. For this
@@ -75,7 +69,7 @@ that comes with vcpkg. After that, you can run something similar to this:
 ```powershell
 mkdir build
 cd build
-cmake.exe .. -G"Visual Studio 17 2022" -DCMAKE_TOOLCHAIN_FILE="<location of vcpkg>\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="x64-windows-static"
+cmake.exe .. -G'Visual Studio 16 2019' -DCMAKE_TOOLCHAIN_FILE="<location of vcpkg>\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="x64-windows-static"
 ```
 
 Change `<location of vcpkg>` to where you have installed vcpkg. After this
@@ -83,7 +77,7 @@ in the build folder are MSVC project files. MSVC can rebuild the project
 files himself via the `ZERO_CHECK` project.
 
 ## All other platforms
-Minimum required version of CMake is 3.16.
+Minimum required version of CMake is 3.9.
 By default this produces a Debug build with assertations enabled.
 This is a far slower build than release builds.
 
@@ -103,21 +97,24 @@ Via CMake, several options can be influenced to get different types of
 builds.
 
 - `-DCMAKE_BUILD_TYPE=RelWithDebInfo`: build a release build. This is
-   significantly faster than a debug build, but has far less useful information
+   significant faster than a debug build, but has far less useful information
    in case of a crash.
 - `-DOPTION_DEDICATED=ON`: build OpenTTD without a GUI. Useful if you are
    running a headless server, as it requires less libraries to operate.
 - `-DOPTION_USE_ASSERTS=OFF`: disable asserts. Use with care, as assert
    statements capture early signs of trouble. Release builds have them
    disabled by default.
+- `-DOPTION_USE_THREADS=OFF`: disable the use of threads. This will block
+   the interface in many places, and in general gives a worse experience of
+   the game. Use with care.
 - `-DOPTION_TOOLS_ONLY=ON`: only build tools like `strgen`. Does not build
    the game itself. Useful for cross-compiling.
 
 ## Supported compilers
 
-Every compiler that is supported by CMake and supports C++20, should be
+Every compiler that is supported by CMake and supports C++17, should be
 able to compile OpenTTD. As the exact list of compilers changes constantly,
-we refer to the compiler manual to see if it supports C++20, and to CMake
+we refer to the compiler manual to see if it supports C++17, and to CMake
 to see if it supports your compiler.
 
 ## Compilation of base sets

CONTRIBUTING.md

@@ -14,7 +14,7 @@ In return, they should reciprocate that respect in addressing your issue or asse
 The [issue tracker](https://github.com/OpenTTD/OpenTTD/issues) is the preferred channel for [bug reports](#bug-reports), but please respect the following restrictions:
 
 * Please **do not** use the issue tracker for help playing or using OpenTTD.
-Please try [irc](https://wiki.openttd.org/en/Development/IRC%20channel), [Discord](https://discord.gg/openttd), or the [forums](https://www.tt-forums.net/)
+Please try [irc](https://wiki.openttd.org/en/Development/IRC%20channel), or the [forums](https://www.tt-forums.net/)
 
 * Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others.
 
@@ -23,7 +23,7 @@ Use [GitHub's "reactions" feature](https://github.com/blog/2119-add-reactions-to
 We reserve the right to delete comments which violate this rule.
 
 * Please **do not** open issues or pull requests regarding add-on content in NewGRF, GameScripts, AIs, etc.
-These are created by third-parties.  Please try [irc](https://wiki.openttd.org/en/Development/IRC%20channel), [Discord](https://discord.gg/openttd), or the [forums](https://www.tt-forums.net/) to discuss these.
+These are created by third-parties.  Please try [irc](https://wiki.openttd.org/en/Development/IRC%20channel) or the [forums](https://www.tt-forums.net/) to discuss these.
 
 * Please use [the web translator](https://translator.openttd.org/) to submit corrections and improvements to translations of the game.
 
@@ -94,8 +94,8 @@ Although we really appreciate feedback and ideas, we will close feature requests
 
 Many of those ideas etc do have a place on the [forums](https://www.tt-forums.net); and if enough people like it, someone will stand up and make it.
 
-It's usually best to discuss on [Discord](https://discord.gg/openttd) before opening a feature request or working on a large feature in a fork.
-Discussion can take time, but it can be productive and avoid disappointment. :)
+It's usually best discuss in [irc](https://wiki.openttd.org/en/Development/IRC%20channel) before opening a feature request or working on a large feature in a fork.
+Discussion in irc can take time, but it can be productive and avoid disappointment :)
 
 
 ## Pull requests
@@ -108,11 +108,11 @@ Pull requests should fit with the [goals of the project](./CONTRIBUTING.md#proje
 
 Every pull request should have a clear scope, with no unrelated commits.
 
-[Code style](./CODINGSTYLE.md) must be complied with for pull requests to be accepted; this also includes [commit message format](./CODINGSTYLE.md#commit-message).
+[Code style](https://wiki.openttd.org/en/Development/Coding%20style) must be complied with for pull requests to be accepted; this also includes [commit message format](https://wiki.openttd.org/en/Development/Coding%20style#commit-message).
 
 Adhering to the following process is the best way to get your work included in the project:
 
-1. [Fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo) the project, clone your fork, and configure the remotes:
+1. [Fork](https://help.github.com/fork-a-repo/) the project, clone your fork, and configure the remotes:
 
 ```bash
 git clone https://github.com/<your-username>/OpenTTD.git openttd
@@ -136,8 +136,8 @@ contain your feature, change, or fix:
 git checkout upstream/master -b <topic-branch-name>
 ```
 
-4. Commit your changes in logical chunks. Please adhere to these [git commit message guidelines](./CODINGSTYLE.md#commit-message) or your code is unlikely to be merged into the main project.
-Use Git's [interactive rebase](https://docs.github.com/en/get-started/using-git/about-git-rebase) feature to tidy up your commits before making them public.
+4. Commit your changes in logical chunks. Please adhere to these [git commit message guidelines](https://wiki.openttd.org/en/Development/Coding%20style#commit-message) or your code is unlikely to be merged into the main project.
+Use Git's [interactive rebase](https://help.github.com/articles/interactive-rebase) feature to tidy up your commits before making them public.
 
 5. Locally rebase the upstream development branch into your topic branch:
 
@@ -172,7 +172,7 @@ The results of the CI tests will show on your pull request.
 By clicking on Details you can further zoom in; in case of a failure it will show you why it failed.
 In case of success it will report how awesome you were.
 
-Tip: [commit message format](./CODINGSTYLE.md#commit-message) is a common reason for pull requests to fail validation.
+Tip: [commit message format](https://wiki.openttd.org/en/Development/Coding%20style#commit-message) is a common reason for pull requests to fail validation.
 
 
 ### Are there any development docs?
@@ -182,16 +182,6 @@ There is no single source for OpenTTD development docs. It's a complex project w
 A good entry point is [Development](https://wiki.openttd.org/en/Development/) on the OpenTTD wiki; this provides links to wiki documentation and other sources.
 
 The GitHub repo also includes some non-comprehensive documentation in [/docs](./docs).
-These include:
-- When to [change other languages and when not to](./docs/eints.md).
-- The [savegame format](./docs/savegame_format.md).
-- The [release process](./docs/releasing_openttd.md).
-- Some [notes on the link graph algorithm](./docs/linkgraph.md).
-- The [network game coordinator](./docs/game_coordinator.md).
-- How to use [the admin port for network games](./docs/admin_network.md), also useful for multiplayer server hosts.
-- The [performance metrics and logging features](./docs/logging_and_performance_metrics.md), also useful for add-on developers.
-- How [symbol server and analysis works](./docs/symbol_server.md).
-- And several miscellaneous files detailing internal data structures and graphics measurements and palettes.
 
 You may also want the guide to [compiling OpenTTD](./COMPILING.md).
 
@@ -222,8 +212,8 @@ When it comes to gameplay features there are at least these groups of interests:
 - *Control freak:* micromanagement like conditional orders, refitting and loading etc.
 - *Casual:* automatisation like cargodist, path based signalling etc.
 
-To please everyone, the official branch tries to stay close to the original gameplay; after all, that is what brought everyone here.
-The preferred method to alter and extend the gameplay is via add-ons like NewGRF and GameScripts.
+To please everyone, the official branch tries to stay close to the original gameplay; after all, that is what everyone brought here.
+The preferred method to alter and extent the gameplay is via add-ons like NewGRF and GameScripts.
 
 For a long time, the official branch was also open to features which could be enabled/disabled, but the corner-cases that came with some configurations have rendered some parts of the code very complicated.
 Today, new features have to work with all the already existing features, which is not only challenging in corner cases, but also requires spending considerable more work than just "making it work in the game mode that I play".
@@ -266,7 +256,7 @@ This is inevitable, because it is a main feature of git.
 If you are concerned about your privacy, we strongly recommend to use "Anonymous &lt;anonymous@openttd.org&gt;" as the git commit author. We might refuse anonymous contributions if malicious intent is suspected.
 
 Please note that the contributor identity, once given, is used for copyright verification and to provide proof should a malicious commit be made.
-As such, the [EU GDPR](https://gdpr.eu) "right to be forgotten" does not apply, as this is an overriding legitimate interest.
+As such, the [EU GDPR](https://www.eugdpr.org/key-changes.html) "right to be forgotten" does not apply, as this is an overriding legitimate interest.
 
 Please also note that your commit is public and as such will potentially be processed by many third-parties.
 Git's distributed nature makes it impossible to track where exactly your commit, and thus your personal data, will be stored and be processed.
@@ -275,5 +265,5 @@ If you would not like to accept this risk, please do either commit anonymously o
 
 ### Attribution of this Contributing Guide
 
-This contributing guide is adapted from [Bootstrap](https://github.com/twbs/bootstrap/blob/main/.github/CONTRIBUTING.md) under the [Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/) terms for Bootstrap documentation.
+This contributing guide is adapted from [Bootstrap](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) under the [Creative Commons Attribution 3.0 Unported License](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE) terms for Bootstrap documentation.
 The GDPR notice is adapted from [rsyslog](https://github.com/rsyslog/rsyslog/blob/master/CONTRIBUTING.md) under the [GNU General Public License](https://github.com/rsyslog/rsyslog/blob/master/COPYING).

COPYING.md

@@ -1,5 +1,5 @@
 This is the license which applies to OpenTTD with the exception of some
-3rd party modules. See [our readme](./README.md) for details
+3rd party modules. See [./README.md](./README.md) for details
 
 GNU General Public License
 ==========================

CREDITS.md

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

Doxyfile.in

@@ -3,8 +3,6 @@
 # OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 
-# Doxyfile 1.9.4
-
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
@@ -15,7 +13,6 @@ PROJECT_BRIEF          =
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = ${CPACK_BINARY_DIR}/docs/source/
 CREATE_SUBDIRS         = YES
-CREATE_SUBDIRS_LEVEL   = 8
 ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
@@ -38,19 +35,17 @@ STRIP_FROM_PATH        = ./
 STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
-JAVADOC_BANNER         = NO
 QT_AUTOBRIEF           = NO
 MULTILINE_CPP_IS_BRIEF = NO
-PYTHON_DOCSTRING       = YES
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 2
 ALIASES                =
+TCL_SUBST              =
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
-OPTIMIZE_OUTPUT_SLICE  = NO
 EXTENSION_MAPPING      =
 MARKDOWN_SUPPORT       = YES
 TOC_INCLUDE_HEADINGS   = 0
@@ -66,19 +61,16 @@ INLINE_GROUPED_CLASSES = NO
 INLINE_SIMPLE_STRUCTS  = NO
 TYPEDEF_HIDES_STRUCT   = NO
 LOOKUP_CACHE_SIZE      = 0
-NUM_PROC_THREADS       = 1
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 EXTRACT_ALL            = NO
 EXTRACT_PRIVATE        = YES
-EXTRACT_PRIV_VIRTUAL   = NO
 EXTRACT_PACKAGE        = NO
 EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
 EXTRACT_LOCAL_METHODS  = YES
 EXTRACT_ANON_NSPACES   = YES
-RESOLVE_UNNAMED_PARAMS = YES
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -87,7 +79,6 @@ INTERNAL_DOCS          = NO
 CASE_SENSE_NAMES       = YES
 HIDE_SCOPE_NAMES       = NO
 HIDE_COMPOUND_REFERENCE= NO
-SHOW_HEADERFILE        = YES
 SHOW_INCLUDE_FILES     = YES
 SHOW_GROUPED_MEMB_INC  = NO
 FORCE_LOCAL_INCLUDES   = NO
@@ -117,11 +108,9 @@ QUIET                  = NO
 WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
-WARN_IF_INCOMPLETE_DOC = YES
 WARN_NO_PARAMDOC       = NO
 WARN_AS_ERROR          = NO
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LINE_FORMAT       = "at line $line of file $file"
 WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
@@ -162,14 +151,11 @@ REFERENCES_LINK_SOURCE = YES
 SOURCE_TOOLTIPS        = YES
 USE_HTAGS              = NO
 VERBATIM_HEADERS       = YES
-CLANG_ASSISTED_PARSING = NO
-CLANG_ADD_INC_PATHS    = YES
-CLANG_OPTIONS          =
-CLANG_DATABASE_PATH    =
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
 IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
 # Configuration options related to the HTML output
@@ -191,7 +177,6 @@ HTML_DYNAMIC_SECTIONS  = NO
 HTML_INDEX_NUM_ENTRIES = 100
 GENERATE_DOCSET        = NO
 DOCSET_FEEDNAME        = "Doxygen generated docs"
-DOCSET_FEEDURL         =
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 DOCSET_PUBLISHER_NAME  = Publisher
@@ -214,17 +199,12 @@ GENERATE_ECLIPSEHELP   = NO
 ECLIPSE_DOC_ID         = org.doxygen.Project
 DISABLE_INDEX          = NO
 GENERATE_TREEVIEW      = YES
-FULL_SIDEBAR           = NO
 ENUM_VALUES_PER_LINE   = 4
 TREEVIEW_WIDTH         = 250
 EXT_LINKS_IN_WINDOW    = NO
-OBFUSCATE_EMAILS       = YES
-HTML_FORMULA_FORMAT    = png
 FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
-FORMULA_MACROFILE      =
 USE_MATHJAX            = NO
-MATHJAX_VERSION        = MathJax_2
 MATHJAX_FORMAT         = HTML-CSS
 MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/
 MATHJAX_EXTENSIONS     =
@@ -243,9 +223,8 @@ GENERATE_LATEX         = NO
 LATEX_OUTPUT           = latex
 LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
-LATEX_MAKEINDEX_CMD    = makeindex
 COMPACT_LATEX          = NO
-PAPER_TYPE             = a4
+PAPER_TYPE             = a4wide
 EXTRA_PACKAGES         =
 LATEX_HEADER           =
 LATEX_FOOTER           =
@@ -255,9 +234,9 @@ PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
 LATEX_HIDE_INDICES     = NO
+LATEX_SOURCE_CODE      = NO
 LATEX_BIB_STYLE        = plain
 LATEX_TIMESTAMP        = NO
-LATEX_EMOJI_DIRECTORY  =
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -267,6 +246,7 @@ COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 RTF_EXTENSIONS_FILE    =
+RTF_SOURCE_CODE        = NO
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -281,12 +261,12 @@ MAN_LINKS              = NO
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
 XML_PROGRAMLISTING     = YES
-XML_NS_MEMB_FILE_SCOPE = NO
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
 GENERATE_DOCBOOK       = NO
 DOCBOOK_OUTPUT         = docbook
+DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -310,12 +290,12 @@ INCLUDE_FILE_PATTERNS  =
 PREDEFINED             = WITH_ZLIB \
                          WITH_LZO \
                          WITH_LIBLZMA \
-                         WITH_SDL2 \
+                         WITH_SDL \
                          WITH_PNG \
                          WITH_FONTCONFIG \
                          WITH_FREETYPE \
-                         WITH_HARFBUZZ \
                          WITH_ICU_I18N \
+                         WITH_ICU_LX \
                          UNICODE \
                          _UNICODE \
                          _GNU_SOURCE \
@@ -333,6 +313,7 @@ EXTERNAL_PAGES         = YES
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
 DIA_PATH               =
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = NO
@@ -345,8 +326,6 @@ COLLABORATION_GRAPH    = YES
 GROUP_GRAPHS           = YES
 UML_LOOK               = NO
 UML_LIMIT_NUM_FIELDS   = 10
-DOT_UML_DETAILS        = NO
-DOT_WRAP_THRESHOLD     = 17
 TEMPLATE_RELATIONS     = NO
 INCLUDE_GRAPH          = YES
 INCLUDED_BY_GRAPH      = YES
@@ -354,7 +333,6 @@ CALL_GRAPH             = NO
 CALLER_GRAPH           = NO
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
-DIR_GRAPH_MAX_DEPTH    = 1
 DOT_IMAGE_FORMAT       = png
 INTERACTIVE_SVG        = NO
 DOT_PATH               =

README.md

@@ -11,10 +11,9 @@
     - 1.6) [OpenTTD directories](#16-openttd-directories)
     - 1.7) [Compiling OpenTTD](#17-compiling-openttd)
 - 2.0) [Contact and community](#20-contact-and-community)
-    - 2.1) [Multiplayer games](#21-multiplayer-games)
-    - 2.2) [Contributing to OpenTTD](#22-contributing-to-openttd)
-    - 2.3) [Reporting bugs](#23-reporting-bugs)
-    - 2.4) [Translating](#24-translating)
+    - 2.1) [Contributing to OpenTTD](#21-contributing-to-openttd)
+    - 2.2) [Reporting bugs](#22-reporting-bugs)
+    - 2.3) [Translating](#23-translating)
 - 3.0) [Licensing](#30-licensing)
 - 4.0) [Credits](#40-credits)
 
@@ -35,12 +34,14 @@ Both 'stable' and 'nightly' versions are available for download:
 - most people should choose the 'stable' version, as this has been more extensively tested
 - the 'nightly' version includes the latest changes and features, but may sometimes be less reliable
 
-OpenTTD is also available for free on [Steam](https://store.steampowered.com/app/1536610/OpenTTD/), [GOG.com](https://www.gog.com/game/openttd), and the [Microsoft Store](https://www.microsoft.com/p/openttd-official/9ncjg5rvrr1c). On some platforms OpenTTD will be available via your OS package manager or a similar service.
+On some platforms OpenTTD will also be available via your OS package manager or a similar service.
+
 
 ## 1.2) OpenTTD gameplay manual
 
 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.
@@ -54,7 +55,6 @@ 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.
 
@@ -71,18 +71,20 @@ 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
 OpenMSX for music can be found at:
 
-- [OpenGFX](https://www.openttd.org/downloads/opengfx-releases/latest)
-- [OpenSFX](https://www.openttd.org/downloads/opensfx-releases/latest)
-- [OpenMSX](https://www.openttd.org/downloads/openmsx-releases/latest)
+- https://www.openttd.org/downloads/opengfx-releases/ for OpenGFX
+- https://www.openttd.org/downloads/opensfx-releases/ for OpenSFX
+- https://www.openttd.org/downloads/openmsx-releases/ for OpenMSX
 
 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.
@@ -97,6 +99,7 @@ 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.
@@ -104,6 +107,7 @@ 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.
@@ -112,13 +116,35 @@ Most types of add-on content can be downloaded within OpenTTD via the 'Check Onl
 
 Add-on content can also be installed manually, but that's more complicated; the [OpenTTD wiki](https://wiki.openttd.org/) may offer help with that, or the [OpenTTD directory structure guide](./docs/directory_structure.md).
 
-### 1.5.1) Social Integration
+### 1.5.1) AI opponents
 
-OpenTTD has the ability to load plugins to integrate with Social Platforms like Steam, Discord, etc.
+OpenTTD comes without AI opponents, so if you want to play with AIs you have to download them.
 
-To enable such integration, the plugin for the specific platform has to be downloaded and stored in the `social_integration` folder.
+The easiest way is via the 'Check Online Content' button in the main menu.
 
-See [OpenTTD's website](https://www.openttd.org), under Downloads, for what plugins are available.
+You can select some AIs that you think are compatible with your playing style.
+
+AI help and discussions may also be found in the [AI section of the forum](https://www.tt-forums.net/viewforum.php?f=65).
+
+### 1.5.2) Scenarios and height maps
+
+Scenarios and heightmaps can be added via the 'Check Online Content' button in the main menu.
+
+### 1.5.3) NewGRFs
+
+A wide range of add-content is available as NewGRFs, including vehicles, industries, stations, landscape objects, town names and more.
+
+NewGRFs can be added via the 'Check Online Content' button in the main menu.
+
+See also the wiki [guide to NewGRFs](https://wiki.openttd.org/en/Manual/NewGRF) and [the forum graphics development section](https://www.tt-forums.net/viewforum.php?f=66).
+
+### 1.5.4) Game scripts
+
+Game scripts can provide additional challenges or changes to the standard OpenTTD gameplay, for example setting transport goals, or changing town growth behaviour.
+
+Game scripts can be added via the 'Check Online Content' button in the main menu.
+
+See also the wiki [guide to game scripts](https://wiki.openttd.org/en/Manual/Game%20script) and [the forum graphics game script section](https://www.tt-forums.net/viewforum.php?f=65).
 
 ### 1.6) OpenTTD directories
 
@@ -130,14 +156,14 @@ 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
 
 - [OpenTTD website](https://www.openttd.org)
-- [OpenTTD official Discord](https://discord.gg/openttd)
 - IRC chat using #openttd on irc.oftc.net [more info about our irc channel](https://wiki.openttd.org/en/Development/IRC%20channel)
-- [OpenTTD on Github](https://github.com/OpenTTD/) for code repositories and for reporting issues
+- [OpenTTD on Github](https://github.com/openTTD/) for code repositories and for reporting issues
 - [forum.openttd.org](https://forum.openttd.org/) - the primary community forum site for discussing OpenTTD and related games
 - [OpenTTD wiki](https://wiki.openttd.org/) community-maintained wiki, including topics like gameplay guide, detailed explanation of some game mechanics, how to use add-on content (mods) and much more
 
@@ -146,27 +172,24 @@ If you want to compile OpenTTD from source, instructions can be found in [COMPIL
 - the OpenTTD wiki has a [page listing OpenTTD communities](https://wiki.openttd.org/en/Community/Community) including some in languages other than English
 
 
-### 2.1) Multiplayer games
-
-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
+### 2.1) Contributing to OpenTTD
 
 We welcome contributors to OpenTTD.  More information for contributors can be found in [CONTRIBUTING.md](./CONTRIBUTING.md)
 
-### 2.3) Reporting bugs
+
+### 2.2) Reporting bugs
 
 Good bug reports are very helpful.  We have a [guide to reporting bugs](./CONTRIBUTING.md#bug-reports) to help with this.
 
 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
+
+### 2.3) 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.
@@ -179,30 +202,10 @@ See `src/3rdparty/squirrel/COPYRIGHT` for the complete license text.
 The md5 implementation in `src/3rdparty/md5` is licensed under the Zlib license.
 See the comments in the source files in `src/3rdparty/md5` for the complete license text.
 
-The fmt implementation in `src/3rdparty/fmt` is licensed under the MIT license.
-See `src/3rdparty/fmt/LICENSE.rst` for the complete license text.
+The implementations of Posix `getaddrinfo` and `getnameinfo` for OS/2 in `src/3rdparty/os2` are distributed partly under the GNU Lesser General Public License 2.1, and partly under the (3-clause) BSD license.
+The exact licensing terms can be found in `src/3rdparty/os2/getaddrinfo.c` resp. `src/3rdparty/os2/getnameinfo.c`.
 
-The nlohmann json implementation in `src/3rdparty/nlohmann` is licensed under the MIT license.
-See `src/3rdparty/nlohmann/LICENSE.MIT` for the complete license text.
 
-The OpenGL API in `src/3rdparty/opengl` is licensed under the MIT license.
-See `src/3rdparty/opengl/khrplatform.h` for the complete license text.
-
-The catch2 implementation in `src/3rdparty/catch2` is licensed under the Boost Software License, Version 1.0.
-See `src/3rdparty/catch2/LICENSE.txt` for the complete license text.
-
-The icu scriptrun implementation in `src/3rdparty/icu` is licensed under the Unicode license.
-See `src/3rdparty/icu/LICENSE` for the complete license text.
-
-The monocypher implementation in `src/3rdparty/monocypher` is licensed under the 2-clause BSD and CC-0 license.
-See `src/3rdparty/monocypher/LICENSE.md` for the complete license text.
-
-The OpenTTD Social Integration API in `src/3rdparty/openttd_social_integration_api` is licensed under the MIT license.
-See `src/3rdparty/openttd_social_integration_api/LICENSE` for the complete license text.
-
-The atomic datatype support detection in `cmake/3rdparty/llvm/CheckAtomic.cmake` is licensed under the Apache 2.0 license.
-See `cmake/3rdparty/llvm/LICENSE.txt` for the complete license text.
-
-## 4.0) Credits
+## 4.0 Credits
 
 See [CREDITS.md](./CREDITS.md)

bin/ai/CMakeLists.txt

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

bin/ai/compat_0.7.nut

@@ -5,8 +5,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/>.
  */
 
-/* This file contains code to downgrade the API from 1.0 to 0.7. */
-
+AILog.Info("0.7 API compatibility in effect:");
 AILog.Info(" - AITown::GetLastMonthProduction's behaviour has slightly changed.");
 AILog.Info(" - AISubsidy::GetDestination returns STATION_INVALID for awarded subsidies.");
 AILog.Info(" - AISubsidy::GetSource returns STATION_INVALID for awarded subsidies.");
@@ -96,158 +95,158 @@ AIEngine.IsValidEngine <- function(engine_id)
 	return AIEngine.IsBuildable(engine_id);
 }
 
-AIEngine.GetNameCompat0_7 <- AIEngine.GetName;
+AIEngine._GetName <- AIEngine.GetName;
 AIEngine.GetName <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return null;
-	return AIEngine.GetNameCompat0_7(engine_id);
+	return AIEngine._GetName(engine_id);
 }
 
-AIEngine.GetCargoTypeCompat0_7 <- AIEngine.GetCargoType;
+AIEngine._GetCargoType <- AIEngine.GetCargoType;
 AIEngine.GetCargoType <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return 255;
-	return AIEngine.GetCargoTypeCompat0_7(engine_id);
+	return AIEngine._GetCargoType(engine_id);
 }
 
-AIEngine.CanRefitCargoCompat0_7 <- AIEngine.CanRefitCargo;
+AIEngine._CanRefitCargo <- AIEngine.CanRefitCargo;
 AIEngine.CanRefitCargo <- function(engine_id, cargo_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return false;
-	return AIEngine.CanRefitCargoCompat0_7(engine_id, cargo_id);
+	return AIEngine._CanRefitCargo(engine_id, cargo_id);
 }
 
-AIEngine.CanPullCargoCompat0_7 <- AIEngine.CanPullCargo;
+AIEngine._CanPullCargo <- AIEngine.CanPullCargo;
 AIEngine.CanPullCargo <- function(engine_id, cargo_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return false;
-	return AIEngine.CanPullCargoCompat0_7(engine_id, cargo_id);
+	return AIEngine._CanPullCargo(engine_id, cargo_id);
 }
 
-AIEngine.GetCapacityCompat0_7 <- AIEngine.GetCapacity;
+AIEngine._GetCapacity <- AIEngine.GetCapacity;
 AIEngine.GetCapacity <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine.GetCapacityCompat0_7(engine_id);
+	return AIEngine._GetCapacity(engine_id);
 }
 
-AIEngine.GetReliabilityCompat0_7 <- AIEngine.GetReliability;
+AIEngine._GetReliability <- AIEngine.GetReliability;
 AIEngine.GetReliability <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine.GetReliabilityCompat0_7(engine_id);
+	return AIEngine._GetReliability(engine_id);
 }
 
-AIEngine.GetMaxSpeedCompat0_7 <- AIEngine.GetMaxSpeed;
+AIEngine._GetMaxSpeed <- AIEngine.GetMaxSpeed;
 AIEngine.GetMaxSpeed <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine.GetMaxSpeedCompat0_7(engine_id);
+	return AIEngine._GetMaxSpeed(engine_id);
 }
 
-AIEngine.GetPriceCompat0_7 <- AIEngine.GetPrice;
+AIEngine._GetPrice <- AIEngine.GetPrice;
 AIEngine.GetPrice <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine.GetPriceCompat0_7(engine_id);
+	return AIEngine._GetPrice(engine_id);
 }
 
-AIEngine.GetMaxAgeCompat0_7 <- AIEngine.GetMaxAge;
+AIEngine._GetMaxAge <- AIEngine.GetMaxAge;
 AIEngine.GetMaxAge <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine.GetMaxAgeCompat0_7(engine_id);
+	return AIEngine._GetMaxAge(engine_id);
 }
 
-AIEngine.GetRunningCostCompat0_7 <- AIEngine.GetRunningCost;
+AIEngine._GetRunningCost <- AIEngine.GetRunningCost;
 AIEngine.GetRunningCost <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine.GetRunningCostCompat0_7(engine_id);
+	return AIEngine._GetRunningCost(engine_id);
 }
 
-AIEngine.GetPowerCompat0_7 <- AIEngine.GetPower;
+AIEngine._GetPower <- AIEngine.GetPower;
 AIEngine.GetPower <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine.GetPowerCompat0_7(engine_id);
+	return AIEngine._GetPower(engine_id);
 }
 
-AIEngine.GetWeightCompat0_7 <- AIEngine.GetWeight;
+AIEngine._GetWeight <- AIEngine.GetWeight;
 AIEngine.GetWeight <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine.GetWeightCompat0_7(engine_id);
+	return AIEngine._GetWeight(engine_id);
 }
 
-AIEngine.GetMaxTractiveEffortCompat0_7 <- AIEngine.GetMaxTractiveEffort;
+AIEngine._GetMaxTractiveEffort <- AIEngine.GetMaxTractiveEffort;
 AIEngine.GetMaxTractiveEffort <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine.GetMaxTractiveEffortCompat0_7(engine_id);
+	return AIEngine._GetMaxTractiveEffort(engine_id);
 }
 
-AIEngine.GetDesignDateCompat0_7 <- AIEngine.GetDesignDate;
+AIEngine._GetDesignDate <- AIEngine.GetDesignDate;
 AIEngine.GetDesignDate <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine.GetDesignDateCompat0_7(engine_id);
+	return AIEngine._GetDesignDate(engine_id);
 }
 
-AIEngine.GetVehicleTypeCompat0_7 <- AIEngine.GetVehicleType;
+AIEngine._GetVehicleType <- AIEngine.GetVehicleType;
 AIEngine.GetVehicleType <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return AIVehicle.VT_INVALID;
-	return AIEngine.GetVehicleTypeCompat0_7(engine_id);
+	return AIEngine._GetVehicleType(engine_id);
 }
 
-AIEngine.IsWagonCompat0_7 <- AIEngine.IsWagon;
+AIEngine._IsWagon <- AIEngine.IsWagon;
 AIEngine.IsWagon <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return false;
-	return AIEngine.IsWagonCompat0_7(engine_id);
+	return AIEngine._IsWagon(engine_id);
 }
 
-AIEngine.CanRunOnRailCompat0_7 <- AIEngine.CanRunOnRail;
+AIEngine._CanRunOnRail <- AIEngine.CanRunOnRail;
 AIEngine.CanRunOnRail <- function(engine_id, track_rail_type)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return false;
-	return AIEngine.CanRunOnRailCompat0_7(engine_id, track_rail_type);
+	return AIEngine._CanRunOnRail(engine_id, track_rail_type);
 }
 
-AIEngine.HasPowerOnRailCompat0_7 <- AIEngine.HasPowerOnRail;
+AIEngine._HasPowerOnRail <- AIEngine.HasPowerOnRail;
 AIEngine.HasPowerOnRail <- function(engine_id, track_rail_type)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return false;
-	return AIEngine.HasPowerOnRailCompat0_7(engine_id, track_rail_type);
+	return AIEngine._HasPowerOnRail(engine_id, track_rail_type);
 }
 
-AIEngine.GetRoadTypeCompat0_7 <- AIEngine.GetRoadType;
+AIEngine._GetRoadType <- AIEngine.GetRoadType;
 AIEngine.GetRoadType <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return AIRoad.ROADTYPE_INVALID;
-	return AIEngine.GetRoadTypeCompat0_7(engine_id);
+	return AIEngine._GetRoadType(engine_id);
 }
 
-AIEngine.GetRailTypeCompat0_7 <- AIEngine.GetRailType;
+AIEngine._GetRailType <- AIEngine.GetRailType;
 AIEngine.GetRailType <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return AIRail.RAILTYPE_INVALID;
-	return AIEngine.GetRailTypeCompat0_7(engine_id);
+	return AIEngine._GetRailType(engine_id);
 }
 
-AIEngine.IsArticulatedCompat0_7 <- AIEngine.IsArticulated;
+AIEngine._IsArticulated <- AIEngine.IsArticulated;
 AIEngine.IsArticulated <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return false;
-	return AIEngine.IsArticulatedCompat0_7(engine_id);
+	return AIEngine._IsArticulated(engine_id);
 }
 
-AIEngine.GetPlaneTypeCompat0_7 <- AIEngine.GetPlaneType;
+AIEngine._GetPlaneType <- AIEngine.GetPlaneType;
 AIEngine.GetPlaneType <- function(engine_id)
 {
 	if (!AIEngine.IsBuildable(engine_id)) return -1;
-	return AIEngine.GetPlaneTypeCompat0_7(engine_id);
+	return AIEngine._GetPlaneType(engine_id);
 }
 
 _AIWaypointList <- AIWaypointList;
@@ -257,3 +256,126 @@ class AIWaypointList extends _AIWaypointList {
 		::_AIWaypointList.constructor(AIWaypoint.WAYPOINT_RAIL);
 	}
 }
+
+AIRoad._BuildRoadStation <- AIRoad.BuildRoadStation;
+AIRoad.BuildRoadStation <- function(tile, front, road_veh_type, station_id)
+{
+	if (AIRoad.IsRoadStationTile(tile) && AICompany.IsMine(AITile.GetOwner(tile))) return false;
+
+	return AIRoad._BuildRoadStation(tile, front, road_veh_type, station_id);
+}
+
+AIRoad._BuildDriveThroughRoadStation <- AIRoad.BuildDriveThroughRoadStation;
+AIRoad.BuildDriveThroughRoadStation <- function(tile, front, road_veh_type, station_id)
+{
+	if (AIRoad.IsRoadStationTile(tile) && AICompany.IsMine(AITile.GetOwner(tile))) return false;
+
+	return AIRoad._BuildDriveThroughRoadStation(tile, front, road_veh_type, station_id);
+}
+
+AIBridgeList.HasNext <-
+AIBridgeList_Length.HasNext <-
+AICargoList.HasNext <-
+AICargoList_IndustryAccepting.HasNext <-
+AICargoList_IndustryProducing.HasNext <-
+AIDepotList.HasNext <-
+AIEngineList.HasNext <-
+AIGroupList.HasNext <-
+AIIndustryList.HasNext <-
+AIIndustryList_CargoAccepting.HasNext <-
+AIIndustryList_CargoProducing.HasNext <-
+AIIndustryTypeList.HasNext <-
+AIList.HasNext <-
+AIRailTypeList.HasNext <-
+AISignList.HasNext <-
+AIStationList.HasNext <-
+AIStationList_Vehicle.HasNext <-
+AISubsidyList.HasNext <-
+AITileList.HasNext <-
+AITileList_IndustryAccepting.HasNext <-
+AITileList_IndustryProducing.HasNext <-
+AITileList_StationType.HasNext <-
+AITownList.HasNext <-
+AIVehicleList.HasNext <-
+AIVehicleList_DefaultGroup.HasNext <-
+AIVehicleList_Group.HasNext <-
+AIVehicleList_SharedOrders.HasNext <-
+AIVehicleList_Station.HasNext <-
+AIWaypointList.HasNext <-
+AIWaypointList_Vehicle.HasNext <-
+function()
+{
+	return !this.IsEnd();
+}
+
+AIIndustry._IsCargoAccepted <- AIIndustry.IsCargoAccepted;
+AIIndustry.IsCargoAccepted <- function(industry_id, cargo_id)
+{
+	return AIIndustry._IsCargoAccepted(industry_id, cargo_id) != AIIndustry.CAS_NOT_ACCEPTED;
+}
+
+AIAbstractList <- AIList;
+
+AIList.ChangeItem <- AIList.SetValue;
+
+AIRail.ERR_NONUNIFORM_STATIONS_DISABLED <- 0xFFFF;
+
+AICompany.GetCompanyValue <- function(company)
+{
+	return AICompany.GetQuarterlyCompanyValue(company, AICompany.CURRENT_QUARTER);
+}
+
+AITown.GetLastMonthTransported <- AITown.GetLastMonthSupplied;
+
+AIEvent.AI_ET_INVALID <- AIEvent.ET_INVALID;
+AIEvent.AI_ET_TEST <- AIEvent.ET_TEST;
+AIEvent.AI_ET_SUBSIDY_OFFER <- AIEvent.ET_SUBSIDY_OFFER;
+AIEvent.AI_ET_SUBSIDY_OFFER_EXPIRED <- AIEvent.ET_SUBSIDY_OFFER_EXPIRED;
+AIEvent.AI_ET_SUBSIDY_AWARDED <- AIEvent.ET_SUBSIDY_AWARDED;
+AIEvent.AI_ET_SUBSIDY_EXPIRED <- AIEvent.ET_SUBSIDY_EXPIRED;
+AIEvent.AI_ET_ENGINE_PREVIEW <- AIEvent.ET_ENGINE_PREVIEW;
+AIEvent.AI_ET_COMPANY_NEW <- AIEvent.ET_COMPANY_NEW;
+AIEvent.AI_ET_COMPANY_IN_TROUBLE <- AIEvent.ET_COMPANY_IN_TROUBLE;
+AIEvent.AI_ET_COMPANY_MERGER <- AIEvent.ET_COMPANY_MERGER;
+AIEvent.AI_ET_COMPANY_BANKRUPT <- AIEvent.ET_COMPANY_BANKRUPT;
+AIEvent.AI_ET_VEHICLE_CRASHED <- AIEvent.ET_VEHICLE_CRASHED;
+AIEvent.AI_ET_VEHICLE_LOST <- AIEvent.ET_VEHICLE_LOST;
+AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT <- AIEvent.ET_VEHICLE_WAITING_IN_DEPOT;
+AIEvent.AI_ET_VEHICLE_UNPROFITABLE <- AIEvent.ET_VEHICLE_UNPROFITABLE;
+AIEvent.AI_ET_INDUSTRY_OPEN <- AIEvent.ET_INDUSTRY_OPEN;
+AIEvent.AI_ET_INDUSTRY_CLOSE <- AIEvent.ET_INDUSTRY_CLOSE;
+AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
+AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
+AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
+AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
+AIOrder.AIOF_NONE <- AIOrder.OF_NONE
+AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
+AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
+AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
+AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
+AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
+AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
+AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
+AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
+AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
+AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
+AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
+AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
+AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
+AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
+AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
+AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
+
+/* 1.9 adds parent_group_id to CreateGroup function */
+AIGroup._CreateGroup <- AIGroup.CreateGroup;
+AIGroup.CreateGroup <- function(vehicle_type)
+{
+	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
+}

bin/ai/compat_1.0.nut

@@ -5,22 +5,22 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.1 to 1.0. */
+AILog.Info("1.0 API compatibility in effect.");
 
-AIRoad.BuildRoadStationCompat1_0 <- AIRoad.BuildRoadStation;
+AIRoad._BuildRoadStation <- AIRoad.BuildRoadStation;
 AIRoad.BuildRoadStation <- function(tile, front, road_veh_type, station_id)
 {
 	if (AIRoad.IsRoadStationTile(tile) && AICompany.IsMine(AITile.GetOwner(tile))) return false;
 
-	return AIRoad.BuildRoadStationCompat1_0(tile, front, road_veh_type, station_id);
+	return AIRoad._BuildRoadStation(tile, front, road_veh_type, station_id);
 }
 
-AIRoad.BuildDriveThroughRoadStationCompat1_0 <- AIRoad.BuildDriveThroughRoadStation;
+AIRoad._BuildDriveThroughRoadStation <- AIRoad.BuildDriveThroughRoadStation;
 AIRoad.BuildDriveThroughRoadStation <- function(tile, front, road_veh_type, station_id)
 {
 	if (AIRoad.IsRoadStationTile(tile) && AICompany.IsMine(AITile.GetOwner(tile))) return false;
 
-	return AIRoad.BuildDriveThroughRoadStationCompat1_0(tile, front, road_veh_type, station_id);
+	return AIRoad._BuildDriveThroughRoadStation(tile, front, road_veh_type, station_id);
 }
 
 AIBridgeList.HasNext <-
@@ -59,10 +59,10 @@ function()
 	return !this.IsEnd();
 }
 
-AIIndustry.IsCargoAcceptedCompat1_0 <- AIIndustry.IsCargoAccepted;
+AIIndustry._IsCargoAccepted <- AIIndustry.IsCargoAccepted;
 AIIndustry.IsCargoAccepted <- function(industry_id, cargo_id)
 {
-	return AIIndustry.IsCargoAcceptedCompat1_0(industry_id, cargo_id) != AIIndustry.CAS_NOT_ACCEPTED;
+	return AIIndustry._IsCargoAccepted(industry_id, cargo_id) != AIIndustry.CAS_NOT_ACCEPTED;
 }
 
 AIAbstractList <- AIList;
@@ -70,3 +70,64 @@ AIAbstractList <- AIList;
 AIList.ChangeItem <- AIList.SetValue;
 
 AIRail.ERR_NONUNIFORM_STATIONS_DISABLED <- 0xFFFF;
+
+AICompany.GetCompanyValue <- function(company)
+{
+	return AICompany.GetQuarterlyCompanyValue(company, AICompany.CURRENT_QUARTER);
+}
+
+AITown.GetLastMonthTransported <- AITown.GetLastMonthSupplied;
+
+AIEvent.AI_ET_INVALID <- AIEvent.ET_INVALID;
+AIEvent.AI_ET_TEST <- AIEvent.ET_TEST;
+AIEvent.AI_ET_SUBSIDY_OFFER <- AIEvent.ET_SUBSIDY_OFFER;
+AIEvent.AI_ET_SUBSIDY_OFFER_EXPIRED <- AIEvent.ET_SUBSIDY_OFFER_EXPIRED;
+AIEvent.AI_ET_SUBSIDY_AWARDED <- AIEvent.ET_SUBSIDY_AWARDED;
+AIEvent.AI_ET_SUBSIDY_EXPIRED <- AIEvent.ET_SUBSIDY_EXPIRED;
+AIEvent.AI_ET_ENGINE_PREVIEW <- AIEvent.ET_ENGINE_PREVIEW;
+AIEvent.AI_ET_COMPANY_NEW <- AIEvent.ET_COMPANY_NEW;
+AIEvent.AI_ET_COMPANY_IN_TROUBLE <- AIEvent.ET_COMPANY_IN_TROUBLE;
+AIEvent.AI_ET_COMPANY_ASK_MERGER <- AIEvent.ET_COMPANY_ASK_MERGER;
+AIEvent.AI_ET_COMPANY_MERGER <- AIEvent.ET_COMPANY_MERGER;
+AIEvent.AI_ET_COMPANY_BANKRUPT <- AIEvent.ET_COMPANY_BANKRUPT;
+AIEvent.AI_ET_VEHICLE_CRASHED <- AIEvent.ET_VEHICLE_CRASHED;
+AIEvent.AI_ET_VEHICLE_LOST <- AIEvent.ET_VEHICLE_LOST;
+AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT <- AIEvent.ET_VEHICLE_WAITING_IN_DEPOT;
+AIEvent.AI_ET_VEHICLE_UNPROFITABLE <- AIEvent.ET_VEHICLE_UNPROFITABLE;
+AIEvent.AI_ET_INDUSTRY_OPEN <- AIEvent.ET_INDUSTRY_OPEN;
+AIEvent.AI_ET_INDUSTRY_CLOSE <- AIEvent.ET_INDUSTRY_CLOSE;
+AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
+AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
+AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
+AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
+AIOrder.AIOF_NONE <- AIOrder.OF_NONE
+AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
+AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
+AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
+AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
+AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
+AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
+AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
+AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
+AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
+AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
+AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
+AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
+AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
+AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
+AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
+AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
+
+/* 1.9 adds parent_group_id to CreateGroup function */
+AIGroup._CreateGroup <- AIGroup.CreateGroup;
+AIGroup.CreateGroup <- function(vehicle_type)
+{
+	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
+}

bin/ai/compat_1.1.nut

@@ -5,7 +5,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/>.
  */
 
-/* This file contains code to downgrade the API from 1.2 to 1.1. */
+AILog.Info("1.1 API compatibility in effect.");
 
 AICompany.GetCompanyValue <- function(company)
 {
@@ -54,3 +54,17 @@ AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
 AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
 AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
 AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
+
+/* 1.9 adds parent_group_id to CreateGroup function */
+AIGroup._CreateGroup <- AIGroup.CreateGroup;
+AIGroup.CreateGroup <- function(vehicle_type)
+{
+	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
+}

bin/ai/compat_1.10.nut

@@ -5,4 +5,4 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.11 to 1.10. */
+AILog.Info("1.10 API compatibility in effect.");

bin/ai/compat_1.11.nut

@@ -4,5 +4,3 @@
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
-
-/* This file contains code to downgrade the API from 12 to 1.11. */

bin/ai/compat_1.2.nut

@@ -5,4 +5,18 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.3 to 1.2. */
+AILog.Info("1.2 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
+
+/* 1.9 adds parent_group_id to CreateGroup function */
+AIGroup._CreateGroup <- AIGroup.CreateGroup;
+AIGroup.CreateGroup <- function(vehicle_type)
+{
+	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
+}

bin/ai/compat_1.3.nut

@@ -5,4 +5,18 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.4 to 1.3. */
+AILog.Info("1.3 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
+
+/* 1.9 adds parent_group_id to CreateGroup function */
+AIGroup._CreateGroup <- AIGroup.CreateGroup;
+AIGroup.CreateGroup <- function(vehicle_type)
+{
+	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
+}

bin/ai/compat_1.4.nut

@@ -5,4 +5,18 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.5 to 1.4. */
+AILog.Info("1.4 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
+
+/* 1.9 adds parent_group_id to CreateGroup function */
+AIGroup._CreateGroup <- AIGroup.CreateGroup;
+AIGroup.CreateGroup <- function(vehicle_type)
+{
+	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
+}

bin/ai/compat_1.5.nut

@@ -5,4 +5,18 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.6 to 1.5. */
+AILog.Info("1.5 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
+
+/* 1.9 adds parent_group_id to CreateGroup function */
+AIGroup._CreateGroup <- AIGroup.CreateGroup;
+AIGroup.CreateGroup <- function(vehicle_type)
+{
+	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
+}

bin/ai/compat_1.6.nut

@@ -5,4 +5,18 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.7 to 1.6. */
+AILog.Info("1.6 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
+
+/* 1.9 adds parent_group_id to CreateGroup function */
+AIGroup._CreateGroup <- AIGroup.CreateGroup;
+AIGroup.CreateGroup <- function(vehicle_type)
+{
+	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
+}

bin/ai/compat_1.7.nut

@@ -5,4 +5,18 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.8 to 1.7. */
+AILog.Info("1.7 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
+
+/* 1.9 adds parent_group_id to CreateGroup function */
+AIGroup._CreateGroup <- AIGroup.CreateGroup;
+AIGroup.CreateGroup <- function(vehicle_type)
+{
+	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
+}

bin/ai/compat_1.8.nut

@@ -5,16 +5,18 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.9 to 1.8. */
+AILog.Info("1.8 API compatibility in effect.");
 
-AIBridge.GetNameCompat1_8 <- AIBridge.GetName;
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
 AIBridge.GetName <- function(bridge_id)
 {
-	return AIBridge.GetNameCompat1_8(bridge_id, AIVehicle.VT_RAIL);
+	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
 }
 
-AIGroup.CreateGroupCompat1_8 <- AIGroup.CreateGroup;
+/* 1.9 adds parent_group_id to CreateGroup function */
+AIGroup._CreateGroup <- AIGroup.CreateGroup;
 AIGroup.CreateGroup <- function(vehicle_type)
 {
-	return AIGroup.CreateGroupCompat1_8(vehicle_type, AIGroup.GROUP_INVALID);
+	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
 }

bin/ai/compat_1.9.nut

@@ -5,4 +5,4 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.10 to 1.9. */
+AILog.Info("1.9 API compatibility in effect.");

bin/ai/compat_12.nut

@@ -1,20 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* This file contains code to downgrade the API from 13 to 12. */
-
-AIRoad.HasRoadTypeCompat12 <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad.HasRoadTypeCompat12(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_13.nut

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

bin/ai/compat_14.nut

@@ -1,46 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* This file contains code to downgrade the API from 15 to 14. */
-
-AIBridge.GetBridgeID <- AIBridge.GetBridgeType;
-
-class AICompat14 {
-	function Text(text)
-	{
-		if (typeof text == "string") return text;
-		return null;
-	}
-}
-
-AIBaseStation.SetNameCompat14 <- AIBaseStation.SetName;
-AIBaseStation.SetName <- function(id, name) { return AIBaseStation.SetNameCompat14(id, AICompat14.Text(name)); }
-
-AICompany.SetNameCompat14 <- AICompany.SetName;
-AICompany.SetName <- function(name) { return AICompany.SetNameCompat14(AICompat14.Text(name)); }
-AICompany.SetPresidentNameCompat14 <- AICompany.SetPresidentName;
-AICompany.SetPresidentName <- function(name) { return AICompany.SetPresidentNameCompat14(AICompat14.Text(name)); }
-
-AIGroup.SetNameCompat14 <- AIGroup.SetName;
-AIGroup.SetName <- function(id, name) { return AIGroup.SetNameCompat14(id, AICompat14.Text(name)); }
-
-AISign.BuildSignCompat14 <- AISign.BuildSign;
-AISign.BuildSign <- function(id, name) { return AISign.BuildSignCompat14(id, AICompat14.Text(name)); }
-
-AITown.FoundTownCompat14 <- AITown.FoundTown;
-AITown.FoundTown <- function(tile, size, city, layout, name) { return AITown.FoundTownCompat14(tile, size, city, layout, AICompat14.Text(name)); }
-
-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"); }
-}

bin/game/CMakeLists.txt

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

bin/game/compat_1.10.nut

@@ -5,10 +5,11 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.11 to 1.10. */
+GSLog.Info("1.10 API compatibility in effect.");
 
-GSCompany.ChangeBankBalanceCompat1_10 <- GSCompany.ChangeBankBalance;
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
 GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
 {
-	return GSCompany.ChangeBankBalanceCompat1_10(company, delta, expenses_type, GSMap.TILE_INVALID);
+	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
 }

bin/game/compat_1.11.nut

@@ -4,6 +4,3 @@
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
-
-/* This file contains code to downgrade the API from 12 to 1.11. */
-

bin/game/compat_1.2.nut

@@ -5,4 +5,33 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.3 to 1.2. */
+GSLog.Info("1.2 API compatibility in effect.");
+
+GSTown._SetGrowthRate <- GSTown.SetGrowthRate;
+GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
+{
+	/* Growth rate 0 caused resetting the custom growth rate. While this was undocumented, it was used nevertheless (ofc). */
+	if (days_between_town_growth == 0) days_between_town_growth = GSTown.TOWN_GROWTH_NORMAL;
+	return GSTown._SetGrowthRate(town_id, days_between_town_growth);
+}
+
+/* 1.5 adds a game element reference to the news. */
+GSNews._Create <- GSNews.Create;
+GSNews.Create <- function(type, text, company)
+{
+    return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
+}
+
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
+GSBridge.GetName <- function(bridge_id)
+{
+	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}

bin/game/compat_1.3.nut

@@ -5,12 +5,33 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.4 to 1.3. */
+GSLog.Info("1.3 API compatibility in effect.");
 
-GSTown.SetGrowthRateCompat1_3 <- GSTown.SetGrowthRate;
+GSTown._SetGrowthRate <- GSTown.SetGrowthRate;
 GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
 {
 	/* Growth rate 0 caused resetting the custom growth rate. While this was undocumented, it was used nevertheless (ofc). */
 	if (days_between_town_growth == 0) days_between_town_growth = GSTown.TOWN_GROWTH_NORMAL;
-	return GSTown.SetGrowthRateCompat1_3(town_id, days_between_town_growth);
+	return GSTown._SetGrowthRate(town_id, days_between_town_growth);
+}
+
+/* 1.5 adds a game element reference to the news. */
+GSNews._Create <- GSNews.Create;
+GSNews.Create <- function(type, text, company)
+{
+    return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
+}
+
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
+GSBridge.GetName <- function(bridge_id)
+{
+	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
 }

bin/game/compat_1.4.nut

@@ -5,10 +5,26 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.5 to 1.4 */
+GSLog.Info("1.4 API compatibility in effect.");
 
-GSNews.CreateCompat1_4 <- GSNews.Create;
+/* 1.5 adds a game element reference to the news. */
+GSNews._Create <- GSNews.Create;
 GSNews.Create <- function(type, text, company)
 {
-    return GSNews.CreateCompat1_4(type, text, company, GSNews.NR_NONE, 0);
+    return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
 }
+
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
+GSBridge.GetName <- function(bridge_id)
+{
+	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}
+

bin/game/compat_1.5.nut

@@ -5,4 +5,18 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.6 to 1.5. */
+GSLog.Info("1.5 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
+GSBridge.GetName <- function(bridge_id)
+{
+	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}

bin/game/compat_1.6.nut

@@ -5,4 +5,18 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.7 to 1.6. */
+GSLog.Info("1.6 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
+GSBridge.GetName <- function(bridge_id)
+{
+	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}

bin/game/compat_1.7.nut

@@ -5,4 +5,18 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.8 to 1.7. */
+GSLog.Info("1.7 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
+GSBridge.GetName <- function(bridge_id)
+{
+	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}

bin/game/compat_1.8.nut

@@ -5,10 +5,18 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.9 to 1.8. */
+GSLog.Info("1.8 API compatibility in effect.");
 
-GSBridge.GetNameCompat1_8 <- GSBridge.GetName;
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
 GSBridge.GetName <- function(bridge_id)
 {
-	return GSBridge.GetNameCompat1_8(bridge_id, GSVehicle.VT_RAIL);
+	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
 }

bin/game/compat_1.9.nut

@@ -5,4 +5,11 @@
  * 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/>.
  */
 
-/* This file contains code to downgrade the API from 1.10 to 1.9. */
+GSLog.Info("1.9 API compatibility in effect.");
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+	return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}

bin/game/compat_12.nut

@@ -1,20 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* This file contains code to downgrade the API from 13 to 12. */
-
-GSRoad.HasRoadTypeCompat12 <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad.HasRoadTypeCompat12(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_13.nut

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

bin/game/compat_14.nut

@@ -1,91 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* This file contains code to downgrade the API from 15 to 14. */
-
-GSBridge.GetBridgeID <- GSBridge.GetBridgeType;
-
-/* Emulate old GSText parameter padding behaviour */
-GSText.SCRIPT_TEXT_MAX_PARAMETERS <- 20;
-
-class GSCompat14 {
-	function Text(text)
-	{
-		if (typeof text == "string") return text;
-		if (typeof text == "instance" && text instanceof GSText) return text;
-		return null;
-	}
-}
-
-GSBaseStation.SetNameCompat14 <- GSBaseStation.SetName;
-GSBaseStation.SetName <- function(id, name) { return GSBaseStation.SetNameCompat14(id, GSCompat14.Text(name)); }
-
-GSCompany.SetNameCompat14 <- GSCompany.SetName;
-GSCompany.SetName <- function(name) { return GSCompany.SetNameCompat14(GSCompat14.Text(name)); }
-GSCompany.SetPresidentNameCompat14 <- GSCompany.SetPresidentName;
-GSCompany.SetPresidentName <- function(name) { return GSCompany.SetPresidentNameCompat14(GSCompat14.Text(name)); }
-
-GSGoal.NewCompat14 <- GSGoal.New;
-GSGoal.New <- function(company, goal, type, dest) { return GSGoal.NewCompat14(company, GSCompat14.Text(goal), type, dest); }
-GSGoal.SetTextCompat14 <- GSGoal.SetText;
-GSGoal.SetText <- function(id, goal) { return GSGoal.SetTextCompat14(id, GSCompat14.Text(goal)); }
-GSGoal.SetProgressCompat14 <- GSGoal.SetProgress;
-GSGoal.SetProgress <- function(id, progress) { return GSGoal.SetProgressCompat14(id, GSCompat14.Text(progress)); }
-GSGoal.QuestionCompat14 <- GSGoal.Question;
-GSGoal.Question <- function(id, company, question, type, buttons) { return GSGoal.QuestionCompat14(id, company, GSCompat14.Text(question), type, buttons); }
-GSGoal.QuestionClientCompat14 <- GSGoal.QuestionClient;
-GSGoal.QuestionClient <- function(id, target, is_client, question, type, buttons) { return GSGoal.QuestionClientCompat14(id, target, is_client, GSCompat14.Text(question), type, buttons); }
-
-GSGroup.SetNameCompat14 <- GSGroup.SetName;
-GSGroup.SetName <- function(id, name) { return GSGroup.SetNameCompat14(id, GSCompat14.Text(name)); }
-
-GSIndustry.SetTextCompat14 <- GSIndustry.SetText;
-GSIndustry.SetText <- function(id, text) { return GSIndustry.SetTextCompat14(id, GSCompat14.Text(text)); }
-GSIndustry.SetProductionLevelCompat14 <- GSIndustry.SetProductionLevel;
-GSIndustry.SetProductionLevel <- function(id, level, news, text) { return GSIndustry.SetProductionLevelCompat14(id, level, news, GSCompat14.Text(text)); }
-
-GSLeagueTable.NewCompat14 <- GSLeagueTable.New;
-GSLeagueTable.New <- function(title, header, footer) { return GSLeagueTable.NewCompat14(GSCompat14.Text(title), GSCompat14.Text(header), GSCompat14.Text(footer)); }
-GSLeagueTable.NewElementCompat14 <- GSLeagueTable.NewElement;
-GSLeagueTable.NewElement <- function(table, rating, company, text, score, type, target) { return GSLeagueTable.NewElementCompat14(table, rating, company, GSCompat14.Text(text), GSCompat14.Text(score), type, target); }
-GSLeagueTable.UpdateElementDataCompat14 <- GSLeagueTable.UpdateElementData;
-GSLeagueTable.UpdateElementData <- function(element, company, text, type, target) { return GSLeagueTable.UpdateElementDataCompat14(element, company, GSCompat14.Text(text), type, target); }
-GSLeagueTable.UpdateElementScoreCompat14 <- GSLeagueTable.UpdateElementScore;
-GSLeagueTable.UpdateElementScore <- function(element, rating, score) { return GSLeagueTable.UpdateElementScoreCompat14(element, rating, GSCompat14.Text(score)); }
-
-GSNews.CreateCompat14 <- GSNews.Create;
-GSNews.Create <- function(type, text, company, ref_type, ref) { return GSNews.CreateCompat14(type, GSCompat14.Text(text), company, ref_type, ref); }
-
-GSSign.BuildSignCompat14 <- GSSign.BuildSign;
-GSSign.BuildSign <- function(id, name) { return GSSign.BuildSignCompat14(id, GSCompat14.Text(name)); }
-
-GSStoryPage.NewCompat14 <- GSStoryPage.New;
-GSStoryPage.New <- function(company, title) { return GSStoryPage.NewCompat14(company, GSCompat14.Text(title)); }
-GSStoryPage.NewElementCompat14 <- GSStoryPage.NewElement;
-GSStoryPage.NewElement <- function(page, type, ref, text) { return GSStoryPage.NewElementCompat14(page, type, ref, GSCompat14.Text(text)); }
-GSStoryPage.UpdateElementCompat14 <- GSStoryPage.UpdateElement;
-GSStoryPage.UpdateElement <- function(id, ref, text) { return GSStoryPage.UpdateElementCompat14(id, ref, GSCompat14.Text(text)); }
-GSStoryPage.SetTitleCompat14 <- GSStoryPage.SetTitle;
-GSStoryPage.SetTitle <- function(page, tile) { return GSStoryPage.SetTitleCompat14(page, GSCompat14.Text(title)); }
-
-GSTown.SetNameCompat14 <- GSTown.SetName;
-GSTown.SetName <- function(id, name) { return GSTown.SetNameCompat14(id, GSCompat14.Text(name)); }
-GSTown.SetTextCompat14 <- GSTown.SetText;
-GSTown.SetText <- function(id, text) { return GSTown.SetTextCompat14(id, GSCompat14.Text(text)); }
-GSTown.FoundTownCompat14 <- GSTown.FoundTown;
-GSTown.FoundTown <- function(tile, size, city, layout, name) { return GSTown.FoundTownCompat14(tile, size, city, layout, GSCompat14.Text(name)); }
-
-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"); }
-}

cmake/3rdparty/llvm/CheckAtomic.cmake

@@ -1,99 +0,0 @@
-#
-# This was originally part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See (https://llvm.org/)LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#
-# Modifications have been made to suit building OpenTTD.
-#
-
-# atomic builtins are required for threading support.
-
-INCLUDE(CheckCXXSourceCompiles)
-INCLUDE(CheckLibraryExists)
-
-# Sometimes linking against libatomic is required for atomic ops, if
-# the platform doesn't support lock-free atomics.
-
-function(check_working_cxx_atomics varname)
-  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++17")
-  check_cxx_source_compiles("
-#include <atomic>
-std::atomic<int> x;
-std::atomic<short> y;
-std::atomic<char> z;
-int main() {
-  ++z;
-  ++y;
-  return ++x;
-}
-" ${varname})
-  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-endfunction(check_working_cxx_atomics)
-
-function(check_working_cxx_atomics64 varname)
-  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS "-std=c++17 ${CMAKE_REQUIRED_FLAGS}")
-  check_cxx_source_compiles("
-#include <atomic>
-#include <cstdint>
-std::atomic<uint64_t> x (0);
-int main() {
-  uint64_t i = x.load(std::memory_order_relaxed);
-  (void)i;
-  return 0;
-}
-" ${varname})
-  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-endfunction(check_working_cxx_atomics64)
-
-
-# Check for (non-64-bit) atomic operations.
-if(MSVC)
-  set(HAVE_CXX_ATOMICS_WITHOUT_LIB True)
-else()
-  # First check if atomics work without the library.
-  check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB)
-  # If not, check if the library exists, and atomics work with it.
-  if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
-    # check_library_exists requires the C-compiler as the atomic functions are built-in declared.
-    enable_language(C)
-    check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC)
-    if(HAVE_LIBATOMIC)
-      list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-      check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB)
-      if (NOT HAVE_CXX_ATOMICS_WITH_LIB)
-        message(FATAL_ERROR "Host compiler must support std::atomic!")
-      endif()
-    else()
-      message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
-    endif()
-  endif()
-endif()
-
-# Check for 64 bit atomic operations.
-if(MSVC)
-  set(HAVE_CXX_ATOMICS64_WITHOUT_LIB True)
-else()
-  # First check if atomics work without the library.
-  check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-  # If not, check if the library exists, and atomics work with it.
-  if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-    # check_library_exists requires the C-compiler as the atomic functions are built-in declared.
-    enable_language(C)
-    check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
-    if(HAVE_CXX_LIBATOMICS64)
-      list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-      check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
-      if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
-        message(FATAL_ERROR "Host compiler must support 64-bit std::atomic!")
-      endif()
-    else()
-      message(FATAL_ERROR "Host compiler appears to require libatomic for 64-bit operations, but cannot find it.")
-    endif()
-  endif()
-endif()
-
-if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
-  target_link_libraries(openttd_lib atomic)
-endif()

cmake/3rdparty/llvm/LICENSE.txt

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

cmake/Catch.cmake

@@ -1,206 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-Catch
------
-
-This module defines a function to help use the Catch test framework.
-
-The :command:`catch_discover_tests` discovers tests by asking the compiled test
-executable to enumerate its tests.  This does not require CMake to be re-run
-when tests change.  However, it may not work in a cross-compiling environment,
-and setting test properties is less convenient.
-
-This command is intended to replace use of :command:`add_test` to register
-tests, and will create a separate CTest test for each Catch test case.  Note
-that this is in some cases less efficient, as common set-up and tear-down logic
-cannot be shared by multiple test cases executing in the same instance.
-However, it provides more fine-grained pass/fail information to CTest, which is
-usually considered as more beneficial.  By default, the CTest test name is the
-same as the Catch name; see also ``TEST_PREFIX`` and ``TEST_SUFFIX``.
-
-.. command:: catch_discover_tests
-
-  Automatically add tests with CTest by querying the compiled test executable
-  for available tests::
-
-    catch_discover_tests(target
-                         [TEST_SPEC arg1...]
-                         [EXTRA_ARGS arg1...]
-                         [WORKING_DIRECTORY dir]
-                         [TEST_PREFIX prefix]
-                         [TEST_SUFFIX suffix]
-                         [PROPERTIES name1 value1...]
-                         [TEST_LIST var]
-                         [REPORTER reporter]
-                         [OUTPUT_DIR dir]
-                         [OUTPUT_PREFIX prefix}
-                         [OUTPUT_SUFFIX suffix]
-    )
-
-  ``catch_discover_tests`` sets up a post-build command on the test executable
-  that generates the list of tests by parsing the output from running the test
-  with the ``--list-test-names-only`` argument.  This ensures that the full
-  list of tests is obtained.  Since test discovery occurs at build time, it is
-  not necessary to re-run CMake when the list of tests changes.
-  However, it requires that :prop_tgt:`CROSSCOMPILING_EMULATOR` is properly set
-  in order to function in a cross-compiling environment.
-
-  Additionally, setting properties on tests is somewhat less convenient, since
-  the tests are not available at CMake time.  Additional test properties may be
-  assigned to the set of tests as a whole using the ``PROPERTIES`` option.  If
-  more fine-grained test control is needed, custom content may be provided
-  through an external CTest script using the :prop_dir:`TEST_INCLUDE_FILES`
-  directory property.  The set of discovered tests is made accessible to such a
-  script via the ``<target>_TESTS`` variable.
-
-  The options are:
-
-  ``target``
-    Specifies the Catch executable, which must be a known CMake executable
-    target.  CMake will substitute the location of the built executable when
-    running the test.
-
-  ``TEST_SPEC arg1...``
-    Specifies test cases, wildcarded test cases, tags and tag expressions to
-    pass to the Catch executable with the ``--list-test-names-only`` argument.
-
-  ``EXTRA_ARGS arg1...``
-    Any extra arguments to pass on the command line to each test case.
-
-  ``WORKING_DIRECTORY dir``
-    Specifies the directory in which to run the discovered test cases.  If this
-    option is not provided, the current binary directory is used.
-
-  ``TEST_PREFIX prefix``
-    Specifies a ``prefix`` to be prepended to the name of each discovered test
-    case.  This can be useful when the same test executable is being used in
-    multiple calls to ``catch_discover_tests()`` but with different
-    ``TEST_SPEC`` or ``EXTRA_ARGS``.
-
-  ``TEST_SUFFIX suffix``
-    Similar to ``TEST_PREFIX`` except the ``suffix`` is appended to the name of
-    every discovered test case.  Both ``TEST_PREFIX`` and ``TEST_SUFFIX`` may
-    be specified.
-
-  ``PROPERTIES name1 value1...``
-    Specifies additional properties to be set on all tests discovered by this
-    invocation of ``catch_discover_tests``.
-
-  ``TEST_LIST var``
-    Make the list of tests available in the variable ``var``, rather than the
-    default ``<target>_TESTS``.  This can be useful when the same test
-    executable is being used in multiple calls to ``catch_discover_tests()``.
-    Note that this variable is only available in CTest.
-
-  ``REPORTER reporter``
-    Use the specified reporter when running the test case. The reporter will
-    be passed to the Catch executable as ``--reporter reporter``.
-
-  ``OUTPUT_DIR dir``
-    If specified, the parameter is passed along as
-    ``--out dir/<test_name>`` to Catch executable. The actual file name is the
-    same as the test name. This should be used instead of
-    ``EXTRA_ARGS --out foo`` to avoid race conditions writing the result output
-    when using parallel test execution.
-
-  ``OUTPUT_PREFIX prefix``
-    May be used in conjunction with ``OUTPUT_DIR``.
-    If specified, ``prefix`` is added to each output file name, like so
-    ``--out dir/prefix<test_name>``.
-
-  ``OUTPUT_SUFFIX suffix``
-    May be used in conjunction with ``OUTPUT_DIR``.
-    If specified, ``suffix`` is added to each output file name, like so
-    ``--out dir/<test_name>suffix``. This can be used to add a file extension to
-    the output e.g. ".xml".
-
-#]=======================================================================]
-
-#------------------------------------------------------------------------------
-function(catch_discover_tests TARGET)
-  cmake_parse_arguments(
-    ""
-    ""
-    "TEST_PREFIX;TEST_SUFFIX;WORKING_DIRECTORY;TEST_LIST;REPORTER;OUTPUT_DIR;OUTPUT_PREFIX;OUTPUT_SUFFIX"
-    "TEST_SPEC;EXTRA_ARGS;PROPERTIES"
-    ${ARGN}
-  )
-
-  if(NOT _WORKING_DIRECTORY)
-    set(_WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  endif()
-  if(NOT _TEST_LIST)
-    set(_TEST_LIST ${TARGET}_TESTS)
-  endif()
-
-  ## Generate a unique name based on the extra arguments
-  string(SHA1 args_hash "${_TEST_SPEC} ${_EXTRA_ARGS} ${_REPORTER} ${_OUTPUT_DIR} ${_OUTPUT_PREFIX} ${_OUTPUT_SUFFIX}")
-  string(SUBSTRING ${args_hash} 0 7 args_hash)
-
-  # Define rule to generate test list for aforementioned test executable
-  set(ctest_include_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_include-${args_hash}.cmake")
-  set(ctest_tests_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_tests-${args_hash}.cmake")
-  get_property(crosscompiling_emulator
-    TARGET ${TARGET}
-    PROPERTY CROSSCOMPILING_EMULATOR
-  )
-  add_custom_command(
-    TARGET ${TARGET} POST_BUILD
-    BYPRODUCTS "${ctest_tests_file}"
-    COMMAND "${CMAKE_COMMAND}"
-            -D "TEST_TARGET=${TARGET}"
-            -D "TEST_EXECUTABLE=$<TARGET_FILE:${TARGET}>"
-            -D "TEST_EXECUTOR=${crosscompiling_emulator}"
-            -D "TEST_WORKING_DIR=${_WORKING_DIRECTORY}"
-            -D "TEST_SPEC=${_TEST_SPEC}"
-            -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}"
-            -D "TEST_PROPERTIES=${_PROPERTIES}"
-            -D "TEST_PREFIX=${_TEST_PREFIX}"
-            -D "TEST_SUFFIX=${_TEST_SUFFIX}"
-            -D "TEST_LIST=${_TEST_LIST}"
-            -D "TEST_REPORTER=${_REPORTER}"
-            -D "TEST_OUTPUT_DIR=${_OUTPUT_DIR}"
-            -D "TEST_OUTPUT_PREFIX=${_OUTPUT_PREFIX}"
-            -D "TEST_OUTPUT_SUFFIX=${_OUTPUT_SUFFIX}"
-            -D "CTEST_FILE=${ctest_tests_file}"
-            -P "${_CATCH_DISCOVER_TESTS_SCRIPT}"
-    VERBATIM
-  )
-
-  file(WRITE "${ctest_include_file}"
-    "if(EXISTS \"${ctest_tests_file}\")\n"
-    "  include(\"${ctest_tests_file}\")\n"
-    "else()\n"
-    "  add_test(${TARGET}_NOT_BUILT-${args_hash} ${TARGET}_NOT_BUILT-${args_hash})\n"
-    "endif()\n"
-  )
-
-  if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0")
-    # Add discovered tests to directory TEST_INCLUDE_FILES
-    set_property(DIRECTORY
-      APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
-    )
-  else()
-    # Add discovered tests as directory TEST_INCLUDE_FILE if possible
-    get_property(test_include_file_set DIRECTORY PROPERTY TEST_INCLUDE_FILE SET)
-    if (NOT ${test_include_file_set})
-      set_property(DIRECTORY
-        PROPERTY TEST_INCLUDE_FILE "${ctest_include_file}"
-      )
-    else()
-      message(FATAL_ERROR
-        "Cannot set more than one TEST_INCLUDE_FILE"
-      )
-    endif()
-  endif()
-
-endfunction()
-
-###############################################################################
-
-set(_CATCH_DISCOVER_TESTS_SCRIPT
-  ${CMAKE_CURRENT_LIST_DIR}/CatchAddTests.cmake
-  CACHE INTERNAL "Catch2 full path to CatchAddTests.cmake helper file"
-)

cmake/CatchAddTests.cmake

@@ -1,135 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-set(prefix "${TEST_PREFIX}")
-set(suffix "${TEST_SUFFIX}")
-set(spec ${TEST_SPEC})
-set(extra_args ${TEST_EXTRA_ARGS})
-set(properties ${TEST_PROPERTIES})
-set(reporter ${TEST_REPORTER})
-set(output_dir ${TEST_OUTPUT_DIR})
-set(output_prefix ${TEST_OUTPUT_PREFIX})
-set(output_suffix ${TEST_OUTPUT_SUFFIX})
-set(script)
-set(suite)
-set(tests)
-
-function(add_command NAME)
-  set(_args "")
-  # use ARGV* instead of ARGN, because ARGN splits arrays into multiple arguments
-  math(EXPR _last_arg ${ARGC}-1)
-  foreach(_n RANGE 1 ${_last_arg})
-    set(_arg "${ARGV${_n}}")
-    if(_arg MATCHES "[^-./:a-zA-Z0-9_]")
-      set(_args "${_args} [==[${_arg}]==]") # form a bracket_argument
-    else()
-      set(_args "${_args} ${_arg}")
-    endif()
-  endforeach()
-  set(script "${script}${NAME}(${_args})\n" PARENT_SCOPE)
-endfunction()
-
-# Run test executable to get list of available tests
-if(NOT EXISTS "${TEST_EXECUTABLE}")
-  message(FATAL_ERROR
-    "Specified test executable '${TEST_EXECUTABLE}' does not exist"
-  )
-endif()
-execute_process(
-  COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-test-names-only
-  OUTPUT_VARIABLE output
-  RESULT_VARIABLE result
-  WORKING_DIRECTORY "${TEST_WORKING_DIR}"
-)
-# Catch --list-test-names-only reports the number of tests, so 0 is... surprising
-if(${result} EQUAL 0)
-  message(WARNING
-    "Test executable '${TEST_EXECUTABLE}' contains no tests!\n"
-  )
-elseif(${result} LESS 0)
-  message(FATAL_ERROR
-    "Error running test executable '${TEST_EXECUTABLE}':\n"
-    "  Result: ${result}\n"
-    "  Output: ${output}\n"
-  )
-endif()
-
-string(REPLACE "\n" ";" output "${output}")
-
-# Run test executable to get list of available reporters
-execute_process(
-  COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-reporters
-  OUTPUT_VARIABLE reporters_output
-  RESULT_VARIABLE reporters_result
-  WORKING_DIRECTORY "${TEST_WORKING_DIR}"
-)
-if(${reporters_result} EQUAL 0)
-  message(WARNING
-    "Test executable '${TEST_EXECUTABLE}' contains no reporters!\n"
-  )
-elseif(${reporters_result} LESS 0)
-  message(FATAL_ERROR
-    "Error running test executable '${TEST_EXECUTABLE}':\n"
-    "  Result: ${reporters_result}\n"
-    "  Output: ${reporters_output}\n"
-  )
-endif()
-string(FIND "${reporters_output}" "${reporter}" reporter_is_valid)
-if(reporter AND ${reporter_is_valid} EQUAL -1)
-  message(FATAL_ERROR
-    "\"${reporter}\" is not a valid reporter!\n"
-  )
-endif()
-
-# Prepare reporter
-if(reporter)
-  set(reporter_arg "--reporter ${reporter}")
-endif()
-
-# Prepare output dir
-if(output_dir AND NOT IS_ABSOLUTE ${output_dir})
-  set(output_dir "${TEST_WORKING_DIR}/${output_dir}")
-  if(NOT EXISTS ${output_dir})
-    file(MAKE_DIRECTORY ${output_dir})
-  endif()
-endif()
-
-# Parse output
-foreach(line ${output})
-  set(test ${line})
-  # Escape characters in test case names that would be parsed by Catch2
-  set(test_name ${test})
-  foreach(char , [ ])
-    string(REPLACE ${char} "\\${char}" test_name ${test_name})
-  endforeach(char)
-  # ...add output dir
-  if(output_dir)
-    string(REGEX REPLACE "[^A-Za-z0-9_]" "_" test_name_clean ${test_name})
-    set(output_dir_arg "--out ${output_dir}/${output_prefix}${test_name_clean}${output_suffix}")
-  endif()
-
-  # ...and add to script
-  add_command(add_test
-    "${prefix}${test}${suffix}"
-    ${TEST_EXECUTOR}
-    "${TEST_EXECUTABLE}"
-    "${test_name}"
-    ${extra_args}
-    "${reporter_arg}"
-    "${output_dir_arg}"
-  )
-  add_command(set_tests_properties
-    "${prefix}${test}${suffix}"
-    PROPERTIES
-    WORKING_DIRECTORY "${TEST_WORKING_DIR}"
-    ${properties}
-  )
-  list(APPEND tests "${prefix}${test}${suffix}")
-endforeach()
-
-# Create a list of all discovered tests, which users may use to e.g. set
-# properties on the tests
-add_command(set ${TEST_LIST} ${tests})
-
-# Write CTest script
-file(WRITE "${CTEST_FILE}" "${script}")

cmake/CompileFlags.cmake

@@ -4,26 +4,33 @@
 #
 macro(compile_flags)
     if(MSVC)
+        if(VCPKG_TARGET_TRIPLET MATCHES "-static" AND NOT VCPKG_TARGET_TRIPLET MATCHES "-md")
+            # Switch to MT (static) instead of MD (dynamic) binary
+
+            # For MSVC two generators are available
+            # - a command line generator (Ninja) using CMAKE_BUILD_TYPE to specify the
+            #   configuration of the build tree
+            # - an IDE generator (Visual Studio) using CMAKE_CONFIGURATION_TYPES to
+            #   specify all configurations that will be available in the generated solution
+            list(APPEND MSVC_CONFIGS "${CMAKE_BUILD_TYPE}" "${CMAKE_CONFIGURATION_TYPES}")
+
+            # Set usage of static runtime for all configurations
+            foreach(MSVC_CONFIG ${MSVC_CONFIGS})
+                string(TOUPPER "CMAKE_CXX_FLAGS_${MSVC_CONFIG}" MSVC_FLAGS)
+                string(REPLACE "/MD" "/MT" ${MSVC_FLAGS} "${${MSVC_FLAGS}}")
+            endforeach()
+        endif()
+
         # "If /Zc:rvalueCast is specified, the compiler follows section 5.4 of the
         # C++11 standard". We need C++11 for the way we use threads.
         add_compile_options(/Zc:rvalueCast)
 
         if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-            add_compile_options(
-                /Zc:preprocessor # Needed for __VA_OPT__() in macros.
-                /MP # Enable multi-threaded compilation.
-                /FC # Display the full path of source code files passed to the compiler in diagnostics.
-            )
+            # Enable multi-threaded compilation.
+            add_compile_options(/MP)
         endif()
     endif()
 
-    # Our strings are UTF-8.
-    if(MSVC)
-        add_compile_options(/utf-8)
-    else()
-        add_compile_options(-finput-charset=utf-8)
-    endif()
-
     # Add some -D flags for Debug builds. We cannot use add_definitions(), because
     # it does not appear to support the $<> tags.
     add_compile_options(
@@ -34,11 +41,6 @@ macro(compile_flags)
         add_link_options(
             "$<$<NOT:$<CONFIG:Debug>>:-fstack-protector>" # Prevent undefined references when _FORTIFY_SOURCE > 0
         )
-        if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-            add_compile_options(
-                "$<$<CONFIG:Debug>:-Wa,-mbig-obj>" # Switch to pe-bigobj-x86-64 as x64 Debug builds push pe-x86-64 to the limits (linking errors with ASLR, ...)
-            )
-        endif()
     endif()
 
     # Prepare a generator that checks if we are not a debug, and don't have asserts
@@ -46,21 +48,7 @@ macro(compile_flags)
     set(IS_STABLE_RELEASE "$<AND:$<NOT:$<CONFIG:Debug>>,$<NOT:$<BOOL:${OPTION_USE_ASSERTS}>>>")
 
     if(MSVC)
-        add_compile_options(
-            /W3
-            /w34100 # 'identifier' : unreferenced formal parameter
-            /w34189 # 'identifier' : local variable is initialized but not referenced
-        )
-        if(MSVC_VERSION GREATER 1929 AND MSVC_VERSION LESS 1937 AND CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            # Starting with version 19.30 (fixed in version 19.37), there is an optimisation bug, see #9966 for details
-            # This flag disables the broken optimisation to work around the bug
-            add_compile_options(/d2ssa-rse-)
-        endif()
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-            add_compile_options(
-                -Wno-multichar
-            )
-        endif()
+        add_compile_options(/W3)
     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
         add_compile_options(
             -W
@@ -76,16 +64,35 @@ macro(compile_flags)
             -Wformat=2
             -Winit-self
             -Wnon-virtual-dtor
-            -Wsuggest-override
 
+            # Often parameters are unused, which is fine.
+            -Wno-unused-parameter
             # We use 'ABCD' multichar for SaveLoad chunks identifiers
             -Wno-multichar
 
-            # Prevent optimisation supposing enums are in a range specified by the standard
-            # For details, see http://gcc.gnu.org/PR43680 and PR#5246.
-            -fno-strict-enums
+            # Compilers complains about that we break strict-aliasing.
+            #  On most places we don't see how to fix it, and it doesn't
+            #  break anything. So disable strict-aliasing to make the
+            #  compiler all happy.
+            -fno-strict-aliasing
         )
 
+        # When we are a stable release (Release build + USE_ASSERTS not set),
+        # assertations are off, which trigger a lot of warnings. We disable
+        # these warnings for these releases.
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+            add_compile_options(
+                "$<${IS_STABLE_RELEASE}:-Wno-unused-variable>"
+                "$<${IS_STABLE_RELEASE}:-Wno-unused-but-set-parameter>"
+                "$<${IS_STABLE_RELEASE}:-Wno-unused-but-set-variable>"
+            )
+        else()
+            add_compile_options(
+                "$<${IS_STABLE_RELEASE}:-Wno-unused-variable>"
+                "$<${IS_STABLE_RELEASE}:-Wno-unused-parameter>"
+            )
+        endif()
+
         # Ninja processes the output so the output from the compiler
         # isn't directly to a terminal; hence, the default is
         # non-coloured output. We can override this to get nicely
@@ -110,13 +117,13 @@ macro(compile_flags)
                 # about its own optimized code in some places.
                 "-fno-strict-overflow"
 
+                # Prevent optimisation supposing enums are in a range specified by the standard
+                # For details, see http://gcc.gnu.org/PR43680
+                "-fno-tree-vrp"
+
                 # -flifetime-dse=2 (default since GCC 6) doesn't play
                 # well with our custom pool item allocator
                 "$<$<BOOL:${LIFETIME_DSE_FOUND}>:-flifetime-dse=1>"
-
-                # We have a fight between clang wanting std::move() and gcc not wanting it
-                # and of course they both warn when the other compiler is happy
-                "-Wno-redundant-move"
             )
         endif()
 
@@ -149,7 +156,7 @@ macro(compile_flags)
         message(FATAL_ERROR "No warning flags are set for this compiler yet; please consider creating a Pull Request to add support for this compiler.")
     endif()
 
-    if(NOT WIN32 AND NOT HAIKU)
+    if(NOT WIN32)
         # rdynamic is used to get useful stack traces from crash reports.
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
     endif()

cmake/CreateGrfCommand.cmake

@@ -1,13 +1,16 @@
 # Macro which contains all bits and pieces to create a single grf file based
 # on NFO and PNG files.
 #
-# create_grf_command(NFO_SOURCE_FILES nfo_file1 ... PNG_SOURCE_FILES png_file1 ...)
+# create_grf_command()
 #
 function(create_grf_command)
-    cmake_parse_arguments(GRF "" "" "NFO_SOURCE_FILES;PNG_SOURCE_FILES" ${ARGN})
+    set(EXTRA_PNG_SOURCE_FILES ${ARGV})
 
     get_filename_component(GRF_SOURCE_FOLDER_NAME "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
     get_filename_component(GRF_BINARY_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../${GRF_SOURCE_FOLDER_NAME}.grf ABSOLUTE)
+    file(GLOB_RECURSE GRF_PNG_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.png)
+    file(GLOB_RECURSE GRF_NFO_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.nfo)
+    set(GRF_PNG_SOURCE_FILES ${GRF_PNG_SOURCE_FILES} ${EXTRA_PNG_SOURCE_FILES})
 
     # Copy over all the PNG files to the correct folder
     foreach(GRF_PNG_SOURCE_FILE IN LISTS GRF_PNG_SOURCE_FILES)
@@ -25,13 +28,12 @@ function(create_grf_command)
         list(APPEND GRF_PNG_BINARY_FILES ${GRF_PNG_BINARY_FILE})
     endforeach()
 
-    add_custom_command(OUTPUT ${GRF_BINARY_FILE} ${GRF_BINARY_FILE}.hash
+    add_custom_command(OUTPUT ${GRF_BINARY_FILE}
             COMMAND ${CMAKE_COMMAND}
                     -DGRF_SOURCE_FOLDER=${CMAKE_CURRENT_SOURCE_DIR}
                     -DGRF_BINARY_FILE=${GRF_BINARY_FILE}
                     -DNFORENUM_EXECUTABLE=${NFORENUM_EXECUTABLE}
                     -DGRFCODEC_EXECUTABLE=${GRFCODEC_EXECUTABLE}
-                    -DGRFID_EXECUTABLE=${GRFID_EXECUTABLE}
                     -P ${CMAKE_SOURCE_DIR}/cmake/scripts/CreateGRF.cmake
             MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/cmake/scripts/CreateGRF.cmake
             DEPENDS ${GRF_PNG_BINARY_FILES}

cmake/CreateRegression.cmake

@@ -3,15 +3,20 @@
 # 'ctest'. The first is prefered, as it is more verbose, and takes care of
 # dependencies correctly.
 #
-# create_regression(file1 ...)
+# create_regression()
 #
 macro(create_regression)
-    set(REGRESSION_SOURCE_FILES ${ARGN})
-
+    # Find all the files in the regression folder; they need to be copied to the
+    # build folder before we can run the regression
+    file(GLOB_RECURSE REGRESSION_SOURCE_FILES ${CMAKE_SOURCE_DIR}/regression/*)
     foreach(REGRESSION_SOURCE_FILE IN LISTS REGRESSION_SOURCE_FILES)
         string(REPLACE "${CMAKE_SOURCE_DIR}/regression/" "" REGRESSION_SOURCE_FILE_NAME "${REGRESSION_SOURCE_FILE}")
         string(CONCAT REGRESSION_BINARY_FILE "${CMAKE_BINARY_DIR}/ai/" "${REGRESSION_SOURCE_FILE_NAME}")
 
+        if("${REGRESSION_SOURCE_FILE_NAME}" STREQUAL "regression.cfg")
+            continue()
+        endif()
+
         add_custom_command(OUTPUT ${REGRESSION_BINARY_FILE}
                 COMMAND ${CMAKE_COMMAND} -E copy
                         ${REGRESSION_SOURCE_FILE}
@@ -23,36 +28,59 @@ macro(create_regression)
         list(APPEND REGRESSION_BINARY_FILES ${REGRESSION_BINARY_FILE})
     endforeach()
 
-    get_filename_component(REGRESSION_TEST_NAME "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
+    # Copy the regression configuration in a special folder, so all autogenerated
+    # folders end up in the same place after running regression.
+    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/regression/regression.cfg
+            COMMAND ${CMAKE_COMMAND} -E copy
+                    ${CMAKE_SOURCE_DIR}/regression/regression.cfg
+                    ${CMAKE_BINARY_DIR}/regression/regression.cfg
+            MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/regression/regression.cfg
+            COMMENT "Copying ${REGRESSION_SOURCE_FILE_NAME} regression file"
+    )
+    list(APPEND REGRESSION_BINARY_FILES ${CMAKE_BINARY_DIR}/regression/regression.cfg)
 
-    # Create a new target which copies regression files
-    add_custom_target(regression_${REGRESSION_TEST_NAME}_files
+    # Create a new target which copies all regression files
+    add_custom_target(regression_files
+            ALL  # this is needed because 'make test' doesn't resolve dependencies, and otherwise this is never executed
             DEPENDS
             ${REGRESSION_BINARY_FILES}
     )
 
-    add_dependencies(regression_files regression_${REGRESSION_TEST_NAME}_files)
+    enable_testing()
 
-    add_custom_target(regression_${REGRESSION_TEST_NAME}
-            COMMAND ${CMAKE_COMMAND}
-                    -DOPENTTD_EXECUTABLE=$<TARGET_FILE:openttd>
-                    -DEDITBIN_EXECUTABLE=${EDITBIN_EXECUTABLE}
-                    -DREGRESSION_TEST=${REGRESSION_TEST_NAME}
-                    -P "${CMAKE_SOURCE_DIR}/cmake/scripts/Regression.cmake"
-            DEPENDS openttd regression_${REGRESSION_TEST_NAME}_files
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-            COMMENT "Running regression test ${REGRESSION_TEST_NAME}"
-    )
+    # Find all the tests we have, and create a target for them
+    file(GLOB REGRESSION_TESTS ${CMAKE_SOURCE_DIR}/regression/*)
+    foreach(REGRESSION_TEST IN LISTS REGRESSION_TESTS)
+        get_filename_component(REGRESSION_TEST_NAME "${REGRESSION_TEST}" NAME)
 
-    # Also make sure that 'make test' runs the regression
-    add_test(NAME regression_${REGRESSION_TEST_NAME}
-            COMMAND ${CMAKE_COMMAND}
-                    -DOPENTTD_EXECUTABLE=$<TARGET_FILE:openttd>
-                    -DEDITBIN_EXECUTABLE=${EDITBIN_EXECUTABLE}
-                    -DREGRESSION_TEST=${REGRESSION_TEST_NAME}
-                    -P "${CMAKE_SOURCE_DIR}/cmake/scripts/Regression.cmake"
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    )
+        if("${REGRESSION_TEST_NAME}" STREQUAL "regression.cfg")
+            continue()
+        endif()
 
-    add_dependencies(regression regression_${REGRESSION_TEST_NAME})
+        add_custom_target(regression_${REGRESSION_TEST_NAME}
+                COMMAND ${CMAKE_COMMAND}
+                        -DOPENTTD_EXECUTABLE=$<TARGET_FILE:openttd>
+                        -DEDITBIN_EXECUTABLE=${EDITBIN_EXECUTABLE}
+                        -DREGRESSION_TEST=${REGRESSION_TEST_NAME}
+                        -P "${CMAKE_SOURCE_DIR}/cmake/scripts/Regression.cmake"
+                DEPENDS openttd regression_files
+                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+                COMMENT "Running regression test ${REGRESSION_TEST_NAME}"
+                )
+
+        # Also make sure that 'make test' runs the regression
+        add_test(NAME regression_${REGRESSION_TEST_NAME}
+                COMMAND ${CMAKE_COMMAND}
+                        -DOPENTTD_EXECUTABLE=$<TARGET_FILE:openttd>
+                        -DEDITBIN_EXECUTABLE=${EDITBIN_EXECUTABLE}
+                        -DREGRESSION_TEST=${REGRESSION_TEST_NAME}
+                        -P "${CMAKE_SOURCE_DIR}/cmake/scripts/Regression.cmake"
+                WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+
+        list(APPEND REGRESSION_TARGETS regression_${REGRESSION_TEST_NAME})
+    endforeach()
+
+    # Create a new target which runs the regression
+    add_custom_target(regression
+            DEPENDS ${REGRESSION_TARGETS})
 endmacro()

cmake/Endian.cmake

@@ -0,0 +1,14 @@
+# Add the definitions to indicate which endian we are building for.
+#
+# add_endian_definition()
+#
+function(add_endian_definition)
+    include(TestBigEndian)
+    TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
+
+    if(IS_BIG_ENDIAN)
+        add_definitions(-DTTD_ENDIAN=TTD_BIG_ENDIAN)
+    else()
+        add_definitions(-DTTD_ENDIAN=TTD_LITTLE_ENDIAN)
+    endif()
+endfunction()

cmake/FindGrfcodec.cmake

@@ -2,7 +2,6 @@
 #
 
 find_program(GRFCODEC_EXECUTABLE grfcodec)
-find_program(GRFID_EXECUTABLE grfid)
 find_program(NFORENUM_EXECUTABLE nforenum)
 
 include(FindPackageHandleStandardArgs)
@@ -10,6 +9,5 @@ find_package_handle_standard_args(Grfcodec
     FOUND_VAR GRFCODEC_FOUND
     REQUIRED_VARS
         GRFCODEC_EXECUTABLE
-        GRFID_EXECUTABLE
         NFORENUM_EXECUTABLE
 )

cmake/FindHarfbuzz.cmake

@@ -1,65 +0,0 @@
-#[=======================================================================[.rst:
-FindHarfBuzz
--------
-
-Finds the harfbuzz library.
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This will define the following variables:
-
-``Harfbuzz_FOUND``
-  True if the system has the harfbuzz library.
-``Harfbuzz_INCLUDE_DIRS``
-  Include directories needed to use harfbuzz.
-``Harfbuzz_LIBRARIES``
-  Libraries needed to link to harfbuzz.
-``Harfbuzz_VERSION``
-  The version of the harfbuzz library which was found.
-
-Cache Variables
-^^^^^^^^^^^^^^^
-
-The following cache variables may also be set:
-
-``Harfbuzz_INCLUDE_DIR``
-  The directory containing ``hb.h``.
-``Harfbuzz_LIBRARY``
-  The path to the harfbuzz library.
-
-#]=======================================================================]
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Harfbuzz QUIET harfbuzz)
-
-find_path(Harfbuzz_INCLUDE_DIR
-    NAMES hb.h
-    PATHS ${PC_Harfbuzz_INCLUDE_DIRS}
-)
-
-find_library(Harfbuzz_LIBRARY
-    NAMES harfbuzz
-    PATHS ${PC_Harfbuzz_LIBRARY_DIRS}
-)
-
-set(Harfbuzz_VERSION ${PC_Harfbuzz_VERSION})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Harfbuzz
-    FOUND_VAR Harfbuzz_FOUND
-    REQUIRED_VARS
-        Harfbuzz_LIBRARY
-        Harfbuzz_INCLUDE_DIR
-    VERSION_VAR Harfbuzz_VERSION
-)
-
-if(Harfbuzz_FOUND)
-    set(Harfbuzz_LIBRARIES ${Harfbuzz_LIBRARY})
-    set(Harfbuzz_INCLUDE_DIRS ${Harfbuzz_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(
-    Harfbuzz_INCLUDE_DIR
-    Harfbuzz_LIBRARY
-)

cmake/FindICU.cmake

@@ -9,7 +9,7 @@ FindICU
 
 Finds components of the ICU library.
 
-Accepted components are: uc, i18n, le, lx, io, data
+Accepted components are: uc, i18n, le, lx, io
 
 Result Variables
 ^^^^^^^^^^^^^^^^
@@ -31,7 +31,7 @@ This will define the following variables:
 
 find_package(PkgConfig QUIET)
 
-set(ICU_KNOWN_COMPONENTS "uc" "i18n" "le" "lx" "io" "data")
+set(ICU_KNOWN_COMPONENTS "uc" "i18n" "le" "lx" "io")
 
 foreach(MOD_NAME IN LISTS ICU_FIND_COMPONENTS)
     if(NOT MOD_NAME IN_LIST ICU_KNOWN_COMPONENTS)

cmake/FindLZO.cmake

@@ -43,8 +43,29 @@ find_library(LZO_LIBRARY
     PATHS ${PC_LZO_LIBRARY_DIRS}
 )
 
-include(FixVcpkgLibrary)
-FixVcpkgLibrary(LZO)
+# With vcpkg, the library path should contain both 'debug' and 'optimized'
+# entries (see target_link_libraries() documentation for more information)
+#
+# NOTE: we only patch up when using vcpkg; the same issue might happen
+# when not using vcpkg, but this is non-trivial to fix, as we have no idea
+# what the paths are. With vcpkg we do. And we only official support vcpkg
+# with Windows.
+#
+# NOTE: this is based on the assumption that the debug file has the same
+# name as the optimized file. This is not always the case, but so far
+# experiences has shown that in those case vcpkg CMake files do the right
+# thing.
+if(VCPKG_TOOLCHAIN AND LZO_LIBRARY)
+    if(LZO_LIBRARY MATCHES "/debug/")
+        set(LZO_LIBRARY_DEBUG ${LZO_LIBRARY})
+        string(REPLACE "/debug/lib/" "/lib/" LZO_LIBRARY_RELEASE ${LZO_LIBRARY})
+    else()
+        set(LZO_LIBRARY_RELEASE ${LZO_LIBRARY})
+        string(REPLACE "/lib/" "/debug/lib/" LZO_LIBRARY_DEBUG ${LZO_LIBRARY})
+    endif()
+    include(SelectLibraryConfigurations)
+    select_library_configurations(LZO)
+endif()
 
 set(LZO_VERSION ${PC_LZO_VERSION})
 

cmake/FindOgg.cmake

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

cmake/FindOpus.cmake

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

cmake/FindOpusFile.cmake

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

cmake/FindSSE.cmake

@@ -2,7 +2,6 @@
 # SSE version (SSE 2.0, SSSE 3.0).
 
 include(CheckCXXSourceCompiles)
-set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
 set(CMAKE_REQUIRED_FLAGS "")
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
@@ -16,5 +15,3 @@ check_cxx_source_compiles("
     int main() { return 0; }"
     SSE_FOUND
 )
-
-set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})

cmake/FindXaudio2.cmake

@@ -1,7 +1,6 @@
 # Autodetect if xaudio2 can be used.
 
 include(CheckCXXSourceCompiles)
-set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
 set(CMAKE_REQUIRED_FLAGS "")
 
 check_cxx_source_compiles("
@@ -18,5 +17,3 @@ check_cxx_source_compiles("
     int main() { printf(\"%s\\\\n\", XAUDIO2_DLL_A); return 0; }"
     XAUDIO2_FOUND
 )
-
-set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})

cmake/FixVcpkgLibrary.cmake

@@ -1,40 +0,0 @@
-macro(FixVcpkgLibrary NAME)
-    # With vcpkg, the library path should contain both 'debug' and 'optimized'
-    # entries (see target_link_libraries() documentation for more information)
-    #
-    # NOTE: we only patch up when using vcpkg; the same issue might happen
-    # when not using vcpkg, but this is non-trivial to fix, as we have no idea
-    # what the paths are. With vcpkg we do. And we only official support vcpkg
-    # with Windows.
-    #
-    # NOTE: this is based on the assumption that the debug file has the same
-    # name as the optimized file. This is not always the case, but so far
-    # experiences has shown that in those case vcpkg CMake files do the right
-    # thing.
-    if(VCPKG_TOOLCHAIN AND ${NAME}_LIBRARY AND ${NAME}_LIBRARY MATCHES "${VCPKG_INSTALLED_DIR}")
-        if(${NAME}_LIBRARY MATCHES "/debug/")
-            set(${NAME}_LIBRARY_DEBUG ${${NAME}_LIBRARY})
-            string(REPLACE "/debug/lib/" "/lib/" ${NAME}_LIBRARY_RELEASE ${${NAME}_LIBRARY})
-        else()
-            set(${NAME}_LIBRARY_RELEASE ${${NAME}_LIBRARY})
-            string(REPLACE "/lib/" "/debug/lib/" ${NAME}_LIBRARY_DEBUG ${${NAME}_LIBRARY})
-        endif()
-        include(SelectLibraryConfigurations)
-        select_library_configurations(${NAME})
-    endif()
-endmacro()
-
-function(FixVcpkgTarget NAME TARGET)
-    if(EXISTS "${${NAME}_LIBRARY_RELEASE}")
-        set_property(TARGET ${TARGET} APPEND PROPERTY
-        IMPORTED_CONFIGURATIONS RELEASE)
-        set_target_properties(${TARGET} PROPERTIES
-        IMPORTED_LOCATION_RELEASE "${${NAME}_LIBRARY_RELEASE}")
-    endif()
-    if(EXISTS "${${NAME}_LIBRARY_DEBUG}")
-        set_property(TARGET ${TARGET} APPEND PROPERTY
-        IMPORTED_CONFIGURATIONS DEBUG)
-        set_target_properties(${TARGET} PROPERTIES
-        IMPORTED_LOCATION_DEBUG "${${NAME}_LIBRARY_DEBUG}")
-    endif()
-endfunction()