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,9 +8,8 @@ notifications:
     only:
     - master
     only-by:
-    - eints-sync\[bot\]
+    - DorpsGek
   commit-comment:
-  discussion:
   pull-request:
   issue:
   tag-created:

.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

@@ -39,10 +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.sh

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

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

.github/windowdesc-ini-key.py

@@ -1,50 +0,0 @@
-"""
-Script to scan the OpenTTD source-tree for ini_key issues in WindowDesc entries.
-"""
-
-import glob
-import os
-import re
-import sys
-
-
-def scan_source_files(path, ini_keys=None):
-    if ini_keys is None:
-        ini_keys = set()
-
-    errors = []
-
-    for new_path in glob.glob(f"{path}/*.cpp"):
-        if os.path.isdir(new_path):
-            errors.append(scan_source_files(new_path, ini_keys))
-            continue
-
-        with open(new_path) as fp:
-            output = fp.read()
-
-        for (name, ini_key, widgets) in re.findall(r"^static WindowDesc ([a-zA-Z0-9_]*).*?, (?:\"(.*?)\")?.*?,(?:\s+.*?,){6}\s+[^\s]+\((.*?)\)", output, re.S|re.M):
-            if ini_key:
-                if ini_key in ini_keys:
-                    errors.append(f"{new_path}: {name} ini_key is a duplicate")
-                ini_keys.add(ini_key)
-            widget = re.findall("static const (?:struct )?NWidgetPart " + widgets + ".*?(?:WWT_(DEFSIZE|STICKY)BOX.*?)?;", output, re.S)[0]
-            if widget and not ini_key:
-                errors.append(f"{new_path}: {name} has WWT_DEFSIZEBOX/WWT_STICKYBOX without ini_key")
-            if ini_key and not widget:
-                errors.append(f"{new_path}: {name} has ini_key without WWT_DEFSIZEBOX/WWT_STICKYBOX")
-
-    return errors
-
-
-def main():
-    errors = scan_source_files("src")
-
-    if errors:
-        print("\n".join(errors))
-        sys.exit(1)
-
-    print("OK")
-
-
-if __name__ == "__main__":
-    main()

.github/workflows/ci-build.yml

@@ -9,10 +9,6 @@ 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
@@ -20,23 +16,17 @@ jobs:
     runs-on: ubuntu-20.04
     container:
       # If you change this version, change the number in the cache step too.
-      image: emscripten/emsdk:3.1.42
+      image: emscripten/emsdk:2.0.10
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
 
     - name: Setup cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: /emsdk/upstream/emscripten/cache
-        key: 3.1.42-${{ runner.os }}
-
-    - name: Patch Emscripten to support LZMA and nlohmann-json
-      run: |
-        cd /emsdk/upstream/emscripten
-        patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch
-        patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-nlohmann-json.patch
+        key: 2.0.10-${{ runner.os }}
 
     - name: Build (host tools)
       run: |
@@ -66,33 +56,28 @@ jobs:
 
         echo "::group::Build"
         echo "Running on $(nproc) cores"
-        cmake --build . -j $(nproc) --target openttd
+        cmake --build . -j $(nproc)
         echo "::endgroup::"
 
   linux:
+    name: Linux
+
     strategy:
       fail-fast: false
       matrix:
         include:
-        - name: Clang
-          compiler: clang
+        - compiler: clang
           cxxcompiler: clang++
-          libraries: libsdl2-dev
-        - name: GCC - SDL2
-          compiler: gcc
+          libsdl: libsdl2-dev
+        - compiler: gcc
           cxxcompiler: g++
-          libraries: libsdl2-dev
-        - name: GCC - SDL1.2
-          compiler: gcc
+          libsdl: libsdl2-dev
+        - compiler: gcc
           cxxcompiler: g++
-          libraries: libsdl1.2-dev
-        - name: GCC - Dedicated
-          compiler: gcc
+          libsdl: libsdl1.2-dev
+        - compiler: gcc
           cxxcompiler: g++
-          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 }})
+          extra-cmake-parameters: -DOPTION_DEDICATED=ON
 
     runs-on: ubuntu-20.04
     env:
@@ -101,7 +86,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
 
     - name: Install dependencies
       run: |
@@ -112,20 +97,13 @@ jobs:
         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 \
-          nlohmann-json3-dev \
-          ${{ matrix.libraries }} \
+          ${{ matrix.libsdl }} \
           zlib1g-dev \
           # EOF
-
-        sudo vcpkg install \
-          breakpad \
-          # EOF
         echo "::endgroup::"
       env:
         DEBIAN_FRONTEND: noninteractive
@@ -154,7 +132,7 @@ jobs:
         cd build
 
         echo "::group::CMake"
-        cmake .. -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ matrix.extra-cmake-parameters }}
+        cmake .. ${{ matrix.extra-cmake-parameters }}
         echo "::endgroup::"
 
         echo "::group::Build"
@@ -168,6 +146,8 @@ jobs:
         ctest -j $(nproc) --timeout 120
 
   macos:
+    name: Mac OS
+
     strategy:
       fail-fast: false
       matrix:
@@ -175,54 +155,40 @@ jobs:
         - arch: x64
           full_arch: x86_64
 
-    name: Mac OS (${{ matrix.arch }})
-
     runs-on: macos-latest
     env:
-      MACOSX_DEPLOYMENT_TARGET: 10.13
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Install dependencies
-      env:
-        HOMEBREW_NO_AUTO_UPDATE: 1
-        HOMEBREW_NO_INSTALL_CLEANUP: 1
-      run: |
-        brew install \
-          pkg-config \
-          # EOF
+      uses: actions/checkout@v2
 
     - name: Prepare cache key
       id: key
       run: |
-        echo "image=$ImageOS-$ImageVersion" >> $GITHUB_OUTPUT
+        echo "::set-output name=image::$ImageOS-$ImageVersion"
 
     - name: Enable vcpkg cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: /usr/local/share/vcpkg/installed
-        key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-1 # Increase the number whenever dependencies are modified
+        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 \
-          breakpad \
-          curl \
           liblzma \
           libpng \
           lzo \
-          nlohmann-json \
           zlib \
           # EOF
 
     - name: Install OpenGFX
       run: |
         mkdir -p ~/Documents/OpenTTD/baseset
-        cd ~/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
@@ -243,7 +209,7 @@ jobs:
         cd build
 
         echo "::group::CMake"
-        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 \
@@ -261,19 +227,19 @@ jobs:
         ctest -j $(sysctl -n hw.logicalcpu) --timeout 120
 
   windows:
+    name: Windows
+
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, windows-2019]
+        os: [windows-latest, windows-2016]
         arch: [x86, x64]
 
-    name: Windows (${{ matrix.os }} / ${{ matrix.arch }})
-
     runs-on: ${{ matrix.os }}
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
 
     - name: Prepare cache key
       id: key
@@ -282,13 +248,13 @@ jobs:
         # Work around caching failure with GNU tar
         New-Item -Type Junction -Path vcpkg -Target c:\vcpkg
 
-        Write-Output "image=$env:ImageOS-$env:ImageVersion" >> $env:GITHUB_OUTPUT
+        Write-Output "::set-output name=image::$env:ImageOS-$env:ImageVersion"
 
     - name: Enable vcpkg cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: vcpkg/installed
-        key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-1 # Increase the number whenever dependencies are modified
+        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 }}
 
@@ -296,11 +262,9 @@ jobs:
       shell: bash
       run: |
         vcpkg install --triplet=${{ matrix.arch }}-windows-static \
-          breakpad \
           liblzma \
           libpng \
           lzo \
-          nlohmann-json \
           zlib \
           # EOF
 
@@ -330,8 +294,6 @@ jobs:
 
     - 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
@@ -351,101 +313,5 @@ jobs:
     - name: Test
       shell: bash
       run: |
-        cd build
+        cd ${GITHUB_WORKSPACE}/build
         ctest --timeout 120
-
-
-  msys2:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - msystem: MINGW64
-            arch: x86_64
-          - msystem: MINGW32
-            arch: i686
-
-    name: MinGW (${{ matrix.arch }})
-
-    runs-on: windows-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Setup MSYS2
-      uses: msys2/setup-msys2@v2
-      with:
-        msystem: ${{ matrix.msystem }}
-        release: false
-        install: >-
-          git
-          make
-          mingw-w64-${{ matrix.arch }}-cmake
-          mingw-w64-${{ matrix.arch }}-gcc
-          mingw-w64-${{ matrix.arch }}-lzo2
-          mingw-w64-${{ matrix.arch }}-libpng
-          mingw-w64-${{ matrix.arch }}-lld
-          mingw-w64-${{ matrix.arch }}-ninja
-          mingw-w64-${{ matrix.arch }}-nlohmann-json
-
-    - name: Install OpenGFX
-      shell: bash
-      run: |
-        mkdir -p "C:/Users/Public/Documents/OpenTTD/baseset"
-        cd "C:/Users/Public/Documents/OpenTTD/baseset"
-
-        echo "::group::Download OpenGFX"
-        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip
-        echo "::endgroup::"
-
-        echo "::group::Unpack OpenGFX"
-        unzip opengfx-all.zip
-        echo "::endgroup::"
-
-        rm -f opengfx-all.zip
-
-    - name: Install GCC problem matcher
-      uses: ammaraskar/gcc-problem-matcher@master
-
-    - name: Build
-      shell: msys2 {0}
-      env:
-        NINJA_STATUS: "[%f/%t -- %e] " # [finished_edges/total_edges -- elapsed_time], default value is "[%f/%t] "
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake .. \
-          -GNinja \
-          -DCMAKE_CXX_FLAGS="-fuse-ld=lld" \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        cmake --build .
-        echo "::endgroup::"
-
-    - name: Test
-      shell: msys2 {0}
-      run: |
-        cd build
-        ctest --timeout 120
-
-  check_annotations:
-    name: Check Annotations
-    needs:
-    - emscripten
-    - linux
-    - macos
-    - windows
-    - msys2
-
-    if: always() && github.event_name == 'pull_request'
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Check annotations
-      uses: OpenTTD/actions/annotation-check@v3

.github/workflows/codeql.yml

@@ -1,86 +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@v3
-
-    - 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 \
-          libsdl2-dev \
-          nlohmann-json3-dev \
-          zlib1g-dev \
-          # EOF
-        echo "::endgroup::"
-      env:
-        DEBIAN_FRONTEND: noninteractive
-
-    - name: Set number of make jobs
-      run: |
-        echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: cpp
-        config-file: ./.github/codeql/codeql-config.yml
-
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      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@v2
-      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@v3
+      uses: actions/checkout@v2
       with:
         fetch-depth: 4
 
     - name: Get pull-request commits
-      uses: OpenTTD/actions/checkout-pull-request@v2
+      run: |
+        set -x
+        # actions/checkout did a merge checkout of the pull-request. As such, the first
+        # commit is the merge commit. This means that on HEAD^ is the base branch, and
+        # on HEAD^2 are the commits from the pull-request. We now check if those trees
+        # have a common parent. If not, we fetch a few more commits till we do. In result,
+        # the log between HEAD^ and HEAD^2 will be the commits in the pull-request.
+        DEPTH=4
+        while [ -z "$(git merge-base HEAD^ HEAD^2)" ]; do
+            # Prevent infinite recursion
+            if [ ${DEPTH} -gt 256 ]; then
+                echo "No common parent between '${GITHUB_HEAD_REF}' and '${GITHUB_BASE_REF}'." >&2
+                exit 1
+            fi
+
+            git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --deepen=${DEPTH} origin HEAD
+            DEPTH=$(( ${DEPTH} * 4 ))
+        done
+
+        # Just to show which commits we are going to evaluate.
+        git log --oneline HEAD^..HEAD^2
+
+    - name: Checkout commit-checker
+      uses: actions/checkout@v2
+      with:
+        repository: OpenTTD/OpenTTD-git-hooks
+        path: git-hooks
+        ref: master
 
     - name: Check commits
-      uses: OpenTTD/OpenTTD-git-hooks@main
+      run: |
+        set -x
+        HOOKS_DIR=./git-hooks/hooks GIT_DIR=.git ./git-hooks/hooks/check-commits.sh HEAD^..HEAD^2
+        echo "Commit checks passed"

.github/workflows/preview-build.yml

@@ -1,104 +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 number in the cache step too.
-      image: emscripten/emsdk:3.1.42
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      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: Setup cache
-      uses: actions/cache@v3
-      with:
-        path: /emsdk/upstream/emscripten/cache
-        key: 3.1.42-${{ runner.os }}
-
-    - name: Patch Emscripten to support LZMA and nlohmann_json
-      run: |
-        cd /emsdk/upstream/emscripten
-        patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch
-        patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-nlohmann-json.patch
-
-    - name: Build (host tools)
-      run: |
-        mkdir build-host
-        cd build-host
-
-        echo "::group::CMake"
-        cmake .. -DOPTION_TOOLS_ONLY=ON
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        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,20 +0,0 @@
-name: Preview
-
-on:
-  pull_request_target:
-    types:
-    - labeled
-    - synchronize
-    branches:
-    - master
-
-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/release-docs.yml

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

.github/workflows/release-linux.yml

@@ -1,196 +0,0 @@
-name: Release (Linux)
-
-on:
-  workflow_call:
-    inputs:
-      survey_key:
-        required: false
-        type: string
-        default: ""
-
-jobs:
-  linux:
-    name: Linux (Generic)
-
-    runs-on: ubuntu-20.04
-    container:
-      # manylinux2014 is based on CentOS 7, but already has a lot of things
-      # installed and preconfigured. It makes it easier to build OpenTTD.
-      image: quay.io/pypa/manylinux2014_x86_64
-
-    steps:
-    - name: Download source
-      uses: actions/download-artifact@v3
-      with:
-        name: internal-source
-
-    - name: Unpack source
-      run: |
-        tar -xf source.tar.gz --strip-components=1
-
-    # dtolnay/rust-toolchain uses a curl argument (--retry-connrefused) that the curl shipped with our container doesn't support.
-    # So we need to do one part ourselves; the action takes over the rest and prepares the setup further.
-    - name: Prepare Rust toolchain
-      run: |
-        curl --proto '=https' --tlsv1.2 --retry 10 --location --silent --show-error --fail "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y
-        echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH
-
-    - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@stable
-
-    - name: Enable Rust cache
-      uses: Swatinem/rust-cache@v2
-
-    - name: Enable vcpkg cache
-      uses: actions/cache@v3
-      with:
-        path: /vcpkg/installed
-        key: ubuntu-20.04-vcpkg-release-1 # Increase the number whenever dependencies are modified
-        restore-keys: |
-          ubuntu-20.04-vcpkg-release
-
-    - 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.3.3.tar.gz
-        tar xf v2.3.3.tar.gz
-        (
-          cd fluidsynth-2.3.3
-          mkdir build
-          cd build
-          cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-          cmake --build . -j $(nproc)
-          cmake --install .
-        )
-        echo "::endgroup::"
-
-        echo "::group::Install audio drivers"
-        # These audio libs are to make sure the SDL version of vcpkg adds
-        # sound-support; these libraries are not added to the resulting
-        # binary, but the headers are used to enable them in SDL.
-        yum install -y \
-          alsa-lib-devel \
-          jack-audio-connection-kit-devel \
-          pulseaudio-libs-devel \
-          # EOF
-        echo "::endgroup::"
-
-        # We use vcpkg for our dependencies, to get more up-to-date version.
-        echo "::group::Install vcpkg and dependencies"
-
-        # We do a little dance to make sure we copy the cached install folder
-        # into our new clone.
-        git clone --depth=1 https://github.com/microsoft/vcpkg /vcpkg-clone
-        if [ -e /vcpkg/installed ]; then
-          mv /vcpkg/installed /vcpkg-clone/
-          rm -rf /vcpkg
-        fi
-        mv /vcpkg-clone /vcpkg
-
-        (
-          cd /vcpkg
-          ./bootstrap-vcpkg.sh -disableMetrics
-
-          # Make Python3 available for other packages.
-          ./vcpkg install python3
-          ln -sf $(pwd)/installed/x64-linux/tools/python3/python3.[0-9][0-9] /usr/bin/python3
-
-          ./vcpkg install \
-            breakpad \
-            curl[http2] \
-            fontconfig \
-            freetype \
-            harfbuzz \
-            icu \
-            liblzma \
-            libpng \
-            lzo \
-            nlohmann-json \
-            sdl2 \
-            zlib \
-            # EOF
-        )
-        echo "::endgroup::"
-
-        echo "::group::Install breakpad dependencies"
-        cargo install 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@v3
-      with:
-        name: openttd-linux-generic
-        path: build/bundles
-        retention-days: 5
-
-    - name: Store symbols
-      uses: actions/upload-artifact@v3
-      with:
-        name: symbols-linux-generic
-        path: build/symbols
-        retention-days: 5

.github/workflows/release-macos.yml

@@ -1,242 +0,0 @@
-name: Release (MacOS)
-
-on:
-  workflow_call:
-    inputs:
-      survey_key:
-        required: false
-        type: string
-        default: ""
-
-jobs:
-  macos:
-    name: MacOS
-
-    runs-on: macos-11
-    env:
-      MACOSX_DEPLOYMENT_TARGET: 10.13
-
-    steps:
-    - name: Download source
-      uses: actions/download-artifact@v3
-      with:
-        name: internal-source
-
-    - name: Unpack source
-      run: |
-        tar -xf source.tar.gz --strip-components=1
-
-    - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@stable
-
-    - name: Enable Rust cache
-      uses: Swatinem/rust-cache@v2
-
-    - name: Install dependencies
-      env:
-        HOMEBREW_NO_AUTO_UPDATE: 1
-        HOMEBREW_NO_INSTALL_CLEANUP: 1
-      run: |
-        echo "::group::Install brew dependencies"
-        brew install \
-          pandoc \
-          pkg-config \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Install breakpad dependencies"
-        cargo install dump_syms
-        echo "::endgroup::"
-
-    - name: Prepare cache key
-      id: key
-      run: |
-        echo "image=$ImageOS-$ImageVersion" >> $GITHUB_OUTPUT
-
-    - name: Enable vcpkg cache
-      uses: actions/cache@v3
-      with:
-        path: /usr/local/share/vcpkg/installed
-        key: ${{ steps.key.outputs.image }}-vcpkg-release-1 # Increase the number whenever dependencies are modified
-        restore-keys: |
-          ${{ steps.key.outputs.image }}-vcpkg-release
-          ${{ steps.key.outputs.image }}-vcpkg-x64
-
-    - name: Prepare vcpkg
-      run: |
-        vcpkg install \
-          breakpad:x64-osx \
-          breakpad:arm64-osx \
-          curl:x64-osx \
-          curl:arm64-osx \
-          liblzma:x64-osx \
-          liblzma:arm64-osx \
-          libpng:x64-osx \
-          libpng:arm64-osx \
-          lzo:x64-osx \
-          lzo:arm64-osx \
-          nlohmann-json:x64-osx \
-          nlohmann-json:arm64-osx \
-          zlib:x64-osx \
-          zlib:arm64-osx \
-          # EOF
-
-    - name: Install GCC problem matcher
-      uses: ammaraskar/gcc-problem-matcher@master
-
-    - name: Build tools
-      run: |
-        mkdir build-host
-        cd build-host
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DOPTION_TOOLS_ONLY=ON \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build tools"
-        echo "Running on $(sysctl -n hw.logicalcpu) cores"
-        cmake --build . -j $(sysctl -n hw.logicalcpu) --target tools
-        echo "::endgroup::"
-
-    - name: Import code signing certificates
-      uses: Apple-Actions/import-codesign-certs@v2
-      with:
-        # The certificates in a PKCS12 file encoded as a base64 string
-        p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
-        # The password used to import the PKCS12 file.
-        p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
-      # If this is run on a fork, there may not be a certificate set up - continue in this case
-      continue-on-error: true
-
-    - name: Build arm64
-      run: |
-        mkdir build-arm64
-        cd build-arm64
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -DCMAKE_OSX_ARCHITECTURES=arm64 \
-          -DVCPKG_TARGET_TRIPLET=arm64-osx \
-          -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
-          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -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=/usr/local/share/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@v3
-      with:
-        name: openttd-macos-universal
-        path: build-x64/bundles
-        retention-days: 5
-
-    - name: Store symbols
-      uses: actions/upload-artifact@v3
-      with:
-        name: symbols-macos-universal
-        path: build-x64/symbols
-        retention-days: 5

.github/workflows/release-source.yml

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

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

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

.github/workflows/release-windows.yml

@@ -1,243 +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@v3
-      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: Install dependencies
-      shell: bash
-      run: |
-        echo "::group::Install choco dependencies"
-        choco install pandoc
-        echo "::endgroup::"
-
-        echo "::group::Install breakpad dependencies"
-        cargo install dump_syms
-        echo "::endgroup::"
-
-    - name: Prepare cache key
-      id: key
-      shell: powershell
-      run: |
-        # Work around caching failure with GNU tar
-        New-Item -Type Junction -Path vcpkg -Target c:\vcpkg
-
-        Write-Output "image=$env:ImageOS-$env:ImageVersion" >> $env:GITHUB_OUTPUT
-
-    - name: Enable vcpkg cache
-      uses: actions/cache@v3
-      with:
-        path: vcpkg/installed
-        key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-1 # 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 \
-          nlohmann-json \
-          zlib \
-          # EOF
-
-        # arm64-windows-static is not (yet) supported for breakpad.
-        if [ "${{ matrix.arch }}" != "arm64" ]; then
-          vcpkg install --triplet=${{ matrix.arch }}-windows-static \
-            breakpad \
-            # EOF
-        fi
-
-    - name: Install MSVC problem matcher
-      uses: ammaraskar/msvc-problem-matcher@master
-
-    - name: Configure developer command prompt for tools
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x64
-
-    - name: Build tools
-      shell: bash
-      run: |
-        mkdir build-host
-        cd build-host
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -GNinja \
-          -DOPTION_TOOLS_ONLY=ON \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        cmake --build . --target tools
-        echo "::endgroup::"
-
-    - name: Configure developer command prompt for ${{ matrix.arch }}
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: ${{ matrix.host }}
-
-    - name: Import code signing certificate
-      shell: powershell
-      # If this is run on a fork, there may not be a certificate set up - continue in this case
-      continue-on-error: true
-      run: |
-        $tempFile = [System.IO.Path]::GetTempFileName()
-        $bytes = [System.Convert]::FromBase64String($env:WINDOWS_CERTIFICATE_P12)
-        [IO.File]::WriteAllBytes($tempFile, $bytes)
-        $pwd = ConvertTo-SecureString $env:WINDOWS_CERTIFICATE_PASSWORD -AsPlainText -Force
-        Import-PfxCertificate -FilePath $tempFile -CertStoreLocation Cert:\CurrentUser\My -Password $pwd
-        Remove-Item $tempFile
-      env:
-        WINDOWS_CERTIFICATE_P12: ${{ secrets.WINDOWS_CERTIFICATE_P12 }}
-        WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
-
-    - name: Build (with installer)
-      if: inputs.is_tag == 'true'
-      shell: bash
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -GNinja \
-          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
-          -DCMAKE_TOOLCHAIN_FILE="c:\vcpkg\scripts\buildsystems\vcpkg.cmake" \
-          -DOPTION_USE_NSIS=ON \
-          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \
-          -DWINDOWS_CERTIFICATE_COMMON_NAME="${WINDOWS_CERTIFICATE_COMMON_NAME}" \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        cmake --build . --target openttd
-        echo "::endgroup::"
-      env:
-        WINDOWS_CERTIFICATE_COMMON_NAME: ${{ secrets.WINDOWS_CERTIFICATE_COMMON_NAME }}
-
-    - name: Build (without installer)
-      if: inputs.is_tag != 'true'
-      shell: bash
-      run: |
-        mkdir build
-        cd build
-
-        echo "::group::CMake"
-        cmake ${GITHUB_WORKSPACE} \
-          -GNinja \
-          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
-          -DCMAKE_TOOLCHAIN_FILE="c:\vcpkg\scripts\buildsystems\vcpkg.cmake" \
-          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \
-          -DWINDOWS_CERTIFICATE_COMMON_NAME="${WINDOWS_CERTIFICATE_COMMON_NAME}" \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        cmake --build . --target openttd
-        echo "::endgroup::"
-      env:
-        WINDOWS_CERTIFICATE_COMMON_NAME: ${{ secrets.WINDOWS_CERTIFICATE_COMMON_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
-      # If this is run on a fork, there may not be a certificate set up - continue in this case
-      continue-on-error: true
-      run: |
-        cd ${GITHUB_WORKSPACE}/build/bundles
-        ../../os/windows/sign.bat *.exe "${WINDOWS_CERTIFICATE_COMMON_NAME}"
-      env:
-        WINDOWS_CERTIFICATE_COMMON_NAME: ${{ secrets.WINDOWS_CERTIFICATE_COMMON_NAME }}
-
-    - name: Store bundles
-      uses: actions/upload-artifact@v3
-      with:
-        name: openttd-windows-${{ matrix.arch }}
-        path: build/bundles
-        retention-days: 5
-
-    - name: Store symbols
-      uses: actions/upload-artifact@v3
-      with:
-        name: symbols-windows-${{ matrix.arch }}
-        path: build/symbols
-        retention-days: 5

.github/workflows/release.yml

@@ -18,85 +18,863 @@ jobs:
   source:
     name: Source
 
-    uses: ./.github/workflows/release-source.yml
-    secrets: inherit
+    runs-on: ubuntu-20.04
+
+    outputs:
+      version: ${{ steps.metadata.outputs.version }}
+      is_tag: ${{ steps.metadata.outputs.is_tag }}
+      trigger_type: ${{ steps.metadata.outputs.trigger_type }}
+      folder: ${{ steps.metadata.outputs.folder }}
+
+    steps:
+    - name: Checkout (Release)
+      if: github.event_name == 'release'
+      uses: actions/checkout@v2
+      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@v2
+      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@v2
+      with:
+        ref: ${{ github.event.client_payload.ref }}
+        # We generate a changelog; for this we need the full git log.
+        fetch-depth: 0
+
+    - name: Check valid branch name
+      run: |
+        if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+          REF="${{ github.event.inputs.ref }}"
+        elif [ "${{ github.event_name }}" = "repository_dispatch" ]; then
+          REF="${{ github.event.client_payload.ref }}"
+        else
+          REF="${{ github.ref }}"
+        fi
+
+        # Check if we are a tag.
+        if [ -n "$(git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || false)" ]; then
+          exit 0
+        fi
+
+        # Check if the checkout caused the branch to be named.
+        if [ "$(git rev-parse --abbrev-ref HEAD)" != "HEAD" ]; then
+          exit 0
+        fi
+
+        # Check if this was a pull request.
+        if [ -n "$(echo ${REF} | grep '^refs/pull/[0-9]*')" ]; then
+          PULL=$(echo ${REF} | cut -d/ -f3)
+          git checkout -b pr${PULL}
+        fi
+
+        # Are we still in a detached state? Error out.
+        if [ "$(git rev-parse --abbrev-ref HEAD)" == "HEAD" ]; then
+          echo "The 'ref' given resulted in a checkout of a detached HEAD."
+          echo "We cannot detect the version for these checkout accurate."
+          echo ""
+          echo "If you want to build a Pull Request, make sure you use 'refs/pull/NNN/head'."
+          echo ""
+          echo "Cancelling build, as without a version we cannot store the artifacts."
+          exit 1
+        fi
+
+    - name: Generate metadata
+      id: metadata
+      run: |
+        echo "::group::Prepare metadata files"
+        cmake -DGENERATE_OTTDREV=1 -P cmake/scripts/FindVersion.cmake
+        ./.github/changelog.sh > .changelog
+        TZ='UTC' date +"%Y-%m-%d %H:%M UTC" > .release_date
+        cat .ottdrev | cut -f 1 -d$'\t' > .version
+
+        if [ $(cat .ottdrev | cut -f 5 -d$'\t') = '1' ]; then
+          # Assume that all tags are always releases. Why else make a tag?
+          IS_TAG="true"
+
+          FOLDER="${{ env.FOLDER_RELEASES }}"
+          TRIGGER_TYPE="new-tag"
+        else
+          IS_TAG="false"
+
+          BRANCH=$(git symbolic-ref -q HEAD | sed 's@.*/@@')
+          if [ -z "${BRANCH}" ]; then
+            echo "Internal error: branch name is empty."
+            echo "An earlier step should have prevented this from happening."
+            echo "Cancelling build, as without a branch name we cannot store the artifacts"
+            exit 1
+          fi
+
+          if [ "${BRANCH}" = "${{ env.NIGHTLIES_BRANCH }}" ]; then
+            # The "master" branch is special, and we call a nightly.
+            FOLDER="${{ env.FOLDER_NIGHTLIES }}/$(date +%Y)"
+            TRIGGER_TYPE="new-master"
+          else
+            # All other branches, which can be builds of Pull Requests, are
+            # put in their own folder.
+            FOLDER="${{ env.FOLDER_BRANCHES }}/${BRANCH}"
+            TRIGGER_TYPE="new-branch"
+          fi
+        fi
+
+        mkdir -p build/bundles
+        cp .changelog build/bundles/changelog.txt
+        cp .release_date build/bundles/released.txt
+        cp README.md build/bundles/README.md
+        echo "::endgroup::"
+
+        echo "Release Date: $(cat .release_date)"
+        echo "Revision: $(cat .ottdrev)"
+        echo "Version: $(cat .version)"
+        echo "Is tag: ${IS_TAG}"
+        echo "Folder on CDN: ${FOLDER}"
+        echo "Workflow trigger: ${TRIGGER_TYPE}"
+
+        echo "::set-output name=version::$(cat .version)"
+        echo "::set-output name=is_tag::${IS_TAG}"
+        echo "::set-output name=folder::${FOLDER}"
+        echo "::set-output name=trigger_type::${TRIGGER_TYPE}"
+      env:
+        NIGHTLIES_BRANCH: master
+        FOLDER_RELEASES: openttd-releases
+        FOLDER_NIGHTLIES: openttd-nightlies
+        FOLDER_BRANCHES: openttd-branches
+
+    - name: Remove VCS information
+      run: |
+        rm -rf .git
+
+    - name: Create bundles
+      run: |
+        FOLDER_NAME=openttd-${{ steps.metadata.outputs.version }}
+
+        # Rename the folder to openttd-NNN
+        mkdir ${FOLDER_NAME}
+        find . -maxdepth 1 -not -name . -not -name build -not -name ${FOLDER_NAME} -exec mv {} ${FOLDER_NAME}/ \;
+
+        echo "::group::Create tarball (xz) bundle"
+        tar --xz -cvf build/bundles/${FOLDER_NAME}-source.tar.xz ${FOLDER_NAME}
+        echo "::endgroup::"
+
+        # This tarball is only to be used within this workflow.
+        echo "::group::Create tarball (gz) bundle"
+        tar --gzip -cvf source.tar.gz ${FOLDER_NAME}
+        echo "::endgroup::"
+
+        echo "::group::Create zip bundle"
+        zip -9 -r build/bundles/${FOLDER_NAME}-source.zip ${FOLDER_NAME}
+        echo "::endgroup::"
+
+    - name: Store bundles
+      uses: actions/upload-artifact@v2
+      with:
+        name: openttd-source
+        path: build/bundles/*
+        retention-days: 5
+
+    - name: Store source (for other jobs)
+      uses: actions/upload-artifact@v2
+      with:
+        name: internal-source
+        path: source.tar.gz
+        retention-days: 1
 
   docs:
     name: Docs
     needs: source
 
-    uses: ./.github/workflows/release-docs.yml
-    secrets: inherit
+    runs-on: ubuntu-20.04
 
-    with:
-      version: ${{ needs.source.outputs.version }}
+    steps:
+    - name: Download source
+      uses: actions/download-artifact@v2
+      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-${{ needs.source.outputs.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@v2
+      with:
+        name: openttd-docs
+        path: build/bundles/*.tar.xz
+        retention-days: 5
 
   linux:
     name: Linux (Generic)
     needs: source
 
-    uses: ./.github/workflows/release-linux.yml
-    secrets: inherit
+    runs-on: ubuntu-20.04
+    container:
+      # manylinux2014 is based on CentOS 7, but already has a lot of things
+      # installed and preconfigured. It makes it easier to build OpenTTD.
+      image: quay.io/pypa/manylinux2014_x86_64
 
-    with:
-      survey_key: ${{ needs.source.outputs.survey_key }}
+    steps:
+    - name: Download source
+      uses: actions/download-artifact@v2
+      with:
+        name: internal-source
+
+    - name: Unpack source
+      run: |
+        tar -xf source.tar.gz --strip-components=1
+
+    - name: Install dependencies
+      run: |
+        echo "::group::Install dependencies"
+        yum install -y \
+          fontconfig-devel \
+          freetype-devel \
+          libicu-devel \
+          libpng-devel \
+          libpng-devel \
+          lzo-devel \
+          SDL2-devel \
+          wget \
+          xz-devel \
+          zlib-devel \
+          # EOF
+        echo "::endgroup::"
+
+        # The yum variant of fluidsynth depends on all possible audio drivers,
+        # like jack, ALSA, pulseaudio, etc. This is not really useful for us,
+        # as we route the output of fluidsynth back via our sound driver, and
+        # as such do not use these audio driver outputs at all. So instead,
+        # we compile fluidsynth ourselves, with as little dependencies as
+        # possible. This currently means it picks up SDL2, but this is fine,
+        # as we need SDL2 anyway.
+        echo "::group::Install fluidsynth"
+        wget https://github.com/FluidSynth/fluidsynth/archive/v2.1.6.tar.gz
+        tar xf v2.1.6.tar.gz
+        (
+          cd fluidsynth-2.1.6
+          mkdir build
+          cd build
+          cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
+          cmake --build . -j $(nproc)
+          cmake --install .
+        )
+        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_BUILD_TYPE=RelWithDebInfo \
+          -DOPTION_PACKAGE_DEPENDENCIES=ON \
+          # EOF
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(nproc) cores"
+        cmake --build . -j $(nproc)
+        echo "::endgroup::"
+
+    - name: Create bundles
+      run: |
+        cd ${GITHUB_WORKSPACE}/build
+        echo "::group::Run CPack"
+        cpack
+        echo "::endgroup::"
+
+        echo "::group::Cleanup"
+        # Remove the sha256 files CPack generates; we will do this ourself at
+        # the end of this workflow.
+        rm -f bundles/*.sha256
+        echo "::endgroup::"
+
+    - name: Store bundles
+      uses: actions/upload-artifact@v2
+      with:
+        name: openttd-linux-generic
+        path: build/bundles
+        retention-days: 5
+
+  linux-distro:
+    name: Linux (Distros)
+    needs: source
+
+    if: needs.source.outputs.is_tag == 'true'
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - container_image: "ubuntu:18.04"
+          bundle_name: "bionic"
+        - container_image: "ubuntu:20.04"
+          bundle_name: "focal"
+        - container_image: "ubuntu:20.10"
+          bundle_name: "groovy"
+        - container_image: "debian:buster"
+          bundle_name: "buster"
+        - container_image: "debian:bullseye"
+          bundle_name: "bullseye"
+
+    runs-on: ubuntu-20.04
+    container:
+      image: ${{ matrix.container_image }}
+
+    steps:
+    - name: Download source
+      uses: actions/download-artifact@v2
+      with:
+        name: internal-source
+
+    - name: Unpack source
+      run: |
+        tar -xf source.tar.gz --strip-components=1
+
+    - name: Install dependencies
+      run: |
+        echo "::group::Update apt"
+        apt-get update
+        echo "::endgroup::"
+
+        echo "::group::Install dependencies"
+        apt-get install -y --no-install-recommends \
+          cmake \
+          debhelper \
+          g++ \
+          git \
+          make \
+          openssl \
+          libfontconfig-dev \
+          libfluidsynth-dev \
+          libicu-dev \
+          liblzma-dev \
+          liblzo2-dev \
+          libsdl2-dev \
+          lsb-release \
+          zlib1g-dev \
+          # EOF
+        echo "::endgroup::"
+      env:
+        DEBIAN_FRONTEND: noninteractive
+
+    - 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_BUILD_TYPE=RelWithDebInfo \
+          -DCMAKE_INSTALL_PREFIX=/usr \
+          # EOF
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(nproc) cores"
+        # Ubuntu 18.04 cmake does not support -j so we pass the option to the native tool
+        cmake --build . -- -j $(nproc)
+        echo "::endgroup::"
+
+    - name: Create bundles
+      run: |
+        cd ${GITHUB_WORKSPACE}/build
+        echo "::group::Run CPack"
+        cpack
+        echo "::endgroup::"
+
+        echo "::group::Cleanup"
+        # Remove the sha256 files CPack generates; we will do this ourself at
+        # the end of this workflow.
+        rm -f bundles/*.sha256
+        echo "::endgroup::"
+
+    - name: Store bundles
+      uses: actions/upload-artifact@v2
+      with:
+        name: openttd-linux-${{ matrix.bundle_name }}
+        path: build/bundles
+        retention-days: 5
 
   macos:
     name: MacOS
     needs: source
 
-    uses: ./.github/workflows/release-macos.yml
-    secrets: inherit
+    runs-on: macos-10.15
+    env:
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
-    with:
-      survey_key: ${{ needs.source.outputs.survey_key }}
+    steps:
+    - name: Download source
+      uses: actions/download-artifact@v2
+      with:
+        name: internal-source
+
+    - name: Unpack source
+      run: |
+        tar -xf source.tar.gz --strip-components=1
+
+    - name: Install dependencies
+      env:
+        HOMEBREW_NO_AUTO_UPDATE: 1
+        HOMEBREW_NO_INSTALL_CLEANUP: 1
+      run: |
+        brew install pandoc
+
+    - 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-release-0 # Increase the number whenever dependencies are modified
+        restore-keys: |
+          ${{ steps.key.outputs.image }}-vcpkg-release
+          ${{ steps.key.outputs.image }}-vcpkg-x64
+
+    - name: Prepare vcpkg
+      run: |
+        vcpkg install \
+          liblzma:x64-osx \
+          liblzma:arm64-osx \
+          libpng:x64-osx \
+          libpng:arm64-osx \
+          lzo:x64-osx \
+          lzo:arm64-osx \
+          zlib:x64-osx \
+          zlib:arm64-osx \
+          # EOF
+
+    - name: Install GCC problem matcher
+      uses: ammaraskar/gcc-problem-matcher@master
+
+    - name: Build tools
+      run: |
+        mkdir build-host
+        cd build-host
+
+        echo "::group::CMake"
+        cmake ${GITHUB_WORKSPACE} \
+          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+          -DOPTION_TOOLS_ONLY=ON \
+          # EOF
+        echo "::endgroup::"
+
+        echo "::group::Build tools"
+        echo "Running on $(sysctl -n hw.logicalcpu) cores"
+        cmake --build . -j $(sysctl -n hw.logicalcpu) --target tools
+        echo "::endgroup::"
+
+    - name: Import code signing certificates
+      uses: Apple-Actions/import-codesign-certs@v1
+      with:
+        # The certificates in a PKCS12 file encoded as a base64 string
+        p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
+        # The password used to import the PKCS12 file.
+        p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
+      # If this is run on a fork, there may not be a certificate set up - continue in this case
+      continue-on-error: true
+
+    - name: Build arm64
+      run: |
+        mkdir build-arm64
+        cd build-arm64
+
+        echo "::group::CMake"
+        cmake ${GITHUB_WORKSPACE} \
+          -DCMAKE_OSX_ARCHITECTURES=arm64 \
+          -DVCPKG_TARGET_TRIPLET=arm64-osx \
+          -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
+          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
+          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+          # EOF
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(sysctl -n hw.logicalcpu) cores"
+        cmake --build . -j $(sysctl -n hw.logicalcpu)
+        echo "::endgroup::"
+
+    - name: Build x64
+      run: |
+        mkdir build-x64
+        cd build-x64
+
+        echo "::group::CMake"
+        cmake ${GITHUB_WORKSPACE} \
+          -DCMAKE_OSX_ARCHITECTURES=x86_64 \
+          -DVCPKG_TARGET_TRIPLET=x64-osx \
+          -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
+          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
+          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+          -DCPACK_BUNDLE_APPLE_CERT_APP=${{ secrets.APPLE_DEVELOPER_CERTIFICATE_ID }} \
+          "-DCPACK_BUNDLE_APPLE_CODESIGN_PARAMETER=--deep -f --options runtime" \
+          -DAPPLE_UNIVERSAL_PACKAGE=1 \
+          # EOF
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        echo "Running on $(sysctl -n hw.logicalcpu) cores"
+        cmake --build . -j $(sysctl -n hw.logicalcpu)
+        echo "::endgroup::"
+
+    - name: Create bundles
+      run: |
+        cd build-x64
+
+        echo "::group::Create universal binary"
+        # Combine the `openttd` binaries from each build into a single file
+        lipo -create -output openttd-universal ../build-*/openttd
+        mv openttd-universal openttd
+        echo "::endgroup::"
+
+        echo "::group::Run CPack"
+        cpack
+        echo "::endgroup::"
+
+        echo "::group::Cleanup"
+        # Remove the sha256 files CPack generates; we will do this ourself at
+        # the end of this workflow.
+        rm -f bundles/*.sha256
+        echo "::endgroup::"
+
+    - name: Install gon
+      env:
+        HOMEBREW_NO_AUTO_UPDATE: 1
+        HOMEBREW_NO_INSTALL_CLEANUP: 1
+      run: |
+        brew tap mitchellh/gon
+        brew install mitchellh/gon/gon
+
+    - name: Notarize
+      env:
+        AC_USERNAME: ${{ secrets.APPLE_DEVELOPER_APP_USERNAME }}
+        AC_PASSWORD: ${{ secrets.APPLE_DEVELOPER_APP_PASSWORD }}
+      run: |
+        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@v2
+      with:
+        name: openttd-macos-universal
+        path: build-x64/bundles
+        retention-days: 5
 
   windows:
     name: Windows
     needs: source
 
-    uses: ./.github/workflows/release-windows.yml
-    secrets: inherit
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - arch: x86
+          host: x86
+        - arch: x64
+          host: x64
+        - arch: arm64
+          host: x64_arm64
 
-    with:
-      is_tag: ${{ needs.source.outputs.is_tag }}
-      survey_key: ${{ needs.source.outputs.survey_key }}
+    runs-on: windows-latest
 
-  windows-store:
-    name: Windows Store
-    needs:
-    - source
-    - windows
+    steps:
+    - name: Download source
+      uses: actions/download-artifact@v2
+      with:
+        name: internal-source
 
-    if: needs.source.outputs.is_tag == 'true'
+    - name: Unpack source
+      shell: bash
+      run: |
+        tar -xf source.tar.gz --strip-components=1
 
-    uses: ./.github/workflows/release-windows-store.yml
-    secrets: inherit
+    - name: Install dependencies
+      shell: bash
+      run: |
+        choco install pandoc
 
-    with:
-      version: ${{ needs.source.outputs.version }}
+    - 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
 
-  upload-cdn:
-    name: Upload (CDN)
+        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 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: needs.source.outputs.is_tag == 'true'
+      shell: bash
+      run: |
+        mkdir build
+        cd build
+
+        echo "::group::CMake"
+        cmake ${GITHUB_WORKSPACE} \
+          -GNinja \
+          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
+          -DCMAKE_TOOLCHAIN_FILE="c:\vcpkg\scripts\buildsystems\vcpkg.cmake" \
+          -DOPTION_USE_NSIS=ON \
+          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
+          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+          # EOF
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        cmake --build .
+        echo "::endgroup::"
+
+    - name: Build (without installer)
+      if: needs.source.outputs.is_tag != 'true'
+      shell: bash
+      run: |
+        mkdir build
+        cd build
+
+        echo "::group::CMake"
+        cmake ${GITHUB_WORKSPACE} \
+          -GNinja \
+          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
+          -DCMAKE_TOOLCHAIN_FILE="c:\vcpkg\scripts\buildsystems\vcpkg.cmake" \
+          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
+          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+          # EOF
+        echo "::endgroup::"
+
+        echo "::group::Build"
+        cmake --build .
+        echo "::endgroup::"
+
+    - name: Create bundles
+      shell: bash
+      run: |
+        cd ${GITHUB_WORKSPACE}/build
+        echo "::group::Run CPack"
+        cpack
+        echo "::endgroup::"
+
+        echo "::group::Prepare PDB to be bundled"
+        PDB=$(ls bundles/*.zip | cut -d/ -f2 | sed 's/.zip$/.pdb/')
+        cp openttd.pdb bundles/${PDB}
+        xz -9 bundles/${PDB}
+        echo "::endgroup::"
+
+        echo "::group::Cleanup"
+        # Remove the sha256 files CPack generates; we will do this ourself at
+        # the end of this workflow.
+        rm -f bundles/*.sha256
+        echo "::endgroup::"
+
+    - name: Store bundles
+      uses: actions/upload-artifact@v2
+      with:
+        name: openttd-windows-${{ matrix.arch }}
+        path: build/bundles
+        retention-days: 5
+
+  upload:
+    name: Upload (AWS)
     needs:
     - source
     - docs
     - linux
+    - linux-distro
     - macos
     - windows
-    - windows-store
 
-    # As windows-store is condition, we need to check ourselves if we need to run.
-    # The always() makes sure the rest is always evaluated.
-    if: always() && needs.source.result == 'success' && needs.docs.result == 'success' && needs.linux.result == 'success' && needs.macos.result == 'success' && needs.windows.result == 'success' && (needs.windows-store.result == 'success' || needs.windows-store.result == 'skipped')
+    # The 'linux' job can be skipped if it is a nightly. That normally causes
+    # this job to be skipped too, unless we have this length boy :)
+    # "always()" is important here, it is the keyword to use to stop skipping
+    # this job if any dependency is skipped. It looks a bit silly, but it is
+    # how GitHub Actions work ;)
+    if: always() && needs.source.result == 'success' && needs.docs.result == 'success' && needs.linux.result == 'success' && (needs.linux-distro.result == 'success' || needs.linux-distro.result == 'skipped') && needs.macos.result == 'success' && needs.windows.result == 'success'
 
-    uses: ./.github/workflows/upload-cdn.yml
-    secrets: inherit
+    runs-on: ubuntu-20.04
 
-    with:
-      version: ${{ needs.source.outputs.version }}
-      folder: ${{ needs.source.outputs.folder }}
-      trigger_type: ${{ needs.source.outputs.trigger_type }}
+    steps:
+    - name: Download all bundles
+      uses: actions/download-artifact@v2
+
+    - name: Calculate checksums
+      run: |
+        echo "::group::Move bundles to a single folder"
+        mkdir bundles
+        mv openttd-*/* bundles/
+        cd bundles
+        echo "::group::Build"
+
+        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
+
+    - name: Upload bundles to AWS
+      run: |
+        aws s3 cp --recursive --only-show-errors bundles/ s3://${{ secrets.CDN_S3_BUCKET }}/${{ needs.source.outputs.folder }}/${{ needs.source.outputs.version }}/
+
+        # We do not invalidate the CloudFront distribution here. The trigger
+        # for "New OpenTTD release" first updated the manifest files and
+        # creates an index.html. We invalidate after that, so everything
+        # becomes visible at once.
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+
+    - name: Trigger 'New OpenTTD release'
+      uses: peter-evans/repository-dispatch@v1
+      with:
+        token: ${{ secrets.DEPLOYMENT_TOKEN }}
+        repository: OpenTTD/workflows
+        event-type: ${{ needs.source.outputs.trigger_type }}
+        client-payload: '{"version": "${{ needs.source.outputs.version }}", "folder": "${{ needs.source.outputs.folder }}"}'
 
   upload-steam:
     name: Upload (Steam)
@@ -108,25 +886,69 @@ jobs:
 
     if: needs.source.outputs.trigger_type == 'new-master' || needs.source.outputs.trigger_type == 'new-tag'
 
-    uses: ./.github/workflows/upload-steam.yml
-    secrets: inherit
+    runs-on: ubuntu-20.04
 
-    with:
-      version: ${{ needs.source.outputs.version }}
-      trigger_type: ${{ needs.source.outputs.trigger_type }}
+    steps:
+    - name: Download all bundles
+      uses: actions/download-artifact@v2
 
-  upload-gog:
-    name: Upload (GOG)
-    needs:
-    - source
-    - linux
-    - macos
-    - windows
+    - name: Setup steamcmd
+      uses: CyberAndrii/setup-steamcmd@v1
 
-    if: needs.source.outputs.trigger_type == 'new-tag'
+    - name: Generate Steam auth code
+      id: steam-totp
+      uses: CyberAndrii/steam-totp@v1
+      with:
+        shared_secret: ${{ secrets.STEAM_SHARED_SECRET }}
 
-    uses: ./.github/workflows/upload-gog.yml
-    secrets: inherit
+    - 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::"
 
-    with:
-      version: ${{ needs.source.outputs.version }}
+        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 [ "${{ needs.source.outputs.trigger_type }}" = "new-tag" ]; then
+            BRANCH="testing"
+          else
+            BRANCH="nightly"
+          fi
+          cat ../source/os/steam/release.vdf | sed 's/@@DESCRIPTION@@/openttd-${{ needs.source.outputs.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::"
+        )

.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@v3
-
-    - 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@v3
-
-    - name: Check for unused strings
-      run: |
-        set -ex
-        python3 .github/unused-strings.py

.github/workflows/upload-cdn.yml

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

.github/workflows/upload-gog.yml

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

.github/workflows/upload-steam.yml

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

.github/workflows/windowdesc-ini-key.yml

@@ -1,24 +0,0 @@
-name: WindowDesc ini_key
-
-on:
-  pull_request:
-    branches:
-    - master
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
-
-jobs:
-  windowdesc-ini-key:
-    name: WindowDesc ini_key issues
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Check for ini_key issues in WindowDesc entries
-      shell: bash
-      run: |
-        python3 .github/windowdesc-ini-key.py

CMakeLists.txt

@@ -1,12 +1,11 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.9)
 
 if(NOT BINARY_NAME)
     set(BINARY_NAME openttd)
 endif()
 
 project(${BINARY_NAME}
-    VERSION 14.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
@@ -77,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}
@@ -119,27 +118,12 @@ endif()
 set(CMAKE_THREAD_PREFER_PTHREAD YES)
 # Make sure we have Threads available.
 find_package(Threads REQUIRED)
-# nlohmann is used for all our JSON needs.
-find_package(nlohmann_json REQUIRED)
 
 find_package(ZLIB)
 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)
-endif()
-
 if(NOT OPTION_DEDICATED)
     if(NOT WIN32)
         find_package(Allegro)
@@ -150,17 +134,12 @@ if(NOT OPTION_DEDICATED)
                 find_package(SDL)
             endif()
             find_package(Fluidsynth)
-            if(Freetype_FOUND)
-                find_package(Fontconfig)
-            endif()
-            find_package(Harfbuzz)
-            find_package(ICU OPTIONAL_COMPONENTS i18n)
+            find_package(Fontconfig)
+            find_package(ICU OPTIONAL_COMPONENTS i18n lx)
         endif()
     endif()
 endif()
 if(APPLE)
-    enable_language(OBJCXX)
-
     find_package(Iconv)
 
     find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
@@ -191,12 +170,6 @@ if(UNIX AND NOT APPLE AND NOT OPTION_DEDICATED)
     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()
-    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")
-    endif()
 endif()
 if(APPLE)
     if(NOT AUDIOTOOLBOX_LIBRARY)
@@ -234,7 +207,6 @@ if(OPTION_PACKAGE_DEPENDENCIES)
     set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 endif()
 
-include(CTest)
 include(SourceList)
 
 # Needed by rev.cpp
@@ -244,31 +216,15 @@ 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
-)
-
 add_subdirectory(${CMAKE_SOURCE_DIR}/bin)
 add_subdirectory(${CMAKE_SOURCE_DIR}/src)
 add_subdirectory(${CMAKE_SOURCE_DIR}/media)
@@ -276,27 +232,15 @@ 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)
-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)
@@ -310,15 +254,6 @@ link_package(PNG TARGET PNG::PNG ENCOURAGED)
 link_package(ZLIB TARGET ZLIB::ZLIB ENCOURAGED)
 link_package(LIBLZMA TARGET LibLZMA::LibLZMA ENCOURAGED)
 link_package(LZO)
-link_package(nlohmann_json)
-
-if(NOT WIN32 AND NOT EMSCRIPTEN)
-    link_package(CURL ENCOURAGED)
-endif()
-
-if(NOT EMSCRIPTEN)
-    link_package(unofficial-breakpad TARGET unofficial::breakpad::libbreakpad_client ENCOURAGED)
-endif()
 
 if(NOT OPTION_DEDICATED)
     link_package(Fluidsynth)
@@ -327,7 +262,7 @@ if(NOT OPTION_DEDICATED)
     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)
 
     if(SDL2_FOUND AND OPENGL_FOUND AND UNIX)
@@ -341,12 +276,10 @@ if(NOT OPTION_DEDICATED)
     endif()
 endif()
 
-include(CheckAtomic)
-
 if(APPLE)
     link_package(Iconv TARGET Iconv::Iconv)
 
-    target_link_libraries(openttd_lib
+    target_link_libraries(openttd
         ${AUDIOTOOLBOX_LIBRARY}
         ${AUDIOUNIT_LIBRARY}
         ${COCOA_LIBRARY}
@@ -365,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
@@ -423,21 +355,17 @@ 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
     )
 endif()
 
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    add_definitions(-DPOINTER_IS_64BIT)
+    add_definitions(-D_SQ64)
 endif()
 
 include(CreateRegression)

CODINGSTYLE.md

@@ -1,488 +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).
-```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.
-* All fall throughs must be documented, using a **FALLTHROUGH** define/macro.
-* The NOT_REACHED() macro can be used in default constructs that should never be reached.
-* Unconditional loops are written with **`for (;;) {`**
-
-```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, byte Tnumber_of_something>
-int Func();
-```
-
-* If you are writing one or more template class in the dedicated header file, use file.hpp for its name instead of file.h. This will let others know that it is template library (includes also implementation), not just header with declarations.
-
-### 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.
-* Use const where possible.
-* 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>(, (<keyword> #<issue>|<commit>))*)?: ([<section])? <Details>
-```
-Keywords are:
-* Add, Feature: Adding new stuff. Difference between "Feature" and "Add" is somewhat subjective. "Feature" for user-point-of-view stuff, "Add" for other.
-* Change: Changing behaviour from user-point-of-view.
-* Remove: Removing something from user-point-of-view.
-* Codechange, Cleanup: Changes without intentional change of behaviour from user-point-of-view. Difference between "Codechange" and "Cleanup" is somewhat subjective.
-* Fix, Revert: Fixing stuff.
-* Doc, Update: Documentation changes, version increments, translator commits.
-* Prepare: Preparation for bigger changes. Rarely used.
-
-If you commit a fix for an [issue](https://github.com/OpenTTD/OpenTTD/issues), add the corresponding issue number in the form of #NNNN. Do it as well if you implement a feature with a matching entry.
-
-In the case of bugfixes, if you know what revision the bug was introduced (eg regression), please mention that revision as well just after the prefix. Finding the trouble-causing revision is highly encouraged as it makes backporting/branching/releases that much easier.
-
-To further structure the changelog, you can add sections. Example are:
-* "Network" for network specific changes
-* "NewGRF" for NewGRF additions
-* "YAPP", "NPF", for changes in these features
-* "OSX", "Debian", "win32", for OS-specific packaging changes
-
-Further explanations, general bitching, 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.
-* Fix 80dffae130: Warning about unsigned unary minus.
-* Fix #6673, 99bb3a95b4: Store the map variety setting in the samegame.
-* Revert d9065fbfbe, Fix #5922: ClientSizeChanged is only called via WndProcGdi which already has the mutex.
-* Fix #1264, Fix #2037, Fix #2038, Fix #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,26 +4,20 @@
 
 OpenTTD makes use of the following external libraries:
 
-- (required) nlohmann-json: JSON handling
-- (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.
@@ -51,18 +45,16 @@ 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
-- nlohmann-json
 - zlib
 
 To install both the x64 (64bit) and x86 (32bit) variants (though only one is necessary), you can use:
 
 ```ps
-.\vcpkg install breakpad:x64-windows-static liblzma:x64-windows-static libpng:x64-windows-static lzo:x64-windows-static nlohmann-json:x64-windows-static zlib:x64-windows-static
-.\vcpkg install breakpad:x86-windows-static liblzma:x86-windows-static libpng:x86-windows-static lzo:x86-windows-static nlohmann-json:x86-windows-static zlib: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.
@@ -77,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 16 2019" -DCMAKE_TOOLCHAIN_FILE="<location of vcpkg>\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="x64-windows-static"
+cmake.exe .. -G'Visual Studio 16 2019' -DCMAKE_TOOLCHAIN_FILE="<location of vcpkg>\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="x64-windows-static"
 ```
 
 Change `<location of vcpkg>` to where you have installed vcpkg. After this
@@ -105,7 +97,7 @@ 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.

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,7 +108,7 @@ 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:
 
@@ -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?
@@ -212,8 +212,8 @@ When it comes to gameplay features there are at least these groups of interests:
 - *Control freak:* micromanagement like conditional orders, refitting and loading etc.
 - *Casual:* automatisation like cargodist, path based signalling etc.
 
-To please everyone, the official branch tries to stay close to the original gameplay; after all, that is what brought everyone here.
-The preferred method to alter and extend the gameplay is via add-ons like NewGRF and GameScripts.
+To please everyone, the official branch tries to stay close to the original gameplay; after all, that is what everyone brought here.
+The preferred method to alter and extent the gameplay is via add-ons like NewGRF and GameScripts.
 
 For a long time, the official branch was also open to features which could be enabled/disabled, but the corner-cases that came with some configurations have rendered some parts of the code very complicated.
 Today, new features have to work with all the already existing features, which is not only challenging in corner cases, but also requires spending considerable more work than just "making it work in the game mode that I play".
@@ -265,5 +265,5 @@ If you would not like to accept this risk, please do either commit anonymously o
 
 ### Attribution of this Contributing Guide
 
-This contributing guide is adapted from [Bootstrap](https://github.com/twbs/bootstrap/blob/main/.github/CONTRIBUTING.md) under the [Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/) terms for Bootstrap documentation.
+This contributing guide is adapted from [Bootstrap](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) under the [Creative Commons Attribution 3.0 Unported License](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE) terms for Bootstrap documentation.
 The GDPR notice is adapted from [rsyslog](https://github.com/rsyslog/rsyslog/blob/master/CONTRIBUTING.md) under the [GNU General Public License](https://github.com/rsyslog/rsyslog/blob/master/COPYING).

CREDITS.md

@@ -1,44 +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)
+- Loïc Guilloux (glx) - Windows Expert (since 0.4.5)
 - Charles Pigott (LordAro) - General / Correctness police (since 1.9)
-- Michael Lutz (michi_cc) - General / Path based signals (since 0.7)
+- Michael Lutz (michi_cc) - Path based signals (since 0.7)
 - Niels Martin Hansen (nielsm) - Music system, general coding (since 1.9)
 - Owen Rudge (orudge) - Forum host, OS/2 port (since 0.1)
 - Peter Nelson (peter1138) - Spiritual descendant from newGRF gods (since 0.4.5)
-- Remko Bijker (Rubidium) - Coder and way more (since 0.4.5)
-- Patric Stout (TrueBrain) - NoProgrammer (since 0.3), sys op
-- Tyler Trahan (2TallTyler) - General coding (since 13)
+- Ingo von Borstel (planetmaker) - General coding, Support (since 1.1)
+- Remko Bijker (Rubidium) - Lead coder and way more (since 0.4.5)
+- José Soler (Terkhen) - General coding (since 1.0)
+- 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)
 
@@ -53,7 +52,7 @@
 - Alberto Demichelis - Squirrel scripting language
 - L. Peter Deutsch - MD5 implementation
 - Michael Blunck - For revolutionizing TTD with awesome graphics
-- George - Canal/Lock graphics
+- George - Canal graphics
 - Andrew Parkhouse (andythenorth) - River graphics
 - David Dallaston (Pikka) - Tram tracks
 - All Translators - For their support to make OpenTTD a truly international game

Doxyfile.in

@@ -41,6 +41,7 @@ INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 2
 ALIASES                =
+TCL_SUBST              =
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
@@ -154,6 +155,7 @@ VERBATIM_HEADERS       = YES
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
 IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
 # Configuration options related to the HTML output
@@ -222,7 +224,7 @@ LATEX_OUTPUT           = latex
 LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
 COMPACT_LATEX          = NO
-PAPER_TYPE             = a4
+PAPER_TYPE             = a4wide
 EXTRA_PACKAGES         =
 LATEX_HEADER           =
 LATEX_FOOTER           =
@@ -292,8 +294,8 @@ PREDEFINED             = WITH_ZLIB \
                          WITH_PNG \
                          WITH_FONTCONFIG \
                          WITH_FREETYPE \
-                         WITH_HARFBUZZ \
                          WITH_ICU_I18N \
+                         WITH_ICU_LX \
                          UNICODE \
                          _UNICODE \
                          _GNU_SOURCE \

README.md

@@ -34,7 +34,7 @@ Both 'stable' and 'nightly' versions are available for download:
 - most people should choose the 'stable' version, as this has been more extensively tested
 - the 'nightly' version includes the latest changes and features, but may sometimes be less reliable
 
-OpenTTD is also available for free on [Steam](https://store.steampowered.com/app/1536610/OpenTTD/), [GOG.com](https://www.gog.com/game/openttd), and the [Microsoft Store](https://www.microsoft.com/p/openttd-official/9ncjg5rvrr1c). On some platforms OpenTTD will be available via your OS package manager or a similar service.
+On some platforms OpenTTD will also be available via your OS package manager or a similar service.
 
 
 ## 1.2) OpenTTD gameplay manual
@@ -77,9 +77,9 @@ For some platforms, you will need to refer to [the installation guide](https://w
 The free data files, split into OpenGFX for graphics, OpenSFX for sounds and
 OpenMSX for music can be found at:
 
-- https://www.openttd.org/downloads/opengfx-releases/latest for OpenGFX
-- https://www.openttd.org/downloads/opensfx-releases/latest for OpenSFX
-- https://www.openttd.org/downloads/openmsx-releases/latest for OpenMSX
+- https://www.openttd.org/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.
@@ -116,6 +116,35 @@ Most types of add-on content can be downloaded within OpenTTD via the 'Check Onl
 
 Add-on content can also be installed manually, but that's more complicated; the [OpenTTD wiki](https://wiki.openttd.org/) may offer help with that, or the [OpenTTD directory structure guide](./docs/directory_structure.md).
 
+### 1.5.1) AI opponents
+
+OpenTTD comes without AI opponents, so if you want to play with AIs you have to download them.
+
+The easiest way is via the 'Check Online Content' button in the main menu.
+
+You can select some AIs that you think are compatible with your playing style.
+
+AI help and discussions may also be found in the [AI section of the forum](https://www.tt-forums.net/viewforum.php?f=65).
+
+### 1.5.2) Scenarios and height maps
+
+Scenarios and heightmaps can be added via the 'Check Online Content' button in the main menu.
+
+### 1.5.3) NewGRFs
+
+A wide range of add-content is available as NewGRFs, including vehicles, industries, stations, landscape objects, town names and more.
+
+NewGRFs can be added via the 'Check Online Content' button in the main menu.
+
+See also the wiki [guide to NewGRFs](https://wiki.openttd.org/en/Manual/NewGRF) and [the forum graphics development section](https://www.tt-forums.net/viewforum.php?f=66).
+
+### 1.5.4) Game scripts
+
+Game scripts can provide additional challenges or changes to the standard OpenTTD gameplay, for example setting transport goals, or changing town growth behaviour.
+
+Game scripts can be added via the 'Check Online Content' button in the main menu.
+
+See also the wiki [guide to game scripts](https://wiki.openttd.org/en/Manual/Game%20script) and [the forum graphics game script section](https://www.tt-forums.net/viewforum.php?f=65).
 
 ### 1.6) OpenTTD directories
 
@@ -133,9 +162,8 @@ If you want to compile OpenTTD from source, instructions can be found in [COMPIL
 'Official' channels
 
 - [OpenTTD website](https://www.openttd.org)
-- [OpenTTD official Discord](https://discord.gg/openttd)
 - IRC chat using #openttd on irc.oftc.net [more info about our irc channel](https://wiki.openttd.org/en/Development/IRC%20channel)
-- [OpenTTD on Github](https://github.com/OpenTTD/) for code repositories and for reporting issues
+- [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
 
@@ -174,14 +202,9 @@ 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 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.
 
 ## 4.0 Credits
 

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

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

bin/ai/compat_1.0.nut

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

bin/ai/compat_1.1.nut

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

bin/ai/compat_1.10.nut

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

bin/ai/compat_1.11.nut

@@ -4,18 +4,3 @@
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
-
-AILog.Info("1.11 API compatibility in effect.");
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_1.2.nut

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

bin/ai/compat_1.3.nut

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

bin/ai/compat_1.4.nut

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

bin/ai/compat_1.5.nut

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

bin/ai/compat_1.6.nut

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

bin/ai/compat_1.7.nut

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

bin/ai/compat_1.8.nut

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

bin/ai/compat_1.9.nut

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

bin/ai/compat_12.nut

@@ -1,21 +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/>.
- */
-
-AILog.Info("12 API compatibility in effect.");
-
-/* 13 really checks RoadType against RoadType */
-AIRoad._HasRoadType <- AIRoad.HasRoadType;
-AIRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (AIRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/ai/compat_13.nut

@@ -1,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/>.
- */
-
-AILog.Info("13 API compatibility in effect.");

bin/ai/compat_14.nut

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

bin/game/CMakeLists.txt

@@ -9,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

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

bin/game/compat_1.11.nut

@@ -4,18 +4,3 @@
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
-
-GSLog.Info("1.11 API compatibility in effect.");
-
-/* 13 really checks RoadType against RoadType */
-GSRoad._HasRoadType <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_1.2.nut

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

bin/game/compat_1.3.nut

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

bin/game/compat_1.4.nut

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

bin/game/compat_1.5.nut

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

bin/game/compat_1.6.nut

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

bin/game/compat_1.7.nut

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

bin/game/compat_1.8.nut

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

bin/game/compat_1.9.nut

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

bin/game/compat_12.nut

@@ -1,21 +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/>.
- */
-
-GSLog.Info("12 API compatibility in effect.");
-
-/* 13 really checks RoadType against RoadType */
-GSRoad._HasRoadType <- GSRoad.HasRoadType;
-GSRoad.HasRoadType <- function(tile, road_type)
-{
-	local list = GSRoadTypeList(GSRoad.GetRoadTramType(road_type));
-	foreach (rt, _ in list) {
-		if (GSRoad._HasRoadType(tile, rt)) {
-			return true;
-		}
-	}
-	return false;
-}

bin/game/compat_13.nut

@@ -1,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/>.
- */
-
-GSLog.Info("13 API compatibility in effect.");

bin/game/compat_14.nut

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

changelog.txt

@@ -1,318 +1,3 @@
-13.0-beta2 (2022-11-27)
-------------------------------------------------------------------------
-Feature: Allow AI/GS to be fully modified in scenario editor (#10152)
-Feature: Display power-to-weight ratio in ground vehicle details GUI (#10123)
-Feature: Variable interface scaling (with chunky bevels!) (#10114)
-Feature: Hotkey to honk a vehicle's horn (#10110)
-Feature: Split AI/Game Script configuration windows and add them to world gen window (#10058)
-Feature: [GS] Scriptable league tables (#10001)
-Feature: Multi-track level crossings (#9931)
-Feature: Improved local authority action window (#9928)
-Feature: Automatic console command screenshot numbering with a filename ending in '#' (#9781)
-Feature: Add buttons to toggle music in the Game Options menu (#9727)
-Feature: Contextual actions for vehicles grouped by shared orders (#8425)
-Feature: Add cargo filter support to vehicle list (#8308)
-Feature: Show the cargoes the vehicles can carry in the vehicle list window (#8304)
-Change: Allow building canal by area outside editor (#10173)
-Change: Minor improvements to the new Finance GUI (#10168)
-Change: Let AI developers edit non-editable AI/Game Script Parameters (#8895)
-Change: Allow building docks on clearable watered object tiles (#8514)
-Fix #8770: Center vehicle status bar icon (#10178)
-Fix: Crash if error message window is too wide for screen. (#10172)
-Fix #10155: Network games not syncing company settings properly (#10158)
-Fix #10154: Network game desync related to setting a random company face (#10157)
-Fix #10011: Incorrect infrastructure totals when overbuilding bay road stop (#10143)
-Fix #10117: Object burst limit allowed one fewer object than the setting (#10120)
-Fix #10023: Allow negative input in text fields when needed (#10112)
-Fix #9908: Fix crash which could occur when a company was deleted when a depot window was open (#9912)
-
-
-13.0-beta1 (2022-10-31)
-------------------------------------------------------------------------
-Feature: Airport construction GUI displays infrastructure cost (#10094)
-Feature: Purchase land multiple tiles at a time (#10027)
-Feature: Add sticky pin & shade widgets to Object Selection UI panel (#10019, #10020)
-Feature: Improved handling of HiDPI and mixed-DPI screens (#9994, #9996, #9997, #10064)
-Feature: Alternative linkgraph colour schemes (#9866)
-Feature: Allow Shift+Insert as paste in edit box (#9836)
-Feature: Setting to make the local town authority rubber-stamp all actions (#9833)
-Feature: Add/extend console commands to enable screenshot automation (#9771)
-Feature: [Linkgraph] Show a tooltip with statistics when hovering a link (#9760)
-Feature: Build objects by area (#9709)
-Feature: Add setting to hide news about competitors vehicle crash (#9653)
-Feature: Ctrl-click to remove fully autoreplaced vehicles from list (#9639)
-Feature: Wide rivers on map generation (#9628)
-Add: [Script] ScriptCargo::GetWeight to get cargo weights (#9930)
-Add: Command line option to skip NewGRF scanning (#9879)
-Add: Show video driver name in Game Options window (#9872)
-Add: [NewGRF] Map seed as global variable (#9834)
-Add: [Script] IndustryType::ResolveNewGRFID to resolve industry id from grf_local_id and grfid (#9798)
-Add: [Script] ObjectType::ResolveNewGRFID to resolve object id from grfid and grf_local_id (#9795)
-Update: To all the friends we have lost and those we have gained (#10000)
-Change: Use the Simulation subcategory to openttd.desktop (#10015)
-Change: Constantly update destination of 'any depot' orders (#9959)
-Change: Use an indent, not a dash, to list train capacity (#9887)
-Change: [NewGRF] Increase vehicle sprite stack from 4 layers to 8 (#9863)
-Change: Don't pay Property Maintenance on stations when Infrastructure Maintenance is disabled (#9828)
-Change: Improved layout of the finance window (#9827)
-Change: [Admin] Bump admin port protocol due to command changes (#9754)
-Change: Suppress vehicle age warnings for stopped vehicles (#9718)
-Change: Make pf.yapf.rail_firstred_twoway_eol on by default (#9544)
-Change: Deliver cargo to the closest industry first (#9536)
-Fix: Lots of fixes to how windows handle resizing (#10040, #10042, #10046, #10051, #10056, #10068, #10070, #10098)
-Fix: Console commands list_ai output was truncated with a suitably large number of AIs (#10075)
-Fix #9876: MacBook Touch Bar crash / render issues w/ 32bpp graphics (#10060)
-Fix: Reduce framerate overhead in Train::Tick (#10055)
-Fix: Only open scenario editor date query once (#10050)
-Fix #10048: Don't relocate company HQ on the same exact location (#10049)
-Fix #10038: Missing upper bounds check when loading custom playlists (#10039)
-Fix: Wrong string used to determine size of zoomed out station sign (#10036)
-Fix: Disable "turn around" button for other companies' road vehicles (#10033)
-Fix: Online Players list mouse hover behaviour (#10031)
-Fix: [NewGRF] Weirdness of new stations (#10017)
-Fix #9854: DrawStringMultiLine() could draw beyond its bounding box (#10014)
-Fix: Incorrect player name in online players window (#10013)
-Fix #8099: News window zoom level fixes (#10005)
-Fix: [NewGRF] Upper 16 random bits should be the same for all station tiles in callback 140 (#9992)
-Fix #9989: £0 Net Profit is neither negative nor positive (#9991)
-Fix #9804: Only apply sprite_zoom_min setting when sprites available (#9988)
-Fix #9972: Add missing fill/resize flags on Framerate window widgets (#9982)
-Fix #9935: Use more selectivity when building SSE specific code (#9980)
-Fix #9940: Print debuglevel parse errors to console when changed from console (#9979)
-Fix #9977: Clearing the console with a large number of lines could cause a crash (#9978)
-Fix #9974: Console command getsysdate did not work due to off-by-one error (#9975)
-Fix: [NewGRF] Default value of RailVehicleInfo::railveh_type was inconsistent with other default properties (#9967)
-Fix #8584: Vehicles with shared orders getting invalid or unexpected start dates (#9955)
-Fix #9951: [NewGRF] Scenario editor random industries button broke NewGRF persistent storage (#9952)
-Fix: Validation of various internal command parameters that could have allowed a rogue client to crash servers (#9942, #9943, #9944, #9945, #9946, #9947, #9948, #9950)
-Fix #9937: Station industries_near incorrect after removing part moved sign (#9938)
-Fix: [Script] ScriptRoad::HasRoadType really check for RoadType (#9934)
-Fix #9363: Rebuild client list on reinit event (#9929)
-Fix #9925: Industry tile layout validation for layouts of only one tile (#9926)
-Fix #9918: Reset industy last production year on scenario start (#9920)
-Fix #9914: Prevent more useless pathfinder run for blocked vehicles (#9917)
-Fix: List a max of four share owners instead of three (#9905)
-Fix: [NewGRF] Industry layouts with zero regular tiles should be invalid (#9902)
-Fix #9869: Remove docking tile when doing a clear square (#9898)
-Fix: New player companies use favorite manager face, if saved (#9895)
-Fix: Towns don't build parallel, redundant bridges (#9891)
-Fix #9712: Cap town bridge length at original 11-tile limit (#9890)
-Fix #9883: Show cost/income float over end tile of rail or road construction (#9889)
-Fix #9870: Don't update infrastructure totals when overbuilding object on canal (#9888)
-Fix #9877: GS could trigger 'Cost: £0' cost message (#9878)
-Fix 44f2ef1: [strgen] Allow gender for {CARGO_SHORT} (#9873)
-Fix #9867: Industry::stations_near not filled at industry creation (#9868)
-Fix #9853: Incorrect merge of guiflags and flags for osk_activation (#9855)
-Fix #6544: Don't join AI company when loading network game in singleplayer (#9794)
-Fix: Company values do not properly account for shares (#9770)
-Fix #9546: Crash when no industries are present in game (#9726)
-Fix #9708: [Linkgraph] Don't assume vehicles have a non-zero max speed (#9693)
-Fix #9665: [Linkgraph] Fix travel times of non-direct journeys (#9693)
-Fix #8797: Use logical rail length when placing signals (#9652)
-Cleanup: [NewGRF] Remove unused flag sprites (#10052)
-
-
-12.2 (2022-04-02)
-------------------------------------------------------------------------
-Feature: Remember the last-used signal between games (#9792)
-Change: [MacOS] Allow touchbar usage on all supported OS versions (#9776)
-Change: Add a timestamp in name of crash files (#9761)
-Fix #9736: Duplicate multiplayer window opens upon canceling password entry (#9842)
-Fix: Removing long roads doesn't prioritise refusal of local authority over other errors (#9831)
-Fix #9020: Glitchy station coverage highlight when changing selection (#9825)
-Fix: Correct some Romanian town names (#9819)
-Fix: Original music playback rate was slightly too fast (#9814)
-Fix #9811: Use the NewGRF-defined vehicle center when dragging ships and aircraft (#9812)
-Fix: Do not let shares in the company taking over another company disappear (#9808)
-Fix #9802: Crash when using lots of NewGRF waypoint types (#9803)
-Fix #9766: Don't write uninitialised data in config file (#9767)
-Fix #9743: [MacOS] Don't try to render touchbar sprites with invalid zoom level (#9776)
-Fix #9774: Building roadstop in estimation mode updates station acceptance (#9775)
-Fix: If vehicles only refit to cargo-slots >= 32, the default cargo was wrong (#9744)
-Fix #9735: Possible desync when replacing a depot on same tile (#9738)
-Fix #9730: [Network] Connections can use an invalid socket due to a race condition (#9731)
-Fix: Don't show sign edit window for GS-owned signs (#9716)
-Fix #9702: Display order window for vehicle group on ctrl-click only when using shared orders (#9704)
-Fix #9680: Crash when loading really old savegames with aircraft in certain places (#9699)
-Fix: Update last servicing dates when using the date cheat (#9694)
-Fix: Error message shows about missing glyphs while suitable fallback font is found (#9692)
-
-
-12.1 (2021-11-08)
-------------------------------------------------------------------------
-Feature: Button to toggle showing advanced signal types (#9617)
-Change: Don't show screenshot GUI in screenshots (#9674)
-Change: Suppress panning in intro game, while user is interacting with the GUI (#9645)
-Change: Draw rotor in cursor when dragging helicopters in depots (#9612)
-Fix: Invalid memory access when loading a currency NewGRF (#9675)
-Fix #9579: Object and HQ construction is Construction cost, not Property Maintenance (#9673)
-Fix #9669: Ships exiting a blocked depot/lock could exit in the wrong direction (#9672)
-Fix: Every 16th client never reconnects after server restart (#9666)
-Fix #9643: Screenshots were always written as BMP files (#9644)
-Fix #9630: Intro game could zoom in/out more than allowed by settings (#9633)
-Fix #9626: Incorrect loading of script saved data (#9629)
-Fix: Emergency crash save had the wrong NewGRF list saved in it (#9627)
-Fix #9595: Always use plural forms of cargo for subsidy strings (#9619)
-Fix #9614: Refresh rate dropdown was still active when vsync was enabled (#9618)
-Fix: Don't use 'server address' string in server list when displaying an invite code (#9615)
-
-
-12.0 (2021-10-17)
-------------------------------------------------------------------------
-Add: [Network] Keep the refresh button in lowered state while refreshing (#9600)
-Add: Console command to list search directories for various things (#9583)
-Fix: Try all possible reverse directions when a ship reaches a dead end (#9610)
-Fix: Incorrect Romanian own name (#9598)
-Fix #9591: Update station docking tiles upon placing a water object on a docking tile (#9594)
-Fix #9548: [Squirrel] Crash during engine cleanup after reaching memory limit on realloc (#9592)
-Fix #9588: [Squirrel] Reaching memory limit during script registration could prevent further script detections (#9589)
-Fix: Make ships more likely to find their destination at the cost of slightly worse paths (#9576)
-Change: Reverse ship when leaving docks if a better path exists (#9610)
-Change: Allow all tiles around docks to be docking tiles (#9578)
-
-
-12.0-RC1 (2021-09-25)
-------------------------------------------------------------------------
-Feature: Display icon/text whether vehicle is lost in vehicle (list) window (#9543)
-Feature: [MacOS] Add selected toolbar buttons to MacBook Pro Touch Bar (#9511)
-Feature: Button to open order window from vehicle shared orders window (#9325)
-Feature: Ctrl-Clicking shared order vehicle list opens order window (#9325)
-Feature: Multiple rotating views on title screen (#8980)
-Feature: Hide block signals in GUI by default (#8688)
-Add: [Script] Allow GameScripts to build neutral objects (#9568)
-Add: [Network] Allow sending chat messages via admin port (#9563)
-Add: [AI/GS] Missing water related functions and objects (#8390)
-Fix: Industry funding window did not update when changing funding method (#9572)
-Fix #9562: [NewGRF] Handle case of invalid Action2 with zero results (#9564)
-Fix: Incorrect error messages when placing water in scenario editor (#9560)
-Fix #9484: Update locale currencies settings config map (#9559)
-Fix: Prevent train reversing when entirely inside a train depot (#9557)
-Fix: [Network] Add back 'Spectate' option to company toolbar menu (#9556)
-Fix #9463: [Win32] Work around XAudio2 crashes (#9549)
-Fix #8603: Don't give focus to text filter when opening Object GUI (#9547)
-Fix #9241: Grove and forest tree brushes did not also create rainforest terrain (#9542)
-Fix: [Network] Several crashes in our network code (#9534, #9456)
-Fix #9527: Crash when trying to place multi-tile objects at map edge (#9529)
-Fix: [Network] SendCmdNames only sent one name per packet (#9528)
-Fix #9407: Desync when founding a town nearby a station (#9526)
-Fix #9521: Don't load at just removed docks that were part of a multi-dock station (#9524)
-Fix: Ships always tried to avoid docking tiles when pathfinding (even if nothing was on them) (#9522)
-Fix: [Network] Convert server_advertise to server_game_type in config file (#9515)
-Fix #9490: [Network] A full server couldn't be queried (#9508)
-Fix: [Network] Don't show GameScript " (v0)" for old servers (#9507)
-Fix: [Network] Show query errors in the server listing instead of error popup (#9506)
-Fix: [Network] Crash when last-joined server was no longer available (#9503)
-Fix #9501: [Network] Crash when more than one game-info query was pending (#9502)
-Fix: Wrong error message when building canals over ship depots / locks (#9410)
-Fix: Reduce cost of building canals over objects on sea (#9410)
-Change: [Linkgraph] Delete links only served by vehicles stopped in depot (#9499)
-
-
-12.0-beta2 (2021-08-19)
-------------------------------------------------------------------------
-Feature: [Linkgraph] Prioritize faster routes for passengers, mail and express cargo (#9457)
-Fix: Wrong town window refreshed when building an airport with noise levels enabled (#9497)
-Fix: Improve wording of network-related messages (#9494, #9495, #9500)
-Fix: [Network] Report reuse of invite-code (#9487)
-Fix: [Network] Connecting with the same client name thrice hangs the server (#9485)
-
-
-12.0-beta1 (2021-08-15)
-------------------------------------------------------------------------
-Feature: [Network] Remove lobby window; pressing "Join Game" now immediately joins a server (#9467)
-Feature: [Network] Synchronize server name to clients and display in Online Players window (#9472)
-Feature: [Network] Mention you are a spectator in the status bar (#9471)
-Feature: [Network] No longer require port-forwarding to host a server (#9443, #9447)
-Feature: [Network] Allow setting your server visibility to "invite-only" (#9434)
-Feature: [Network] Join servers based on their invite code (#9432)
-Feature: Raise the maximum NewGRF limit to 255 (#9428)
-Feature: Persistent rotation of numbered auto/netsave after restart (#9395, #9397)
-Feature: [NewGRF] Maximum curve speed modifier for rail vehicles (#9346)
-Feature: Move sensitive information to secrets.cfg and private information to private.cfg (#9298)
-Feature: Signed Windows builds (#9294)
-Feature: [NewGRF] Define refittability of default vehicles using cargo classes (#9148)
-Feature: Configurable subsidy duration, up to 5000 years (#9081)
-Feature: [Network] Rework in-game Online Players window (#9067)
-Feature: [Network] Show previous chat history when the chat message box is open (#9025)
-Feature: Button to reset game settings to their default values (#8958)
-Feature: Press Ctrl to build diagonal rivers in Scenario Editor (#8880)
-Feature: Set wagon replacement per group when using autoreplace (#7441)
-Add: [Network] Open Online Players window on starting/joining a server (#9479)
-Add: [Script] Basic information about loaded NewGRFs for scripts (#9464)
-Add: [AI] Get the number of vehicles in a given group (#9462)
-Add: [Network] Inform network clients what game-script a server is running (#9441)
-Add: Hindi translation (#9086)
-Add: [Network] Ensure players fill in a name instead of defaulting to "Player" (#9080)
-Change: Allow pause/unpause console command in single player (#9342)
-Change: Make savegame format self-descriptive and consistent across all objects (#9322, #9335, #9338, #9339)
-Change: By default, make "unload all" leave stations empty (#9301)
-Change: Reworked the debug levels and messages for network logs (#9230, #9251)
-Change: [Emscripten] Set default scrolling mode to non-pointer-locking (#9191)
-Change: Use neutral pronouns for various strings (#9189, #9203, #9228)
-Change: Make the town directory horizontally resizable (#9157)
-Change: Allow non-ASCII currency separators (#9121)
-Change: [NewGRF] Display a pop-up window for Errors with severity ERROR (#9119)
-Change: Treat languages as finished, if translations are 75% completed (#9019, #9086)
-Change: Disable NewGRF window apply button if no change was made (#8934)
-Fix: [Script] Crash when iterating lists of which the key is larger than 32bit (#9465)
-Fix: [Network] Desync due to use of unstable sort when distributing cargo production (#9460)
-Fix #9440: Negative cargo payments not being handled correctly (#9455)
-Fix: [Network] Crash when joining a server again after a TCP disconnect (#9453)
-Fix: Don't enable rename button for network clients in build vehicle window (#9452)
-Fix: Money could underflow and wrap around (#9451)
-Fix: Parse the console settings the same way as config settings (#9438)
-Fix: Ensure no more than the allowed number of NewGRFs are loaded from the configuration (#9430)
-Fix: [NewGRF] Overflow when determining cargo mask for string code 9A 1E (#9423)
-Fix: Integers for scripts are 64bit, but saved as 32bit (#9415)
-Fix #9392: [Script] Return a valid value with GetBuildWithRefitCapacity even when AIs are maxed out in vehicles (#9393)
-Fix #8169: Crash when autoreplacing vehicle with no orders (#9387)
-Fix: Wrong cargo line position in IndustryCargo window (#9383)
-Fix: Race-condition during startup of NewGRF scan (#9382)
-Fix: Don't propagate Shift/Ctrl state till next game-tick (#9381)
-Fix: Prevent palette updates during copying to the video driver (#9379)
-Fix: [Network] Determining GetNetworkRevisionString could overflow and underflow its buffer (#9372)
-Fix #9358: Don't skip empty files in tar archives (#9367)
-Fix: For old savegames, station bus/truck station cache was not updated (#9366)
-Fix #9353: [Script] Garbage collecting on priority queues could crash the game (#9356)
-Fix: Respect the autosave_on_exit setting for Null video driver (#9343)
-Fix: Compatible NewGRFs in crash-log reported wrong MD5 hash (#9340)
-Fix: [Script] Ensure the saved script strings are properly validated and terminated (#9336)
-Fix #9316: Town bridge length limit check incorrect above 250k inhabitants (#9318)
-Fix: Limit heightmap sizes to 8192x8192 (#9307)
-Fix #9281: Money generating exploit when buying out a company (#9300)
-Fix: Part of a tile might not be redrawn when terraforming (#9296)
-Fix: [OpenGL] Increase timeout when waiting for the GPU to be done with the drawing buffer (#9282)
-Fix: Vehicles sent in the wrong direction if there is no path to the destination (#9280)
-Fix #9264: Do not attach temporary wagons to free wagon chains when autoreplacing (#9278)
-Fix #9267: [Script] Crash during garbage collection (#9275)
-Fix: Encountering two-way red signals could prune unrelated Pathfinder branches (#9271)
-Fix #9255: [Network] Crash when hostname is not found (#9259)
-Fix #9256: Invalid read after free when replacing train chains (#9258)
-Fix: [Emscripten] Force secure WebSockets over HTTPS (#9248)
-Fix #9242: Tree tick handler did not scale by map size (#9246)
-Fix: [Network] Mark server as offline when no longer reachable (#9244)
-Fix: [Network] Don't rebuild the host-list during iterating the list (#9240)
-Fix: [Network] Don't mark the last-joined server as a manually added server (#9239)
-Fix: [Network] Clients leaving because of broken connections was not broadcasted (#9238)
-Fix: [Network] Check on CIDR for netmask check considered everything valid (#9235)
-Fix: Creating screenshots on dedicated servers failed (#9232)
-Fix: Leaking file descriptors for downloaded content (#9229)
-Fix: Spelling of several town names (#9222)
-Fix #9209: Game hangs when resizing highscore/news window if the screen is too small (#9210)
-Fix: [Network] Optimize creating network connections for clients using IPv4 and IPv6 (#9199)
-Fix #9186: Fix incorrect bounding box height causing station sprite glitch (#9187)
-Fix: Truncating strings in settings could leave invalid UTF-8 characters (#9121)
-Fix: Many issues related to window scaling (#9087, #9219)
-Fix: Invalidate cached vehicle colourmaps when changing liveries setting (#9006)
-Fix #8981: Don't attempt to re-reserve path if already entering/entered depot (#9000)
-Fix: Missing 'Town names:' colon in map gen GUI (#8986)
-Fix: Sorting and filtering industries that produce/accept many cargoes (#8468)
-Remove: [Network] COMPANY_INFO packets (#9475)
-Remove: [Network] A server can no longer set a limit to the amount of spectators allowed (#9466)
-Remove: Arbitrary limit on number of statically loaded NewGRFs (#9431)
-Remove: [Network] Language and map-name from server information (#9070)
-
-
 1.11.2 (2021-05-03)
 ------------------------------------------------------------------------
 Change: [Win32] Limit hardware accelerated video driver to OpenGL 3.2 or higher (#9077)
@@ -2609,7 +2294,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: [NewGRF] Additional text in fund industry window is NewGRF supplied and thus should have a default colour (r22631)
 - Fix: Also initialise _old_vds with newgame settings; TTD savegames do not contain these settings [FS#4622] (r22626)
 - Fix: Do not zero the orders of disaster vehicles when converting savegames [FS#4642] (r22625)
-- Fix: When closing an AI company the local player cheated to, we need to cheat them to another company [FS#4654] (r22624, r22623)
+- Fix: When closing an AI company the local player cheated to, we need to cheat him to another company [FS#4654] (r22624, r22623)
 - Fix: When closing down companies their shares in other companies must be sold even if share trading is disabled at that point of time (r22622)
 - Fix: When asking the user to confirm an unsafe unpausing, there is no need to execute a command if 'no' is chosen. This also prevents crashing when clicking unpause while the confirm window is shown (r22621)
 - Fix: Enforce refit orders to be 'always go to depot' orders; service-only and stop-in-depot orders make no sense with refitting [FS#4651] (r22620)
@@ -3331,7 +3016,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Chat message caused glitch when rejoining a network game [FS#3757] (r19629)
 - Fix: Desync when a command is received and in the queue while a client starts joining, i.e. save the game state. This can happen in two ways: with frame_freq > 1 a command received in a previous frame might not be executed yet or when a command is received in the same frame as the join but before the savegame is made. In both cases the joining client would not get all commands to get in-sync with the server (and the other clients) (r19620)
 - Fix: Company related graphs were not updated correctly after changing the company colour [FS#3763] (r19615)
-- Fix: Possible invalid read when server moves client to spectators before they finish joining [FS#3755] (r19613)
+- Fix: Possible invalid read when server moves client to spectators before he finishes joining [FS#3755] (r19613)
 - Fix: Crash when opening a savegame with a waypoint from around 0.4.0 [FS#3756] (r19612)
 - Fix: Improve joining behaviour; kicking clients when entering passwords that was just cleared, 'connection lost' for people failing the password, access restriction circumvention [CVE-2010-0401] [FS#3754] (r19610, r19609, r19608, r19607, r19606)
 - Fix: Desync debugging; false positives in the cache validity checks and saving/loading the command stream (r19619, r19617, r19602, r19601, r19600, r19596, r19593, r19592, r19589, r19587, r19586)
@@ -3686,7 +3371,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Do not account for path reservation costs when entering a signal block via a 'block' signal. This way you will not get double penalties, both red signals and reservation costs, for the block signalled tracks [FS#2722] (r18535)
 - Fix: [NewGRF] An industry NewGRF that defined a too small size for action0 prop 0A could cause a crash (r18527)
 - Fix: Allegro does not like to work with extmidi, so warn the user about that [FS#3272] (r18520)
-- Fix: When you pass a signal at danger, in a PBS controlled area, do not try to do the 'safe' thing and stop, but continue going; the user wanted the train to pass the signal at danger so they have to suffer the consequences. Of course one can always stop the train manually [FS#2891] (r18515)
+- Fix: When you pass a signal at danger, in a PBS controlled area, do not try to do the 'safe' thing and stop, but continue going; the user wanted the train to pass the signal at danger so (s)he has to suffer the consequences. Of course one can always stop the train manually [FS#2891] (r18515)
 - Fix: No error message was created for the first fatal NewGRF error [FS#3368] (r18506)
 - Fix: Improve airport movement on several airports [FS#3169] (r18505)
 - Fix: Autoreplace and autorenew always reset their cargo sub type to 0. Now find a sub cargo type with the exact same name and use that, otherwise fallback to 0. So cargo sub types can be maintained via autoreplace *if* the new vehicle supports the same cargo sub type [FS#3159] (r18499)
@@ -4169,7 +3854,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Make the join/spectate command require to be connected to a network game; in SP it could lead to crashes (r15514)
 - Fix: Generating a map with the original map generator with freeform edges on resulted in a crash [FS#2641] (r15511)
 - Fix: Pre-0.5 OpenTTD stored new_nonstop and full_load_any in a different way, savegame conversion was not working for them (r15500)
-- Fix: Crash when opening the game options when the currently loaded base graphics pack has less than 2 valid graphics files. For example when someone replaces all their original base graphics with custom work (but keeps the name) or renames the dos ones to windows or vice versa [FS#2630] (r15476)
+- Fix: Crash when opening the game options when the currently loaded base graphics pack has less than 2 valid graphics files. For example when someone replaces all his/her original base graphics with custom work (but keeps the name) or renames the dos ones to windows or vice versa [FS#2630] (r15476)
 
 
 0.7.0-beta1 (2009-02-16)
@@ -4931,7 +4616,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Switching players (using the cheat) crashed on Big Endian machines [FS#1150] (r11023)
 - Fix: The canal border determination did not take oil rigs into consideration (r11022)
 - Fix: Do not display income/expenses when they do not belong to a 'valid' tile, like the money cheat/giving money [FS#1175] (r11021)
-- Fix: One could not give money when they had too much money or rather: when casting the amount of money to an int32 becomes negative [FS#1174] (r11020)
+- Fix: One could not give money when (s)he had too much money or rather: when casting the amount of money to an int32 becomes negative [FS#1174] (r11020)
 - Fix: When determining the gender of a string, do not assume that the gender is in the front of the string when there can be case switching code at that location [FS#1104] (r10792)
 - Fix: Determining whether there is a tunnel going under the lowered area is only needed in two directions instead of all four, so take the directions (one for each axis) to the nearest border (along the given axis) [FS#1058] (r10686)
 - Fix: Graphical glitches when the 'link landscape toolbar' patch is turned on when opening one of the construction toolbars [FS#1076] (r10685)
@@ -4992,7 +4677,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Do not unconditionally assume that a tile has a depot (r11027)
 - Fix: Give a more correct error when building some things on tile 0 [FS#1173] (r11024)
 - Fix: Do not display income/expenses when they do not belong to a 'valid' tile, like the money cheat and giving money [FS#1175] (r11021)
-- Fix: One could not give money when they had too much money [FS#1174] (r11020)
+- Fix: One could not give money when (s)he had too much money [FS#1174] (r11020)
 - Fix: Disallow buying/selling shares in your own company or a bankrupt company [FS#1169] (r11018)
 - Fix: Crash when quitting the game in one of the end score windows [FS#1218] (r11071)
 
@@ -5952,7 +5637,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Vehicles slow down under bridge if the track is on a foundation
 - Fix: You can no longer change name of waypoints whom are owned by somebody else
 - Fix: Shares are now also sold when a company goes bankrupt [SF#1090313]
-- Fix: It is no longer possible to crash trains of other companies by building a depot close to a station; trains do no longer enter tiles that do not belong to their owner [SF#1087701]
+- Fix: It is no longer possible to crash trains of other companies by building a depot close to a station; trains do no longer enter tiles that do not belong to his owner [SF#1087701]
 - Fix: Crashed trains are not reported to have too few orders any more [SF#1087403]
 - Fix: Backup-order-list was not closed with an OT_NOTHING, [SF#1086375]
 - Fix: Docks now have a button to display the catchment area [SF#1085255]

cmake/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/CheckAtomic.cmake

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

cmake/CompileFlags.cmake

@@ -4,15 +4,30 @@
 #
 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(
-                /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()
 
@@ -26,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
@@ -39,11 +49,6 @@ macro(compile_flags)
 
     if(MSVC)
         add_compile_options(/W3)
-        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()
     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
@@ -119,10 +124,6 @@ macro(compile_flags)
                 # -flifetime-dse=2 (default since GCC 6) doesn't play
                 # well with our custom pool item allocator
                 "$<$<BOOL:${LIFETIME_DSE_FOUND}>:-flifetime-dse=1>"
-
-                # We have a fight between clang wanting std::move() and gcc not wanting it
-                # and of course they both warn when the other compiler is happy
-                "-Wno-redundant-move"
             )
         endif()
 
@@ -155,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/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

@@ -55,7 +55,7 @@ find_library(LZO_LIBRARY
 # 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 AND LZO_LIBRARY MATCHES "${VCPKG_INSTALLED_DIR}")
+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})

cmake/InstallAndPackage.cmake

@@ -122,8 +122,6 @@ set(CPACK_STRIP_FILES YES)
 set(CPACK_OUTPUT_FILE_PREFIX "bundles")
 
 if(APPLE)
-    # Stripping would produce unreadable stacktraces.
-    set(CPACK_STRIP_FILES NO)
     set(CPACK_GENERATOR "Bundle")
     include(PackageBundle)
 
@@ -131,7 +129,7 @@ if(APPLE)
         set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-universal")
     else()
         set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-${CPACK_SYSTEM_NAME}")
-    endif()
+	endif()
 elseif(WIN32)
     set(CPACK_GENERATOR "ZIP")
     if(OPTION_USE_NSIS)
@@ -140,13 +138,6 @@ elseif(WIN32)
     endif()
 
     set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-windows-${CPACK_SYSTEM_NAME}")
-
-    if(WINDOWS_CERTIFICATE_COMMON_NAME)
-      add_custom_command(TARGET openttd
-        POST_BUILD
-        COMMAND "${CMAKE_SOURCE_DIR}/os/windows/sign.bat" "$<TARGET_FILE:openttd>" "${WINDOWS_CERTIFICATE_COMMON_NAME}"
-      )
-    endif()
 elseif(UNIX)
     # With FHS, we can create deb/rpm/... Without it, they would be horribly broken
     # and not work. The other way around is also true; with FHS they are not
@@ -173,10 +164,6 @@ elseif(UNIX)
 
                 set(CPACK_GENERATOR "DEB")
                 include(PackageDeb)
-            elseif(LSB_RELEASE_ID STREQUAL "Fedora")
-                set(PLATFORM "fedora")
-                set(CPACK_GENERATOR "RPM")
-                include(PackageRPM)
             else()
                 set(UNSUPPORTED_PLATFORM_NAME "LSB-based Linux distribution '${LSB_RELEASE_ID}'")
             endif()
@@ -187,10 +174,6 @@ elseif(UNIX)
             if(DISTRO_ID STREQUAL "arch")
                 set(PLATFORM "arch")
                 set(CPACK_GENERATOR "TXZ")
-            elseif(DISTRO_ID STREQUAL "fedora" OR DISTRO_ID STREQUAL "rhel")
-                set(PLATFORM "fedora")
-                set(CPACK_GENERATOR "RPM")
-                include(PackageRPM)
             else()
                 set(UNSUPPORTED_PLATFORM_NAME "Linux distribution '${DISTRO_ID}' from /etc/os-release")
             endif()

cmake/LinkPackage.cmake

@@ -3,24 +3,21 @@ function(link_package NAME)
 
     if(${NAME}_FOUND)
         string(TOUPPER "${NAME}" UCNAME)
-        # Some libraries have a dash, which is not allowed in a preprocessor macro.
-        string(REPLACE "-" "_" UCNAME "${UCNAME}")
-
         add_definitions(-DWITH_${UCNAME})
         # Some libraries' cmake packages (looking at you, SDL2) leave trailing whitespace in the link commands,
         # which (later) cmake considers to be an error. Work around this with by stripping the incoming string.
         if(LP_TARGET AND TARGET ${LP_TARGET})
             string(STRIP "${LP_TARGET}" LP_TARGET)
-            target_link_libraries(openttd_lib ${LP_TARGET})
+            target_link_libraries(openttd ${LP_TARGET})
             message(STATUS "${NAME} found -- -DWITH_${UCNAME} -- ${LP_TARGET}")
         else()
             string(STRIP "${${NAME}_LIBRARY}" ${NAME}_LIBRARY)
             string(STRIP "${${NAME}_LIBRARIES}" ${NAME}_LIBRARIES)
             include_directories(${${NAME}_INCLUDE_DIRS} ${${NAME}_INCLUDE_DIR})
-            target_link_libraries(openttd_lib ${${NAME}_LIBRARIES} ${${NAME}_LIBRARY})
+            target_link_libraries(openttd ${${NAME}_LIBRARIES} ${${NAME}_LIBRARY})
             message(STATUS "${NAME} found -- -DWITH_${UCNAME} -- ${${NAME}_INCLUDE_DIRS} ${${NAME}_INCLUDE_DIR} -- ${${NAME}_LIBRARIES} ${${NAME}_LIBRARY}")
         endif()
     elseif(LP_ENCOURAGED)
-        message(WARNING "${NAME} not found; compiling OpenTTD without ${NAME} is strongly discouraged")
+        message(WARNING "${NAME} not found; compiling OpenTTD without ${NAME} is strongly disencouraged")
     endif()
 endfunction()

cmake/MSVCFilters.cmake

@@ -3,7 +3,6 @@
 source_group("AI Core" REGULAR_EXPRESSION "src/ai/")
 source_group("Blitters" REGULAR_EXPRESSION "src/blitter/")
 source_group("Core Source Code" REGULAR_EXPRESSION "src/core/")
-source_group("Font Cache" REGULAR_EXPRESSION "src/fontcache/")
 source_group("Game Core" REGULAR_EXPRESSION "src/game/")
 source_group("MD5" REGULAR_EXPRESSION "src/3rdparty/md5/")
 source_group("Misc" REGULAR_EXPRESSION "src/misc/")
@@ -12,13 +11,12 @@ source_group("Network Core" REGULAR_EXPRESSION "src/network/core/")
 source_group("OSX" REGULAR_EXPRESSION "src/os/macosx/")
 source_group("Pathfinder" REGULAR_EXPRESSION "src/pathfinder/")
 source_group("Save/Load handlers" REGULAR_EXPRESSION "src/saveload/")
-source_group("Save/Load handlers\\Compat" REGULAR_EXPRESSION "src/saveload/compat/")
 source_group("Sound" REGULAR_EXPRESSION "src/sound/")
 source_group("Sprite loaders" REGULAR_EXPRESSION "src/spriteloader/")
 source_group("Squirrel" REGULAR_EXPRESSION "src/3rdparty/squirrel/squirrel/")
 source_group("Tables" REGULAR_EXPRESSION "src/table/")
 source_group("Video" REGULAR_EXPRESSION "src/video/")
-source_group("Video\\GL" REGULAR_EXPRESSION "src/3rdparty/opengl/")
+source_group("Video/GL" REGULAR_EXPRESSION "src/3rdparty/opengl/")
 source_group("Widgets" REGULAR_EXPRESSION "src/widgets/")
 source_group("Windows files" REGULAR_EXPRESSION "src/os/windows/|\.rc$")
 

cmake/Options.cmake

@@ -56,7 +56,7 @@ function(set_options)
 
     option(OPTION_DEDICATED "Build dedicated server only (no GUI)" OFF)
     option(OPTION_INSTALL_FHS "Install with Filesystem Hierarchy Standard folders" ${DEFAULT_OPTION_INSTALL_FHS})
-    option(OPTION_USE_ASSERTS "Use assertions; leave enabled for nightlies, betas, and RCs" ON)
+    option(OPTION_USE_ASSERTS "Use assertions; leave enabled for nightlies, betas, and RCs" OFF)
     if(EMSCRIPTEN)
         # Although pthreads is supported, it is not in a way yet that is
         # useful for us.
@@ -71,8 +71,6 @@ function(set_options)
     if (OPTION_DOCS_ONLY)
         set(OPTION_TOOLS_ONLY ON PARENT_SCOPE)
     endif()
-
-    option(OPTION_SURVEY_KEY "Survey-key to use for the opt-in survey (empty if you have none)" "")
 endfunction()
 
 # Show the values of the generic options.
@@ -86,12 +84,6 @@ function(show_options)
     message(STATUS "Option Use assert - ${OPTION_USE_ASSERTS}")
     message(STATUS "Option Use threads - ${OPTION_USE_THREADS}")
     message(STATUS "Option Use NSIS - ${OPTION_USE_NSIS}")
-
-    if(OPTION_SURVEY_KEY)
-        message(STATUS "Option Survey Key - USED")
-    else()
-        message(STATUS "Option Survey Key - NOT USED")
-    endif()
 endfunction()
 
 # Add the definitions for the options that are selected.
@@ -112,8 +104,4 @@ function(add_definitions_based_on_options)
     else()
         add_definitions(-DNDEBUG)
     endif()
-
-    if(OPTION_SURVEY_KEY)
-        add_definitions(-DSURVEY_KEY="${OPTION_SURVEY_KEY}")
-    endif()
 endfunction()

cmake/PackageRPM.cmake

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

cmake/SourceList.cmake

@@ -1,4 +1,12 @@
-function(_add_files_tgt tgt)
+# Add a file to be compiled.
+#
+# add_files([file1 ...] CONDITION condition [condition ...])
+#
+# CONDITION is a complete statement that can be evaluated with if().
+# If it evaluates true, the source files will be added; otherwise not.
+# For example: ADD_IF SDL_FOUND AND Allegro_FOUND
+#
+function(add_files)
     cmake_parse_arguments(PARAM "" "" "CONDITION" ${ARGN})
     set(PARAM_FILES "${PARAM_UNPARSED_ARGUMENTS}")
 
@@ -9,44 +17,10 @@ function(_add_files_tgt tgt)
     endif()
 
     foreach(FILE IN LISTS PARAM_FILES)
-        # Some IDEs are not happy with duplicated filenames, so we detect that before adding the file.
-        get_target_property(${tgt}_FILES ${tgt} SOURCES)
-        if(${tgt}_FILES MATCHES "/${FILE}(;|$)")
-            string(REGEX REPLACE "(^|.+;)([^;]+/${FILE})(;.+|$)" "\\2" RES "${${tgt}_FILES}")
-            # Ignore header files duplicates in 3rdparty.
-            if(NOT (${FILE} MATCHES "\.h" AND (${RES} MATCHES "3rdparty" OR ${CMAKE_CURRENT_SOURCE_DIR} MATCHES "3rdparty")))
-                message(FATAL_ERROR "${tgt}: ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} filename is a duplicate of ${RES}")
-            endif()
-        endif()
-
-        target_sources(${tgt} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE})
+        target_sources(openttd PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE})
     endforeach()
 endfunction()
 
-# Add a file to be compiled.
-#
-# add_files([file1 ...] CONDITION condition [condition ...])
-#
-# CONDITION is a complete statement that can be evaluated with if().
-# If it evaluates true, the source files will be added; otherwise not.
-# For example: ADD_IF SDL_FOUND AND Allegro_FOUND
-#
-function(add_files)
-    _add_files_tgt(openttd_lib ${ARGV})
-endfunction()
-
-# Add a test file to be compiled.
-#
-# add_test_files([file1 ...] CONDITION condition [condition ...])
-#
-# CONDITION is a complete statement that can be evaluated with if().
-# If it evaluates true, the source files will be added; otherwise not.
-# For example: ADD_IF SDL_FOUND AND Allegro_FOUND
-#
-function(add_test_files)
-    _add_files_tgt(openttd_test ${ARGV})
-endfunction()
-
 # This function works around an 'issue' with CMake, where
 # set_source_files_properties() only works in the scope of the file. We want
 # to set properties for the source file on a more global level. To solve this,

cmake/scripts/FindVersion.cmake

@@ -6,6 +6,9 @@ endif()
 if(NOT REV_MINOR)
     set(REV_MINOR 0)
 endif()
+if(NOT REV_BUILD)
+    set(REV_BUILD 0)
+endif()
 
 #
 # Finds the current version of the current folder.
@@ -135,7 +138,7 @@ else()
     configure_file("${CMAKE_SOURCE_DIR}/src/rev.cpp.in"
             "${FIND_VERSION_BINARY_DIR}/rev.cpp")
 
-    if(WINDOWS)
+    if(WIN32)
         message(STATUS "Generating ottdres.rc")
         configure_file("${CMAKE_SOURCE_DIR}/src/os/windows/ottdres.rc.in"
                 "${FIND_VERSION_BINARY_DIR}/ottdres.rc")

cmake/scripts/GenerateWidget.cmake

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

cmake/scripts/Regression.cmake

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

cmake/scripts/SquirrelExport.cmake

@@ -28,27 +28,25 @@ endmacro()
 macro(dump_class_templates NAME)
     string(REGEX REPLACE "^Script" "" REALNAME ${NAME})
 
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<${NAME} *> { static inline ${NAME} *Get(HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, nullptr); return  (${NAME} *)instance; } };")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<${NAME} &> { static inline ${NAME} &Get(HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, nullptr); return *(${NAME} *)instance; } };")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<const ${NAME} *> { static inline const ${NAME} *Get(HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, nullptr); return  (${NAME} *)instance; } };")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<const ${NAME} &> { static inline const ${NAME} &Get(HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, nullptr); return *(${NAME} *)instance; } };")
+    string(APPEND SQUIRREL_EXPORT "\n	template <> inline ${NAME} *GetParam(ForceType<${NAME} *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (${NAME} *)instance; }")
+    string(APPEND SQUIRREL_EXPORT "\n	template <> inline ${NAME} &GetParam(ForceType<${NAME} &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(${NAME} *)instance; }")
+    string(APPEND SQUIRREL_EXPORT "\n	template <> inline const ${NAME} *GetParam(ForceType<const ${NAME} *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (${NAME} *)instance; }")
+    string(APPEND SQUIRREL_EXPORT "\n	template <> inline const ${NAME} &GetParam(ForceType<const ${NAME} &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(${NAME} *)instance; }")
     if("${NAME}" STREQUAL "ScriptEvent")
-        string(APPEND SQUIRREL_EXPORT "\n	template <> struct Return<${NAME} *> { static inline int Set(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; } };")
+        string(APPEND SQUIRREL_EXPORT "\n	template <> inline int Return<${NAME} *>(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; }")
     elseif("${NAME}" STREQUAL "ScriptText")
         string(APPEND SQUIRREL_EXPORT "\n")
-        string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<Text *> {")
-        string(APPEND SQUIRREL_EXPORT "\n		static inline Text *Get(HSQUIRRELVM vm, int index) {")
-        string(APPEND SQUIRREL_EXPORT "\n			if (sq_gettype(vm, index) == OT_INSTANCE) {")
-        string(APPEND SQUIRREL_EXPORT "\n				return Param<ScriptText *>::Get(vm, index);")
-        string(APPEND SQUIRREL_EXPORT "\n			}")
-        string(APPEND SQUIRREL_EXPORT "\n			if (sq_gettype(vm, index) == OT_STRING) {")
-        string(APPEND SQUIRREL_EXPORT "\n				return new RawText(Param<const std::string &>::Get(vm, index));")
-        string(APPEND SQUIRREL_EXPORT "\n			}")
-        string(APPEND SQUIRREL_EXPORT "\n			return nullptr;")
+        string(APPEND SQUIRREL_EXPORT "\n	template <> inline Text *GetParam(ForceType<Text *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) {")
+        string(APPEND SQUIRREL_EXPORT "\n		if (sq_gettype(vm, index) == OT_INSTANCE) {")
+        string(APPEND SQUIRREL_EXPORT "\n			return GetParam(ForceType<ScriptText *>(), vm, index, ptr);")
         string(APPEND SQUIRREL_EXPORT "\n		}")
-        string(APPEND SQUIRREL_EXPORT "\n	};")
+        string(APPEND SQUIRREL_EXPORT "\n		if (sq_gettype(vm, index) == OT_STRING) {")
+        string(APPEND SQUIRREL_EXPORT "\n			return new RawText(GetParam(ForceType<const char *>(), vm, index, ptr));")
+        string(APPEND SQUIRREL_EXPORT "\n		}")
+        string(APPEND SQUIRREL_EXPORT "\n		return nullptr;")
+        string(APPEND SQUIRREL_EXPORT "\n	}")
     else()
-        string(APPEND SQUIRREL_EXPORT "\n	template <> struct Return<${NAME} *> { static inline int Set(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; } };")
+        string(APPEND SQUIRREL_EXPORT "\n	template <> inline int Return<${NAME} *>(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; }")
     endif()
 endmacro()
 
@@ -299,8 +297,8 @@ foreach(LINE IN LISTS SOURCE_LINES)
                 endif()
                 string(APPEND SQUIRREL_EXPORT "\n	/* Allow enums to be used as Squirrel parameters */")
                 foreach(ENUM IN LISTS ENUMS)
-                    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<${ENUM}> { static inline ${ENUM} Get(HSQUIRRELVM vm, int index) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (${ENUM})tmp; } };")
-                    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Return<${ENUM}> { static inline int Set(HSQUIRRELVM vm, ${ENUM} res) { sq_pushinteger(vm, res); return 1; } };")
+                    string(APPEND SQUIRREL_EXPORT "\n	template <> inline ${ENUM} GetParam(ForceType<${ENUM}>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (${ENUM})tmp; }")
+                    string(APPEND SQUIRREL_EXPORT "\n	template <> inline int Return<${ENUM}>(HSQUIRRELVM vm, ${ENUM} res) { sq_pushinteger(vm, (int32)res); return 1; }")
                 endforeach()
             endif()
 
@@ -332,19 +330,19 @@ foreach(LINE IN LISTS SOURCE_LINES)
         endif()
 
         string(APPEND SQUIRREL_EXPORT "\n")
-        string(APPEND SQUIRREL_EXPORT "\ntemplate <> const char *GetClassName<${CLS}, ScriptType::${APIUC}>() { return \"${API_CLS}\"; }")
+        string(APPEND SQUIRREL_EXPORT "\ntemplate <> const char *GetClassName<${CLS}, ST_${APIUC}>() { return \"${API_CLS}\"; }")
         string(APPEND SQUIRREL_EXPORT "\n")
 
         # Then do the registration functions of the class.
         string(APPEND SQUIRREL_EXPORT "\nvoid SQ${API_CLS}_Register(Squirrel *engine)")
         string(APPEND SQUIRREL_EXPORT "\n{")
-        string(APPEND SQUIRREL_EXPORT "\n	DefSQClass<${CLS}, ScriptType::${APIUC}> SQ${API_CLS}(\"${API_CLS}\");")
+        string(APPEND SQUIRREL_EXPORT "\n	DefSQClass<${CLS}, ST_${APIUC}> SQ${API_CLS}(\"${API_CLS}\");")
         if("${SUPER_CLS}" STREQUAL "Text" OR "${SUPER_CLS}" STREQUAL "ScriptObject" OR "${SUPER_CLS}" STREQUAL "AIAbstractiveList::Valuator")
             string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PreRegister(engine);")
         else()
             string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PreRegister(engine, \"${API_SUPER_CLS}\");")
         endif()
-        if(NOT "${SUPER_CLS}" MATCHES "^ScriptEvent")
+        if(NOT "${SUPER_CLS}" STREQUAL "ScriptEvent")
             if("${CLS_PARAM_2}" STREQUAL "v")
                 string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.AddSQAdvancedConstructor(engine);")
             else()
@@ -627,12 +625,10 @@ foreach(LINE IN LISTS SOURCE_LINES)
                     string(APPEND TYPES "p")
                 elseif("${PARAM}" MATCHES "^Array")
                     string(APPEND TYPES "a")
-                elseif("${PARAM}" MATCHES "^const Array")
+                elseif("${PARAM}" MATCHES "^struct Array")
                     string(APPEND TYPES "a")
                 elseif("${PARAM}" MATCHES "^Text")
                     string(APPEND TYPES ".")
-                elseif("${PARAM}" MATCHES "^std::string")
-                    string(APPEND TYPES ".")
                 else()
                     string(APPEND TYPES "x")
                 endif()

cmake/scripts/SquirrelIncludes.cmake

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

docs/company_colour_indexes.html

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

docs/directory_structure.md

@@ -19,14 +19,14 @@ your operating system:
     - Windows:
         - `C:\My Documents\OpenTTD` (95, 98, ME)
         - `C:\Documents and Settings\<username>\My Documents\OpenTTD` (2000, XP)
-        - `C:\Users\<username>\Documents\OpenTTD` (Vista, 7, 8.1, 10, 11)
+        - `C:\Users\<username>\Documents\OpenTTD` (Vista, 7, 8.1, 10)
     - macOS: `~/Documents/OpenTTD`
     - Linux: `$XDG_DATA_HOME/openttd` which is usually `~/.local/share/openttd`
        when built with XDG base directory support, otherwise `~/.openttd`
 3. The shared directory
     - Windows:
         - `C:\Documents and Settings\All Users\Shared Documents\OpenTTD` (2000, XP)
-        - `C:\Users\Public\Documents\OpenTTD` (Vista, 7, 8.1, 10, 11)
+        - `C:\Users\Public\Documents\OpenTTD` (Vista, 7, 8.1, 10)
     - macOS: `/Library/Application Support/OpenTTD`
     - Linux: not available
 4. The binary directory (where the OpenTTD executable is)

docs/eints.md

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

docs/game_coordinator.md

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

docs/landscape.html

@@ -807,6 +807,8 @@
       </table>
      </li>
      <li>m2 bits 5..4: ground density</li>
+     <li>m2 bits 3..0: update counter, incremented on every periodic processing.<br>
+          on wraparound the growth status is updated (or, if it's <tt>3</tt>, a random action is taken)</li>
      <li>m3 bits 7..0: type of trees:
       <table>
        <tr>
@@ -996,7 +998,6 @@
      <li>m7: animation frame (railway stations/waypoints, airports)</li>
      <li>m8 bits 11..6: <a href="#TramType">Tramtype</a></li>
      <li>m8 bits 5..0: <a href="#TrackType">track type</a> for railway stations/waypoints</li>
-     <li>m8 bits 5..0: custom road stop id; 0 means standard graphics</li>
     </ul>
    </td>
   </tr>

docs/landscape_grid.html

@@ -79,7 +79,7 @@ the array so you can quickly see what is used and what is not.
     <tr>
       <td rowspan="2">0</td>
       <td class="caption">ground</td>
-      <td class="bits" rowspan=27><span class="used" title="Tile type">XXXX</span> <span class="used" title="Presence and direction of bridge above">XX</span> <span class="used" title="Tropic Zone: only meaningful in tropic climate. It contains the definition of the available zones">XX</span></td>
+      <td class="bits" rowspan=27><span class="used" title="Tile type">XXXX</span> <span class="used" title="Presence and direction of bridge above">XX</span> <span class="used" title="Tropic Zone: only meaningfull in tropic climate. It contains the definition of the available zones">XX</span></td>
       <td class="bits" rowspan=27><span class="used" title="Tile height">XXXX XXXX</span></td>
       <td class="bits" rowspan=2><span class="free">OOO</span><span class="usable" title="Owner (always OWNER_NONE)">1 OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
@@ -203,7 +203,7 @@ the array so you can quickly see what is used and what is not.
       <td class="bits"><span class="usable" title="Graphics index">OOOO O</span><span class="used" title="Graphics index: 00 (exit towards NE), 01 (exit towards SE), 02 (exit towards SW), 03 (exit towards NW), 04 (drive through X), 05 (drive through Y)">XXX</span></td>
       <td class="bits" rowspan=5><span class="free">OO</span><span class="used" title="Station type">XX X</span><span class="free">OOO</span></td>
       <td class="bits"><span class="free">OOO</span><span class="used" title="Owner of road">X XXXX</span></td>
-      <td class="bits"><span class="free">OOOO</span> <span class="used" title="Tram type">XXXX XX</span> <span class="used" title="Custom road stops specifications ID">XXXXXX</span></td>
+      <td class="bits"><span class="free">OOOO</span> <span class="used" title="Tram type">XXXX XX<span class="free">OO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">airport</td>

docs/multiplayer.md

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

docs/openttd.6

@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd August 12, 2023
+.Dd October 13, 2014
 .Dt OPENTTD 6
 .Os
 .Sh NAME
@@ -8,7 +8,7 @@
 .Nd open source clone of the Microprose game \(lqTransport Tycoon Deluxe\(rq
 .Sh SYNOPSIS
 .Nm
-.Op Fl efhQxX
+.Op Fl efhx
 .Op Fl b Ar blitter
 .Op Fl c Ar config_file
 .Op Fl d Op Ar level | Ar cat Ns = Ns Ar lvl Ns Op , Ns Ar ...
@@ -19,7 +19,7 @@
 .Op Fl l Ar host Ns Op : Ns Ar port
 .Op Fl m Ar driver
 .Op Fl M Ar musicset
-.Op Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar company
+.Op Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar player
 .Op Fl p Ar password
 .Op Fl P Ar password
 .Op Fl q Ar savegame
@@ -29,7 +29,7 @@
 .Op Fl t Ar year
 .Op Fl v Ar driver
 .Sh OPTIONS
-.Bl -tag -width "-n host[:port][#company]"
+.Bl -tag -width "-n host[:port][#player]"
 .It Fl b Ar blitter
 Select the blitter
 .Ar blitter ;
@@ -83,8 +83,10 @@ see
 .Fl h
 for a full list.
 .It Fl l Ar host Ns Op : Ns Ar port
-Redirect debug output; see
-.Fl d .
+Redirect
+.Fn DEBUG
+output; see
+.Fl D .
 .It Fl m Ar driver
 Select the music driver
 .Ar driver ;
@@ -97,8 +99,8 @@ Select the music set
 see
 .Fl h
 for a full list.
-.It Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar company
-Join a network game, optionally specifying a port to connect to and company to
+.It Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar player
+Join a network game, optionally specifying a port to connect to and player to
 play as.
 .It Fl p Ar password
 Password used to join server.
@@ -110,14 +112,6 @@ Only useful with
 .Fl n .
 .It Fl q Ar savegame
 Write some information about the specified savegame and exit.
-.It Fl Q
-Don't scan for/load NewGRF files on startup.
-.Pp
-Passing
-.Fl Q
-twice (so,
-.Fl QQ
-) will disable NewGRF scanning/loading entirely.
 .It Fl r Ar width Ns x Ns Ar height
 Set the resolution to
 .Ar width
@@ -147,8 +141,6 @@ see
 for a full list.
 .It Fl x
 Do not automatically save to config file on exit.
-.It Fl X
-Do not use global folders to search for files.
 .El
 .Sh SEE ALSO
 .Lk https://wiki.openttd.org "Wiki"

docs/releasing_openttd.md

@@ -1,48 +0,0 @@
-# Releasing OpenTTD
-
-This guide is for OpenTTD developers/maintainers, to release a new version of OpenTTD.
-
-## Step 0: Branch or Backport
-
-* If this is a beta version release, skip this step.
-
-* If this is an RC1 (first Release Candidate) build, create a new branch `release/nn` where `nn` is the major version number, then apply changes similar to [PR#9573](https://github.com/OpenTTD/OpenTTD/pull/9573). You also need to forwardport the changelog, as in [PR#10113](https://github.com/OpenTTD/OpenTTD/pull/10113).
-  * Update CMakeLists.txt
-  * Add a new (empty) AI compatibility script in bin/ai/
-  * Add the new version to CheckAPIVersion in src/ai/ai_info.cpp + src/game/game_info.cpp
-  * Add the new version to src/script/api/ai_changelog.hpp + src/script/api/game_changelog.hpp
-  * Update the version of regression in bin/ai/regression/regression_info.nut
-  * Add a note to src/saveload/saveload.h about which savegame version is used in the branch.
-
-* If this is a later RC or release build and the release branch already exists, you'll need to backport fixes and language from master to this branch, which were merged after the branch diverged from master. You can use these two helper scripts: https://github.com/OpenTTD/scripts/tree/main/backport
-
-## Step 1: Prepare changelog documentation
-
-1. Update the [changelog](../changelog.txt) with new changes since the last release.
-   * Changelog entries are typically PR titles, but can be edited to be more helpful without context.
-   * Don't include fixes to things which haven't previously been released (like fixes to features which are in the same changelog).
-   * Order the entries by importance: `Feature > Add > Change > Fix`, then numerically by PR number.
-2. Create a changelog PR, get approval, and merge.
-   * For beta releases, target master, otherwise target the release branch.
-
-## Step 2: Prepare website release announcement
-
-1. Go to https://github.com/OpenTTD/website/new/main/_posts and write a new announcement post. See a [previous example](https://github.com/OpenTTD/website/pull/238) for a template.
-2. Create a new branch for this post and open a PR for it.
-3. Write announcement text for socials like Forum/Discord/Twitter/Reddit and include it in the PR.
-4. Create a Steam news image for that post and include it in the PR.
-5. Check the website post (preview link via checks page) and make corrections. We usually just use the GitHub web interface for this and squash the result later.
-6. Get this PR approved, but do not merge yet.
-
-## Step 3: Make the actual OpenTTD release
-
-1. Go to https://github.com/OpenTTD/OpenTTD/releases/new and create a new tag matching the release number. For the body of the release, see any older release. "Set as a pre-release" for a beta or RC, set as latest for a real release.
-2. Merge website PR.
-3. Wait for the OpenTTD release checks to be complete.
-4. Check that website links to the new release are working and correct, using the [staging website](https://www-staging.openttd.org/).
-5. If this is a full release, ask orudge to update the Microsoft Store and TrueBrain to move the release from the "testing" to "default" branch on Steam.
-
-## Step 4: Tell the world
-
-1. Tag and create a website release to trigger the actions that update the website.
-2. After the website is live, make announcements on social media. You may need to coordinate with other developers who can make posts on Twitter, Reddit, Steam, and GOG.