(svn r20267) -Release: 1.0.3

- Fix: Make it possible to properly assess the length of the rail toolbar caption, don't require '{WHITE}' control codes (r20242)
- Fix: Check for disallowed level crossings also when converting rail (r20237)
- Fix: Haiku uses a 'special' location for headers (r20219)
- Fix: Desync due to (temporary) wrong railtype; when loading a savegame the railtype of some (high ID) trains could be wrong [FS#3945] (r20137)

.dorpsgek.yml

@@ -1,13 +0,0 @@
-notifications:
-  push:
-    irc:
-      - openttd
-      - openttd.notice
-  pull-request:
-    irc:
-      - openttd
-      - openttd.notice
-  issue:
-    irc:
-      - openttd
-      - openttd.notice

.editorconfig

@@ -1,9 +0,0 @@
-root = true
-
-[*]
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{c,cpp,h,hpp}]
-indent_style = tab
-charset = utf-8

.github/ISSUE_TEMPLATE.md

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

.github/stale.yml

@@ -1,34 +0,0 @@
-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.

.gitignore

@@ -4,33 +4,29 @@ bin/ai/*
 !bin/ai/compat*.nut
 !bin/ai/regression
 !bin/data
-bin/baseset/*
-!bin/baseset/openttd.grf
-!bin/baseset/opntitle.dat
-!bin/baseset/orig_extra.grf
-!bin/baseset/orig_*.obg
-!bin/baseset/orig_*.obs
-!bin/baseset/no_sound.obs
-!bin/baseset/no_music.obm
-!bin/baseset/orig_*.obm
+bin/data/*
+!bin/data/openttdd.grf
+!bin/data/openttdw.grf
+!bin/data/opntitle.dat
+!bin/data/orig_*.obg
+!bin/data/orig_*.obs
+!bin/data/no_sound.obs
+!bin/gm
+bin/gm/*
+!bin/gm/no_music.obm
+!bin/gm/orig_*.obm
 !bin/scripts
 bin/scripts/*
 !bin/scripts/*.example
 !bin/scripts/readme.txt
 
-*.aps
 bundle/*
 bundles/*
 docs/aidocs/*
-docs/gamedocs/*
 docs/source/*
-.kdev4
-.kdev4/*
-*.kdev4
 media/openttd.desktop
 media/openttd.desktop.install
 objs/*
-projects/.vs
 projects/Debug
 projects/Release
 projects/*.ncb
@@ -39,8 +35,6 @@ projects/*.sdf
 projects/*.opensdf
 projects/*.vcproj.*.user
 projects/*.vcxproj.user
-projects/*.VC.db
-projects/*.VC.opendb
 src/rev.cpp
 src/os/windows/ottdres.rc
 

.hgignore

@@ -1,8 +1,5 @@
 syntax: glob
 
-.svn
-*.aps
-bin/baseset/openttd.32.bmp
 bin/lang/*
 bin/openttd*
 bin/*.cfg
@@ -12,18 +9,13 @@ config.cache*
 config.log
 config.pwd
 docs/aidocs/*
-docs/gamedocs/*
 docs/source/*
-.kdev4
-.kdev4/*
-*.kdev4
 Makefile
 Makefile.am
 Makefile.bundle
 media/openttd.desktop
 media/openttd.desktop.install
 objs/*
-projects/.vs
 projects/*.ncb
 projects/*.suo
 projects/*.sdf

CONTRIBUTING.md

@@ -1,181 +0,0 @@
-
-# Contributing to OpenTTD
-
-Looking to contribute something to OpenTTD? **Here's how you can help.**
-
-Please take a moment to review this document in order to make the contribution process easy and effective for everyone involved.
-
-Following these guidelines helps to communicate that you respect the time of the developers managing and developing this open source project. In return, they should reciprocate that respect in addressing your issue or assessing patches and features.
-
-
-## Using the issue tracker
-
-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/IRC_channel), 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.
-
-* Please **do not** post comments consisting solely of "+1" or ":thumbsup:".
-Use [GitHub's "reactions" feature](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) instead. 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/IRC_channel) or the [forums](https://www.tt-forums.net/) to discuss these.
-
-## Bug reports
-
-A bug is a _demonstrable problem_ that is caused by the code in the repository.
-Good bug reports are extremely helpful, so thanks!
-
-Guidelines for bug reports:
-
-0. Please don't report issues with games where you changed NewGRFs.
-
-1. Please don't report issues with modified versions of OpenTTD (patchpacks and similar).
-
-2. **Use the GitHub issue search** --- check if the issue has already been
-reported.
-
-3. **Check if the issue has been fixed** --- try to reproduce it using the latest `nightly` build of OpenTTD, available from https://www.openttd.org
-
-4. **Isolate the problem** --- ideally create reproduceable steps with an attached savegame and screenshots. Try to use few or no NewGRFs, AIs etc if possible.
-
-A good bug report shouldn't leave others needing to chase you up for more information.
-Please try to be as detailed as possible in your report.
-
-* What is your environment?
-* What steps will reproduce the issue?
-* Which operating system(s) experience the problem?
-* What would you expect to be the outcome?
-
-All these details will help people to fix any potential bugs.
-
-Example:
-
-> Short and descriptive example bug report title
->
-> A summary of the issue and the OS environment in which it occurs. If
-> suitable, include the steps required to reproduce the bug.
->
-> 1. This is the first step
-> 2. This is the second step
-> 3. Further steps, etc.
->
-> Attached savegame
-> Attached screenshots showing the issue
-> Crashlogs if the bug causes a crash
->
-> Any other information you want to share that is relevant to the issue being
-> reported. This might include the lines of code that you have identified as
-> causing the bug, and potential solutions (and your opinions on their
-> merits).
-
-## Feature requests
-
-Before opening a feature request, please take a moment to find out whether your idea fits with the scope and aims of the project.
-
-It's up to *you* to make a strong case to convince the project's developers of the merits of this feature.
-
-Please provide as much detail and context as possible. This means don't request for a solution, but describe the problem you see and how/why you think it should be fixed.
-
-For feature request we have a strict policy.
-
-Keeping issues around with "a good idea" or "not really a bug but we should maybe fix it" turns out to have the reversed effect: nobody looks at it anymore.
-
-Although we really appreciate feedback and ideas, we will close feature requests that we don't expect to fulfill in the next year.
-
-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 discuss in [irc](https://wiki.openttd.org/IRC_channel) 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
-
-Good pull requests—patches, improvements, new features—are a fantastic help.
-They should remain focused in scope and avoid containing unrelated commits.
-
-**Please ask first** before embarking on any significant pull request (e.g. implementing features, refactoring code, porting to a different language), otherwise you risk spending a lot of time working on something that the project's developers might not want to merge into the project.
-
-Please adhere to the [coding guidelines](#code-guidelines) used throughout the project (indentation, accurate comments, etc.) and any other requirements (such as test coverage).
-
-Adhering to the following process is the best way to get your work included in the project:
-
-1. [Fork](https://help.github.com/fork-a-repo/) the project, clone your fork, and configure the remotes:
-
-```bash
-git clone https://github.com/<your-username>/OpenTTD.git openttd
-git clone https://github.com/OpenTTD/OpenTTD-git-hooks.git openttd_hooks
-cd openttd
-git remote add upstream https://github.com/OpenTTD/OpenTTD.git
-cd .git/hooks
-ln -s ../../../openttd_hooks/hooks/* .
-```
-
-2. If you cloned a while ago, get the latest changes from upstream:
-
-```bash
-git fetch upstream
-```
-
-3. Create a new topic branch (off the main project development branch) to
-contain your feature, change, or fix:
-
-```bash
-git checkout upstream/master -b <topic-branch-name>
-```
-
-4. Commit your changes in logical chunks. Please adhere to these [git commit message guidelines](https://wiki.openttd.org/Commit_style#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:
-
-```bash
-git fetch upstream
-git rebase upstream/master
-```
-
-6. Push your topic branch up to your fork the first time:
-
-```bash
-git push --set-upstream origin <topic-branch-name>
-```
-
-And any time after that:
-
-```bash
-git push
-```
-
-7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) with a clear title and description against the `master` branch.
-
-**IMPORTANT**: By submitting a patch, you agree to the [License](#license).
-
-### Privacy Notice
-
-We would like to make you aware that contributing to OpenTTD via git will permanently store the name and email address you provide as well as the actual changes and the time and date you made it inside git's version history.
-
-This is inevitable, because it is a main feature of git. If you are concerned about your privacy, we strongly recommend to use "Anonymous &lt;anonymous@openttd.org&gt;" as the git commit author. We might refuse anonymous contributions if malicious intent is suspected.
-
-Please note that the contributor identity, once given, is used for copyright verification and to provide proof should a malicious commit be made. As such, the [EU GDPR](https://www.eugdpr.org/key-changes.html) "right to be forgotten" does not apply, as this is an overriding legitimate interest.
-
-Please also note that your commit is public and as such will potentially be processed by many third-parties. Git's distributed nature makes it impossible to track where exactly your commit, and thus your personal data, will be stored and be processed. If you would not like to accept this risk, please do either commit anonymously or refrain from contributing to the OpenTTD project.
-
-### Pull request validation
-
-Continuous integration (CI) tools monitor pull requests, and help us identify build and code quality issues.
-
-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.
-
-## Code guidelines
-
-[Code style](https://wiki.openttd.org/Coding_style) must be adhered to for pull requests to be accepted
-
-## License
-
-By contributing your code, you agree to license your contribution under the [GPL v2](https://github.com/OpenTTD/OpenTTD/blob/master/COPYING).
-
-### Attribution of this Contributing Guide
-
-This contributing guide is adapted from [Bootstrap](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) under the [Creative Commons Attribution 3.0 Unported License](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE) terms for Bootstrap documentation.
-The GDPR notice is adapted from [rsyslog](https://github.com/rsyslog/rsyslog/blob/master/CONTRIBUTING.md) under the [GNU General Public License](https://github.com/rsyslog/rsyslog/blob/master/COPYING).

COPYING

@@ -1,7 +1,3 @@
-This is the license which applies to OpenTTD with the exception of some
-3rd party modules. See README.md for details
-
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 

Doxyfile

@@ -8,14 +8,9 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = OpenTTD
-PROJECT_NUMBER         =
-PROJECT_BRIEF          =
-PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = docs/source/
-CREATE_SUBDIRS         = YES
-ALLOW_UNICODE_NAMES    = NO
+CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
@@ -37,42 +32,22 @@ STRIP_FROM_PATH        = ./
 STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
-QT_AUTOBRIEF           = NO
 MULTILINE_CPP_IS_BRIEF = NO
 INHERIT_DOCS           = YES
-SEPARATE_MEMBER_PAGES  = NO
+DISTRIBUTE_GROUP_DOC   = NO
 TAB_SIZE               = 2
 ALIASES                =
-TCL_SUBST              =
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
-OPTIMIZE_FOR_FORTRAN   = NO
-OPTIMIZE_OUTPUT_VHDL   = NO
-EXTENSION_MAPPING      =
-MARKDOWN_SUPPORT       = YES
-TOC_INCLUDE_HEADINGS   = 0
-AUTOLINK_SUPPORT       = YES
-BUILTIN_STL_SUPPORT    = NO
-CPP_CLI_SUPPORT        = NO
-SIP_SUPPORT            = NO
-IDL_PROPERTY_SUPPORT   = YES
-DISTRIBUTE_GROUP_DOC   = NO
-GROUP_NESTED_COMPOUNDS = NO
 SUBGROUPING            = YES
-INLINE_GROUPED_CLASSES = NO
-INLINE_SIMPLE_STRUCTS  = NO
-TYPEDEF_HIDES_STRUCT   = NO
-LOOKUP_CACHE_SIZE      = 0
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 EXTRACT_ALL            = NO
 EXTRACT_PRIVATE        = YES
-EXTRACT_PACKAGE        = NO
 EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
 EXTRACT_LOCAL_METHODS  = YES
-EXTRACT_ANON_NSPACES   = YES
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -80,17 +55,11 @@ HIDE_IN_BODY_DOCS      = NO
 INTERNAL_DOCS          = NO
 CASE_SENSE_NAMES       = YES
 HIDE_SCOPE_NAMES       = NO
-HIDE_COMPOUND_REFERENCE= NO
 SHOW_INCLUDE_FILES     = YES
-SHOW_GROUPED_MEMB_INC  = NO
-FORCE_LOCAL_INCLUDES   = NO
 INLINE_INFO            = YES
 SORT_MEMBER_DOCS       = YES
 SORT_BRIEF_DOCS        = NO
-SORT_MEMBERS_CTORS_1ST = NO
-SORT_GROUP_NAMES       = NO
 SORT_BY_SCOPE_NAME     = NO
-STRICT_PROTO_MATCHING  = NO
 GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
@@ -98,27 +67,22 @@ GENERATE_DEPRECATEDLIST= YES
 ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
-SHOW_FILES             = YES
-SHOW_NAMESPACES        = YES
+SHOW_DIRECTORIES       = YES
 FILE_VERSION_FILTER    =
-LAYOUT_FILE            =
-CITE_BIB_FILES         =
 #---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
+# configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 QUIET                  = NO
 WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
-WARN_AS_ERROR          = NO
 WARN_FORMAT            = "$file:$line: $text"
 WARN_LOGFILE           =
 #---------------------------------------------------------------------------
-# Configuration options related to the input files
+# configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = ./src/
-INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.c \
                          *.cc \
                          *.cxx \
@@ -129,38 +93,31 @@ FILE_PATTERNS          = *.c \
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = */3rdparty \
-                         */script/api
-EXCLUDE_SYMBOLS        =
+EXCLUDE_PATTERNS       = */3rdparty */.svn
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = ./docs/
+IMAGE_PATH             =
 INPUT_FILTER           =
 FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
-FILTER_SOURCE_PATTERNS =
-USE_MDFILE_AS_MAINPAGE =
 #---------------------------------------------------------------------------
-# Configuration options related to source browsing
+# configuration options related to source browsing
 #---------------------------------------------------------------------------
 SOURCE_BROWSER         = YES
 INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = YES
 REFERENCED_BY_RELATION = YES
 REFERENCES_RELATION    = YES
-REFERENCES_LINK_SOURCE = YES
-SOURCE_TOOLTIPS        = YES
-USE_HTAGS              = NO
 VERBATIM_HEADERS       = YES
 #---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
+# 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
+# configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
 HTML_OUTPUT            = html
@@ -168,58 +125,19 @@ HTML_FILE_EXTENSION    = .html
 HTML_HEADER            =
 HTML_FOOTER            =
 HTML_STYLESHEET        =
-HTML_EXTRA_STYLESHEET  =
-HTML_EXTRA_FILES       =
-HTML_COLORSTYLE_HUE    = 220
-HTML_COLORSTYLE_SAT    = 100
-HTML_COLORSTYLE_GAMMA  = 80
-HTML_TIMESTAMP         = NO
-HTML_DYNAMIC_MENUS     = YES
-HTML_DYNAMIC_SECTIONS  = NO
-HTML_INDEX_NUM_ENTRIES = 100
-GENERATE_DOCSET        = NO
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-DOCSET_PUBLISHER_NAME  = Publisher
-GENERATE_HTMLHELP      = NO
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = YES
 CHM_FILE               =
 HHC_LOCATION           =
 GENERATE_CHI           = NO
-CHM_INDEX_ENCODING     =
 BINARY_TOC             = NO
 TOC_EXPAND             = YES
-GENERATE_QHP           = NO
-QCH_FILE               =
-QHP_NAMESPACE          = org.doxygen.Project
-QHP_VIRTUAL_FOLDER     = doc
-QHP_CUST_FILTER_NAME   =
-QHP_CUST_FILTER_ATTRS  =
-QHP_SECT_FILTER_ATTRS  =
-QHG_LOCATION           =
-GENERATE_ECLIPSEHELP   = NO
-ECLIPSE_DOC_ID         = org.doxygen.Project
 DISABLE_INDEX          = NO
-GENERATE_TREEVIEW      = YES
 ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = YES
 TREEVIEW_WIDTH         = 250
-EXT_LINKS_IN_WINDOW    = NO
-FORMULA_FONTSIZE       = 10
-FORMULA_TRANSPARENT    = YES
-USE_MATHJAX            = NO
-MATHJAX_FORMAT         = HTML-CSS
-MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/
-MATHJAX_EXTENSIONS     =
-MATHJAX_CODEFILE       =
-SEARCHENGINE           = NO
-SERVER_BASED_SEARCH    = NO
-EXTERNAL_SEARCH        = NO
-SEARCHENGINE_URL       =
-SEARCHDATA_FILE        = searchdata.xml
-EXTERNAL_SEARCH_ID     =
-EXTRA_SEARCH_MAPPINGS  =
 #---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
+# configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 GENERATE_LATEX         = NO
 LATEX_OUTPUT           = latex
@@ -229,18 +147,12 @@ COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
 EXTRA_PACKAGES         =
 LATEX_HEADER           =
-LATEX_FOOTER           =
-LATEX_EXTRA_STYLESHEET =
-LATEX_EXTRA_FILES      =
 PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
 LATEX_HIDE_INDICES     = NO
-LATEX_SOURCE_CODE      = NO
-LATEX_BIB_STYLE        = plain
-LATEX_TIMESTAMP        = NO
 #---------------------------------------------------------------------------
-# Configuration options related to the RTF output
+# configuration options related to the RTF output
 #---------------------------------------------------------------------------
 GENERATE_RTF           = NO
 RTF_OUTPUT             = rtf
@@ -248,33 +160,27 @@ COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 RTF_EXTENSIONS_FILE    =
-RTF_SOURCE_CODE        = NO
 #---------------------------------------------------------------------------
-# Configuration options related to the man page output
+# configuration options related to the man page output
 #---------------------------------------------------------------------------
 GENERATE_MAN           = NO
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
-MAN_SUBDIR             =
 MAN_LINKS              = NO
 #---------------------------------------------------------------------------
-# Configuration options related to the XML output
+# configuration options related to the XML output
 #---------------------------------------------------------------------------
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
+XML_SCHEMA             =
+XML_DTD                =
 XML_PROGRAMLISTING     = YES
 #---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-GENERATE_DOCBOOK       = NO
-DOCBOOK_OUTPUT         = docbook
-DOCBOOK_PROGRAMLISTING = NO
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
+# configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 GENERATE_AUTOGEN_DEF   = NO
 #---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
+# configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 GENERATE_PERLMOD       = NO
 PERLMOD_LATEX          = NO
@@ -289,67 +195,42 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = ENABLE_NETWORK \
-                         WITH_ZLIB \
-                         WITH_LZO \
-                         WITH_LZMA \
-                         WITH_SDL \
-                         WITH_PNG \
-                         WITH_FONTCONFIG \
-                         WITH_FREETYPE \
-                         WITH_ICU_SORT \
-                         WITH_ICU_LAYOUT \
-                         UNICODE \
-                         _UNICODE \
-                         _GNU_SOURCE \
-                         FINAL=
+PREDEFINED             = ENABLE_NETWORK ENABLE_AI WITH_ZLIB WITH_LZO WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
-# Configuration options related to external references
+# Configuration::additions related to external references
 #---------------------------------------------------------------------------
 TAGFILES               =
-GENERATE_TAGFILE       = objs/openttd.tag
+GENERATE_TAGFILE       = openttd.tag
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
-EXTERNAL_PAGES         = YES
 PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = YES
-MSCGEN_PATH            =
-DIA_PATH               =
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = NO
-DOT_NUM_THREADS        = 0
-DOT_FONTNAME           = Helvetica
-DOT_FONTSIZE           = 10
-DOT_FONTPATH           =
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
 GROUP_GRAPHS           = YES
 UML_LOOK               = NO
-UML_LIMIT_NUM_FIELDS   = 10
 TEMPLATE_RELATIONS     = NO
 INCLUDE_GRAPH          = YES
 INCLUDED_BY_GRAPH      = YES
 CALL_GRAPH             = NO
-CALLER_GRAPH           = NO
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
-INTERACTIVE_SVG        = NO
 DOT_PATH               =
 DOTFILE_DIRS           =
-MSCFILE_DIRS           =
-DIAFILE_DIRS           =
-PLANTUML_JAR_PATH      =
-PLANTUML_CFG_FILE      =
-PLANTUML_INCLUDE_PATH  =
-DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 1000
 DOT_TRANSPARENT        = NO
 DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO

Makefile.bundle.in

@@ -10,32 +10,36 @@
 #
 
 # The revision is needed for the bundle name and creating an OSX application bundle.
+ifdef REVISION
+REV := $(REVISION)
+else
 # Detect the revision
 VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
-VERSION  := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
+REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
+endif
 
-# Make sure we have something in VERSION
-ifeq ($(VERSION),)
-VERSION := norev000
+# Make sure we have something in REV
+ifeq ($(REV),)
+REV := norev000
 endif
 
 ifndef BUNDLE_NAME
-BUNDLE_NAME = openttd-custom-$(VERSION)-$(OS)
+BUNDLE_NAME = openttd-custom-$(REV)-$(OS)
 endif
 
 # An OSX application bundle needs the data files, lang files and openttd executable in a different location.
 ifdef OSXAPP
-AI_DIR      = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai
-GAME_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/game
-BASESET_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/baseset
-LANG_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
-TTD_DIR     = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
+AI_DIR   = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai
+DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
+LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
+GM_DIR   = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/gm
+TTD_DIR  = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
 else
-AI_DIR      = $(BUNDLE_DIR)/ai
-GAME_DIR    = $(BUNDLE_DIR)/game
-BASESET_DIR = $(BUNDLE_DIR)/baseset
-LANG_DIR    = $(BUNDLE_DIR)/lang
-TTD_DIR     = $(BUNDLE_DIR)
+AI_DIR   = $(BUNDLE_DIR)/ai
+DATA_DIR = $(BUNDLE_DIR)/data
+LANG_DIR = $(BUNDLE_DIR)/lang
+GM_DIR   = $(BUNDLE_DIR)/gm
+TTD_DIR  = $(BUNDLE_DIR)
 endif
 
 bundle: all
@@ -47,32 +51,32 @@ bundle: all
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
 	$(Q)mkdir -p "$(TTD_DIR)"
 	$(Q)mkdir -p "$(AI_DIR)"
-	$(Q)mkdir -p "$(GAME_DIR)"
-	$(Q)mkdir -p "$(BASESET_DIR)"
+	$(Q)mkdir -p "$(DATA_DIR)"
 	$(Q)mkdir -p "$(LANG_DIR)"
+	$(Q)mkdir -p "$(GM_DIR)"
 ifdef OSXAPP
 	$(Q)mkdir -p "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources"
 	$(Q)echo "APPL????" >                                          "$(BUNDLE_DIR)/$(OSXAPP)/Contents/PkgInfo"
 	$(Q)cp    "$(ROOT_DIR)/os/macosx/openttd.icns"                 "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/openttd.icns"
-	$(Q)$(ROOT_DIR)/os/macosx/plistgen.sh                          "$(BUNDLE_DIR)/$(OSXAPP)" "$(VERSION)"
-	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(BASESET_DIR)"
-endif
-ifeq ($(OS),UNIX)
-	$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(BASESET_DIR)/"
+	$(Q)$(ROOT_DIR)/os/macosx/plistgen.sh                          "$(BUNDLE_DIR)/$(OSXAPP)" "$(REV)"
+	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(DATA_DIR)"
 endif
 	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
 	$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut       "$(AI_DIR)/"
-	$(Q)cp "$(BIN_DIR)/game/"compat_*.nut     "$(GAME_DIR)/"
-	$(Q)cp "$(BIN_DIR)/baseset/"*.grf         "$(BASESET_DIR)/"
-	$(Q)cp "$(BIN_DIR)/baseset/"*.obg         "$(BASESET_DIR)/"
-	$(Q)cp "$(BIN_DIR)/baseset/"*.obs         "$(BASESET_DIR)/"
-	$(Q)cp "$(BIN_DIR)/baseset/opntitle.dat"  "$(BASESET_DIR)/"
-	$(Q)cp "$(BIN_DIR)/baseset/"*.obm         "$(BASESET_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/"*.obg            "$(DATA_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/"*.obs            "$(DATA_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/opntitle.dat"     "$(DATA_DIR)/"
 	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
-	$(Q)cp "$(ROOT_DIR)/README.md"           "$(BUNDLE_DIR)/"
+	$(Q)cp "$(BIN_DIR)/gm/"*.obm              "$(GM_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/readme.txt"           "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/docs/obg_format.txt"  "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/obm_format.txt"  "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/obs_format.txt"  "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/32bpp.txt"       "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/"
 ifdef MAN_DIR
 	$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
@@ -84,15 +88,15 @@ endif
 	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
 ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | LC_ALL=C $(SORT) |  $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(BUNDLE_DIR)/media/openttd.desktop"
+	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) >> "$(BUNDLE_DIR)/media/openttd.desktop"
 	$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
 ifeq ($(TTD), openttd.exe)
-	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/README.md" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
+	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
 ifeq ($(OS), DOS)
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
 ifndef STRIP
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.exe"   "$(TTD_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.exe"   "$(TTD_DIR)/"
 endif
 endif
 endif
@@ -135,13 +139,6 @@ bundle_lzma: bundle
 	$(Q)cd "$(BUNDLES_DIR)/.lzma" && tar --lzma -c$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.lzma" "$(BUNDLE_NAME)"
 	$(Q)rm -rf   "$(BUNDLES_DIR)/.lzma"
 
-bundle_xz: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.xz'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/.xz/$(BUNDLE_NAME)"
-	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.xz/$(BUNDLE_NAME)/"
-	$(Q)cd "$(BUNDLES_DIR)/.xz" && tar --xz -c$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.xz" "$(BUNDLE_NAME)"
-	$(Q)rm -rf   "$(BUNDLES_DIR)/.xz"
-
 bundle_lha: bundle
 	@echo '[BUNDLE] Creating $(BUNDLE_NAME).lha'
 	$(Q)mkdir -p "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)"
@@ -151,15 +148,15 @@ bundle_lha: bundle
 
 bundle_dmg: bundle
 	@echo '[BUNDLE] Creating $(BUNDLE_NAME).dmg'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/OpenTTD $(VERSION)"
-	$(Q)cp -R "$(BUNDLE_DIR)/" "$(BUNDLES_DIR)/OpenTTD $(VERSION)"
-	$(Q)hdiutil create -ov -format UDZO -srcfolder "$(BUNDLES_DIR)/OpenTTD $(VERSION)" "$(BUNDLES_DIR)/$(BUNDLE_NAME).dmg"
-	$(Q)rm -fr "$(BUNDLES_DIR)/OpenTTD $(VERSION)"
+	$(Q)mkdir -p "$(BUNDLES_DIR)/OpenTTD $(REV)"
+	$(Q)cp -R "$(BUNDLE_DIR)/" "$(BUNDLES_DIR)/OpenTTD $(REV)"
+	$(Q)hdiutil create -ov -format UDZO -srcfolder "$(BUNDLES_DIR)/OpenTTD $(REV)" "$(BUNDLES_DIR)/$(BUNDLE_NAME).dmg"
+	$(Q)rm -fr "$(BUNDLES_DIR)/OpenTTD $(REV)"
 
 bundle_exe: all
 	@echo '[BUNDLE] Creating $(BUNDLE_NAME).exe'
 	$(Q)mkdir -p "$(BUNDLES_DIR)"
-	$(Q)unix2dos "$(ROOT_DIR)/docs/"*.txt "$(ROOT_DIR)/README.md" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt"
+	$(Q)unix2dos "$(ROOT_DIR)/docs/"* "$(ROOT_DIR)/readme.txt" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt"
 	$(Q)cd $(ROOT_DIR)/os/windows/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi
 	$(Q)mv $(ROOT_DIR)/os/windows/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe"
 
@@ -171,11 +168,13 @@ install: bundle
 	@echo '[INSTALL] Installing OpenTTD'
 	$(Q)install -d "$(INSTALL_BINARY_DIR)"
 	$(Q)install -d "$(INSTALL_ICON_DIR)"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/ai"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/game"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/baseset"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/scripts"
+	$(Q)install -d "$(INSTALL_DOC_DIR)"
 ifeq ($(TTD), openttd.exe)
 	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}.exe"
 else
@@ -183,21 +182,12 @@ else
 endif
 	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/ai/"* "$(INSTALL_DATA_DIR)/ai"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/game/"* "$(INSTALL_DATA_DIR)/game"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/baseset/"* "$(INSTALL_DATA_DIR)/baseset"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/gm/"* "$(INSTALL_DATA_DIR)/gm"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts"
-ifndef DO_NOT_INSTALL_DOCS
-	$(Q)install -d "$(INSTALL_DOC_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/README.md" "$(BUNDLE_DIR)/known-bugs.txt" "$(INSTALL_DOC_DIR)"
-endif
-ifndef DO_NOT_INSTALL_CHANGELOG
-	$(Q)install -d "$(INSTALL_DOC_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/changelog.txt" "$(INSTALL_DOC_DIR)"
-endif
-ifndef DO_NOT_INSTALL_LICENSE
-	$(Q)install -d "$(INSTALL_DOC_DIR)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DOC_DIR)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/"*.txt "$(INSTALL_DOC_DIR)"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/COPYING" "$(INSTALL_DOC_DIR)"
-endif
 	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.xpm" "$(INSTALL_ICON_DIR)/${BINARY_NAME}.32.xpm"
 ifdef ICON_THEME_DIR
 	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)"
@@ -217,11 +207,9 @@ else
 	$(Q)install -m 644 "$(BUNDLE_DIR)/media/"*.png "$(INSTALL_ICON_DIR)"
 endif
 ifdef MAN_DIR
-ifndef DO_NOT_INSTALL_MAN
 	$(Q)install -d "$(INSTALL_MAN_DIR)"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6.gz"
 endif
-endif
 ifdef MENU_DIR
 	$(Q)install -d "$(INSTALL_MENU_DIR)"
 	$(Q)install -m 644 "$(ROOT_DIR)/media/openttd.desktop.install" "$(INSTALL_MENU_DIR)/${BINARY_NAME}.desktop"

Makefile.grf.in

@@ -1,118 +0,0 @@
-# $Id$
-
-# 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/>.
-#
-# Building requires GRFCodec.
-#
-# Recent versions (including sources) can be found at:
-#  http://www.openttd.org/download-grfcodec
-#
-# The mercurial repository can be found at:
-#  http://hg.openttdcoop.org/grfcodec
-#
-
-
-ROOT_DIR = !!ROOT_DIR!!
-GRF_DIR  = $(ROOT_DIR)/media/extra_grf
-BASESET_DIR = $(ROOT_DIR)/media/baseset
-LANG_DIR = $(ROOT_DIR)/src/lang
-BIN_DIR  = !!BIN_DIR!!/baseset
-OBJS_DIR = !!GRF_OBJS_DIR!!
-OS       = !!OS!!
-STAGE    = !!STAGE!!
-
-# Check if we want to show what we are doing
-ifdef VERBOSE
-	Q =
-	E = @true
-else
-	Q = @
-	E = @echo
-endif
-
-GRFCODEC := !!GRFCODEC!!
-NFORENUM := !!NFORENUM!!
-CC_BUILD := !!CC_BUILD!!
-MD5SUM   := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum")
-
-# Some "should not be changed" settings.
-NFO_FILES    := $(GRF_DIR)/*.nfo $(GRF_DIR)/rivers/*.nfo
-PNG_FILES    := $(GRF_DIR)/*.png $(GRF_DIR)/rivers/*.png
-
-# List of target files.
-OBT_FILES    := $(BIN_DIR)/orig_dos.obg
-OBT_FILES    += $(BIN_DIR)/orig_dos_de.obg
-OBT_FILES    += $(BIN_DIR)/orig_win.obg
-OBT_FILES    += $(BIN_DIR)/orig_dos.obs
-OBT_FILES    += $(BIN_DIR)/orig_win.obs
-OBT_FILES    += $(BIN_DIR)/no_sound.obs
-OBT_FILES    += $(BIN_DIR)/orig_dos.obm
-OBT_FILES    += $(BIN_DIR)/orig_win.obm
-OBT_FILES    += $(BIN_DIR)/no_music.obm
-OBT_FILES    += $(BIN_DIR)/orig_tto.obm
-
-# Build the GRF.
-all: $(OBT_FILES)
-ifdef GRFCODEC
-all: $(BIN_DIR)/openttd.grf $(BIN_DIR)/orig_extra.grf
-endif
-
-$(OBJS_DIR)/langfiles.tmp: $(LANG_DIR)/*.txt
-	$(E) '$(STAGE) Collecting baseset translations'
-	$(Q) cat $^ > $@
-
-$(BIN_DIR)/%.obg: $(BASESET_DIR)/%.obg $(BIN_DIR)/orig_extra.grf $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
-	$(E) '$(STAGE) Updating $(notdir $@)'
-	$(Q) sed 's/^ORIG_EXTRA.GRF    = *[0-9a-f]*$$/ORIG_EXTRA.GRF    = '`$(MD5SUM) $(BIN_DIR)/orig_extra.grf | sed 's@ .*@@'`'/' $< > $@.tmp
-	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $@.tmp >$@
-	$(Q) rm $@.tmp
-
-$(BIN_DIR)/%.obs: $(BASESET_DIR)/%.obs $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
-	$(E) '$(STAGE) Updating $(notdir $@)'
-	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
-
-$(BIN_DIR)/%.obm: $(BASESET_DIR)/%.obm $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
-	$(E) '$(STAGE) Updating $(notdir $@)'
-	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
-
-# Guard against trying to run GRFCODEC/NFORENUM without either being set.
-ifdef GRFCODEC
-ifdef NFORENUM
-
-# Compile extra grf
-$(BIN_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(GRF_DIR)/assemble_nfo.awk
-	$(E) '$(STAGE) Assembling openttd.nfo'
-	$(Q)-mkdir -p $(OBJS_DIR)/sprites
-	$(Q)-cp $(PNG_FILES) $(OBJS_DIR)/sprites 2> /dev/null
-	$(Q) awk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/openttd.nfo > $(OBJS_DIR)/sprites/openttd.nfo
-	$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/openttd.nfo
-	$(E) '$(STAGE) Compiling openttd.grf'
-	$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/openttd.grf
-	$(Q)cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf
-
-# The copy operation of PNG_FILES is duplicated from the target 'openttd.grf', thus those targets may not run in parallel.
-$(BIN_DIR)/orig_extra.grf: $(PNG_FILES) $(NFO_FILES) $(GRF_DIR)/assemble_nfo.awk | $(BIN_DIR)/openttd.grf
-	$(E) '$(STAGE) Assembling orig_extra.nfo'
-	$(Q)-mkdir -p $(OBJS_DIR)/sprites
-	$(Q)-cp $(PNG_FILES) $(OBJS_DIR)/sprites 2> /dev/null
-	$(Q) awk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/orig_extra.nfo > $(OBJS_DIR)/sprites/orig_extra.nfo
-	$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/orig_extra.nfo
-	$(E) '$(STAGE) Compiling orig_extra.grf'
-	$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/orig_extra.grf
-	$(Q)cp $(OBJS_DIR)/orig_extra.grf $(BIN_DIR)/orig_extra.grf
-
-endif
-endif
-
-# Clean up temporary files.
-clean:
-	$(Q)rm -f *.bak *.grf $(OBT_FILES)
-
-# Clean up temporary files
-mrproper: clean
-	$(Q)rm -fr sprites
-
-.PHONY: all mrproper depend clean

Makefile.in

@@ -41,6 +41,7 @@ TTDS        = $(SRC_DIRS:%=%/$(TTD))
 OS          = !!OS!!
 OSXAPP      = !!OSXAPP!!
 LIPO        = !!LIPO!!
+REVISION    = !!REVISION!!
 AWK         = !!AWK!!
 SORT        = !!SORT!!
 DISTCC      = !!DISTCC!!
@@ -53,7 +54,7 @@ ifdef DISTCC
 	@if [ -z "`echo '$(MFLAGS)' | grep '\-j'`" ]; then echo; echo "WARNING: you enabled distcc support, but you don't seem to be using the -jN paramter"; echo; fi
 endif
 	@for dir in $(DIRS); do \
-		$(MAKE) -C $$dir all || exit 1; \
+		$(MAKE) -C $$dir all; \
 	done
 ifdef LIPO
 # Lipo is an OSX thing. If it is defined, it means we are building for universal,
@@ -125,13 +126,6 @@ lang:
 mrproper:
 	@for dir in $(DIRS); do \
 		$(MAKE) -C $$dir mrproper; \
-	done
-# Don't be tempted to merge these two for loops. Doing that breaks make
-# --dry-run, since make has this "feature" that it always runs commands
-# containing $(MAKE), even when --dry-run is passed. The objective is of
-# course to also get a dry-run of submakes, but make is not smart enough
-# to see that a for loop runs both a submake and an actual command.
-	@for dir in $(DIRS); do \
 		rm -f $$dir/Makefile; \
 	done
 	$(Q)rm -rf objs
@@ -144,16 +138,15 @@ mrproper:
 # output of profiling
 	$(Q)rm -f $(BIN_DIR)/gmon.out
 # output of generating 'API' documentation
+	$(Q)rm -f $(ROOT_DIR)/openttd.tag
 	$(Q)rm -rf $(ROOT_DIR)/docs/source
+# output of generating AI API documentation
+	$(Q)rm -f $(SRC_DIR)/ai/api/openttd.tag
 	$(Q)rm -rf $(ROOT_DIR)/docs/aidocs
-	$(Q)rm -rf $(ROOT_DIR)/docs/gamedocs
 # directories created by OpenTTD on regression testing
 	$(Q)rm -rf $(BIN_DIR)/ai/regression/content_download $(BIN_DIR)/ai/regression/save $(BIN_DIR)/ai/regression/scenario
 distclean: mrproper
 
-maintainer-clean: distclean
-	$(Q)rm -f $(BIN_DIR)/baseset/openttd.grf $(BIN_DIR)/baseset/orig_extra.grf $(BIN_DIR)/baseset/*.obg $(BIN_DIR)/baseset/*.obs $(BIN_DIR)/baseset/*.obm
-
 depend:
 	@for dir in $(SRC_DIRS); do \
 		$(MAKE) -C $$dir depend; \

Makefile.lang.in

@@ -6,6 +6,7 @@
 # See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 
 STRGEN        = !!STRGEN!!
+ENDIAN_CHECK  = !!ENDIAN_CHECK!!
 SRC_DIR       = !!SRC_DIR!!
 LANG_DIR      = !!LANG_DIR!!
 BIN_DIR       = !!BIN_DIR!!
@@ -13,7 +14,6 @@ LANGS_SRC     = $(shell ls $(LANG_DIR)/*.txt)
 LANGS         = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
 CXX_BUILD     = !!CXX_BUILD!!
 CFLAGS_BUILD  = !!CFLAGS_BUILD!!
-CXXFLAGS_BUILD= !!CXXFLAGS_BUILD!!
 LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
 STRGEN_FLAGS  = !!STRGEN_FLAGS!!
 STAGE         = !!STAGE!!
@@ -24,6 +24,11 @@ ifeq ($(LANG_SUPPRESS), yes)
 LANG_ERRORS = >/dev/null 2>&1
 endif
 
+# Make sure endian_host.h is reachable as if it was in the src/ dir
+CFLAGS_BUILD += -I $(LANG_OBJS_DIR)
+
+ENDIAN_TARGETS := endian_host.h endian_target.h $(ENDIAN_CHECK)
+
 # Check if we want to show what we are doing
 ifdef VERBOSE
 	Q =
@@ -37,33 +42,25 @@ RES := $(shell mkdir -p $(BIN_DIR)/lang )
 
 all: table/strings.h $(LANGS)
 
-strgen_base.o: $(SRC_DIR)/strgen/strgen_base.cpp $(SRC_DIR)/strgen/strgen.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h $(SRC_DIR)/safeguards.h
+strgen.o: $(SRC_DIR)/strgen/strgen.cpp endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
-strgen.o: $(SRC_DIR)/strgen/strgen.cpp $(SRC_DIR)/strgen/strgen.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h $(SRC_DIR)/safeguards.h
+string.o: $(SRC_DIR)/string.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
-string.o: $(SRC_DIR)/string.cpp $(SRC_DIR)/safeguards.h
+alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
-
-alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp $(SRC_DIR)/safeguards.h
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
-
-getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/safeguards.h
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
 lang/english.txt: $(LANG_DIR)/english.txt
 	$(Q)mkdir -p lang
 	$(Q)cp $(LANG_DIR)/english.txt lang/english.txt
 
-$(STRGEN): alloc_func.o string.o strgen_base.o strgen.o getoptdata.o
+$(STRGEN): alloc_func.o string.o strgen.o
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $^ -o $@
+	$(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@
 
 table/strings.h: lang/english.txt $(STRGEN)
 	$(E) '$(STAGE) Generating $@'
@@ -74,11 +71,21 @@ $(LANGS): %.lng: $(LANG_DIR)/%.txt $(STRGEN) lang/english.txt
 	$(E) '$(STAGE) Compiling language $(*F)'
 	$(Q)./$(STRGEN) $(STRGEN_FLAGS) -s $(LANG_DIR) -d $(LANG_OBJS_DIR) $< $(LANG_ERRORS) && cp $@ $(BIN_DIR)/lang || true # Do not fail all languages when one fails
 
+# The targets to compile the endian-code
+
+endian_host.h: $(ENDIAN_CHECK)
+	$(E) '$(STAGE) Testing endianness for host'
+	$(Q)./$(ENDIAN_CHECK) > $@
+
+$(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
+	$(E) '$(STAGE) Compiling and Linking $@'
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $< -o $@
+
 depend:
 
 clean:
 	$(E) '$(STAGE) Cleaning up language files'
-	$(Q)rm -f strgen_base.o strgen.o string.o alloc_func.o getoptdata.o table/strings.h $(STRGEN) $(LANGS) $(LANGS:%=$(BIN_DIR)/lang/%) lang/english.*
+	$(Q)rm -f strgen.o string.o table/strings.h $(STRGEN) $(LANGS) $(LANGS:%=$(BIN_DIR)/lang/%) lang/english.* $(ENDIAN_TARGETS)
 
 mrproper: clean
 	$(Q)rm -rf $(BIN_DIR)/lang

Makefile.msvc

@@ -27,21 +27,9 @@ SRC_DIR     = "$(ROOT_DIR)/src"
 BUNDLE_DIR  = "$(ROOT_DIR)/bundle"
 BUNDLES_DIR = "$(ROOT_DIR)/bundles"
 TTD         = openttd.exe
-PDB         = openttd.pdb
-MODE        = Release
 TARGET     := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")
 
 all:
-	$(Q)cp objs/$(TARGET)/$(MODE)/$(TTD) $(BIN_DIR)/$(TTD)
+	$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)
 
 include Makefile.bundle.in
-
-bundle_pdb:
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).pdb.xz'
-	$(Q)mkdir -p "$(BUNDLES_DIR)"
-	$(Q)cp objs/$(TARGET)/Release/$(PDB) $(BUNDLES_DIR)/$(BUNDLE_NAME).pdb
-	$(Q)xz -9 $(BUNDLES_DIR)/$(BUNDLE_NAME).pdb
-
-regression: all
-	$(Q)cp bin/$(TTD) bin/openttd
-	$(Q)cd bin && sh ai/regression/run.sh

Makefile.setting.in

@@ -1,65 +0,0 @@
-# $Id$
-
-# 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/>.
-
-SETTINGSGEN      = !!SETTINGSGEN!!
-SRC_DIR          = !!SRC_DIR!!
-CXX_BUILD        = !!CXX_BUILD!!
-CFLAGS_BUILD     = !!CFLAGS_BUILD!!
-CXXFLAGS_BUILD   = !!CXXFLAGS_BUILD!!
-LDFLAGS_BUILD    = !!LDFLAGS_BUILD!!
-STAGE            = !!STAGE!!
-SETTING_OBJS_DIR = !!SETTING_OBJS_DIR!!
-
-# Check if we want to show what we are doing
-ifdef VERBOSE
-	Q =
-	E = @true
-else
-	Q = @
-	E = @echo
-endif
-
-all: table/settings.h
-
-settingsgen.o: $(SRC_DIR)/settingsgen/settingsgen.cpp $(SRC_DIR)/string_func.h $(SRC_DIR)/strings_type.h $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/ini_type.h $(SRC_DIR)/core/smallvec_type.hpp $(SRC_DIR)/safeguards.h
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
-
-alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp $(SRC_DIR)/safeguards.h
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
-
-getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/safeguards.h
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
-
-string.o: $(SRC_DIR)/string.cpp $(SRC_DIR)/safeguards.h
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
-
-ini_load.o: $(SRC_DIR)/ini_load.cpp $(SRC_DIR)/core/alloc_func.hpp $(SRC_DIR)/core/mem_func.hpp $(SRC_DIR)/ini_type.h $(SRC_DIR)/string_func.h $(SRC_DIR)/safeguards.h
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
-
-$(SETTINGSGEN): alloc_func.o string.o ini_load.o settingsgen.o getoptdata.o
-	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $^ -o $@
-
-table/settings.h: $(SETTINGSGEN) $(SRC_DIR)/table/settings.h.preamble $(SRC_DIR)/table/settings.h.postamble $(SRC_DIR)/table/*.ini
-	$(E) '$(STAGE) Generating $@'
-	@mkdir -p table
-	$(Q)./$(SETTINGSGEN) -o table/settings.h -b $(SRC_DIR)/table/settings.h.preamble -a $(SRC_DIR)/table/settings.h.postamble $(SRC_DIR)/table/*.ini
-
-depend:
-
-clean:
-	$(E) '$(STAGE) Cleaning up settings files'
-	$(Q)rm -f settingsgen.o alloc_func.o getoptdata.o string.o ini_load.o $(SETTINGSGEN) table/settings.h
-
-mrproper: clean
-
-.PHONY: all mrproper depend clean

Makefile.src.in

@@ -23,21 +23,24 @@ BIN_DIR        = !!BIN_DIR!!
 LANG_DIR       = !!LANG_DIR!!
 SRC_OBJS_DIR   = !!SRC_OBJS_DIR!!
 LANG_OBJS_DIR  = !!LANG_OBJS_DIR!!
-SETTING_OBJS_DIR= !!SETTING_OBJS_DIR!!
 SRC_DIR        = !!SRC_DIR!!
 SCRIPT_SRC_DIR = !!SCRIPT_SRC_DIR!!
 MEDIA_DIR      = !!MEDIA_DIR!!
 TTD            = !!TTD!!
 STRGEN         = !!STRGEN!!
+ENDIAN_CHECK   = !!ENDIAN_CHECK!!
 DEPEND         = !!DEPEND!!
+ENDIAN_FORCE   = !!ENDIAN_FORCE!!
 OS             = !!OS!!
 STAGE          = !!STAGE!!
 MAKEDEPEND     = !!MAKEDEPEND!!
 CFLAGS_MAKEDEP = !!CFLAGS_MAKEDEP!!
 SORT           = !!SORT!!
+REVISION       = !!REVISION!!
 AWK            = !!AWK!!
 CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
 CONFIG_CACHE_LINKER   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
+CONFIG_CACHE_ENDIAN   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_ENDIAN!!
 CONFIG_CACHE_SOURCE   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_SOURCE!!
 CONFIG_CACHE_VERSION  = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_VERSION!!
 
@@ -49,16 +52,19 @@ OBJS     := $(OBJS_C) $(OBJS_CPP) $(OBJS_MM) $(OBJS_RC)
 SRCS     := !!SRCS!!
 
 # All C-files depend on those 3 files
-FILE_DEP := $(CONFIG_CACHE_COMPILER)
+FILE_DEP := $(CONFIG_CACHE_COMPILER) endian_target.h
 # Create all dirs and subdirs
 RES      := $(shell mkdir -p $(BIN_DIR) $(sort $(dir $(OBJS))))
 
-CFLAGS += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR) -I $(SETTING_OBJS_DIR)
-CFLAGS_MAKEDEP += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR) -I $(SETTING_OBJS_DIR)
+# Make sure endian_target.h is reasable as if it was in the src/ dir
+CFLAGS += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR)
+CFLAGS_MAKEDEP += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR)
 ifdef SCRIPT_SRC_DIR
 	CFLAGS_MAKEDEP += -I $(SCRIPT_SRC_DIR)
 endif
 
+ENDIAN_TARGETS := endian_target.h $(ENDIAN_CHECK)
+
 # Check if we want to show what we are doing
 ifdef VERBOSE
 	Q =
@@ -87,29 +93,33 @@ $(LANG_OBJS_DIR)/table/strings.h: $(LANG_DIR)/english.txt $(LANG_OBJS_DIR)/$(STR
 VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
 MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d'	')
 
+ifdef REVISION
+# Use specified revision (which should be of the form "r000").
+REV := $(REVISION)
+REV_NR := $(shell echo $(REVISION) | sed "s@[^0-9]@@g")
+else
 # Use autodetected revisions
-VERSION  := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
-ISODATE  := $(shell echo "$(VERSIONS)" | cut -f 2 -d'	')
-GITHASH  := $(shell echo "$(VERSIONS)" | cut -f 4 -d'	')
-ISTAG    := $(shell echo "$(VERSIONS)" | cut -f 5 -d'	')
-ISSTABLETAG := $(shell echo "$(VERSIONS)" | cut -f 6 -d'	')
-
-# Make sure we have something in VERSION and ISODATE
-ifeq ($(VERSION),)
-VERSION := norev000
+REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
+REV_NR   := $(shell echo "$(VERSIONS)" | cut -f 2 -d'	')
 endif
-ifeq ($(ISODATE),)
-ISODATE := 00000000
+
+# Make sure we have something in REV and REV_NR
+ifeq ($(REV),)
+REV := norev000
+endif
+ifeq ($(REV_NR),)
+REV_NR := 0
 endif
 
 # This helps to recompile if flags change
-RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CFLAGS) $(CXXFLAGS)" ]; then echo "$(CFLAGS) $(CXXFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CXXFLAGS) $(CFLAGS)" ]; then echo "$(CXXFLAGS) $(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
 RES := $(shell if [ "`cat $(CONFIG_CACHE_LINKER) 2>/dev/null`" != "$(LDFLAGS) $(LIBS)" ]; then echo "$(LDFLAGS) $(LIBS)" > $(CONFIG_CACHE_LINKER); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_ENDIAN) 2>/dev/null`" != "$(ENDIAN_FORCE)" ]; then echo "$(ENDIAN_FORCE)" > $(CONFIG_CACHE_ENDIAN); fi )
 
 # If there is a change in the source-file-list, make sure we recheck the deps
 RES := $(shell if [ "`cat $(CONFIG_CACHE_SOURCE) 2>/dev/null`" != "$(SRCS)" ]; then echo "$(SRCS)" > $(CONFIG_CACHE_SOURCE); fi )
 # If there is a change in the revision, make sure we recompile rev.cpp
-RES := $(shell if [ "`cat $(CONFIG_CACHE_VERSION) 2>/dev/null`" != "$(VERSION) $(MODIFIED)" ]; then echo "$(VERSION) $(MODIFIED)" > $(CONFIG_CACHE_VERSION); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_VERSION) 2>/dev/null`" != "$(REV) $(MODIFIED)" ]; then echo "$(REV) $(MODIFIED)" > $(CONFIG_CACHE_VERSION); fi )
 
 ifndef MAKEDEPEND
 # The slow, but always correct, dep-check
@@ -117,7 +127,7 @@ DEP_MASK := %.d
 DEPS     := $(OBJS:%.o=%.d)
 
 # Only include the deps if we are compiling everything
-ifeq ($(filter %.o clean mrproper, $(MAKECMDGOALS)),)
+ifeq ($(filter $(ENDIAN_TARGETS) %.o clean mrproper, $(MAKECMDGOALS)),)
 -include $(DEPS)
 else
 # In case we want to compile a single target, include the .d file for it
@@ -135,7 +145,7 @@ $(OBJS_C:%.o=%.d): %.d: $(SRC_DIR)/%.c $(FILE_DEP)
 
 $(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
+	$(Q)$(CXX_HOST) $(CXXFLAGS) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
 
 $(OBJS_MM:%.o=%.d): %.d: $(SRC_DIR)/%.mm $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
@@ -151,7 +161,7 @@ DEP_MASK :=
 DEPS     := Makefile.dep
 
 # Only include the deps if we are not cleaning
-ifeq ($(filter depend clean mrproper, $(MAKECMDGOALS)),)
+ifeq ($(filter $(ENDIAN_TARGETS) depend clean mrproper, $(MAKECMDGOALS)),)
 -include Makefile.dep
 endif
 
@@ -159,22 +169,9 @@ ifeq ("$(SRC_OBJS_DIR)/$(DEPEND)","$(MAKEDEPEND)")
 DEP := $(MAKEDEPEND)
 $(SRC_OBJS_DIR)/$(DEPEND): $(SRC_DIR)/depend/depend.cpp
 	$(E) '$(STAGE) Compiling and linking $(DEPEND)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) -o $@ $<
+	$(Q)$(CXX_BUILD) $(CXXFLAGS_BUILD) $(CFLAGS_BUILD) $(LDFLAGS_BUILD) -o $@ $<
 endif
 
-# Macro for invoking a command on groups of 100 words at a time
-# (analogous to xargs(1)).  The macro invokes itself recursively
-# until the list of words is depleted.
-#
-# Usage: $(call xargs,COMMAND,LIST)
-#
-# COMMAND should be a shell command to which the words will be
-# appended as arguments in groups of 100.
-define xargs
-$(1) $(wordlist 1,100,$(2))
-$(if $(word 101,$(2)),$(call xargs,$(1),$(wordlist 101,$(words $(2)),$(2))))
-endef
-
 # Make sure that only 'make depend' ALWAYS triggers a recheck
 ifeq ($(filter depend, $(MAKECMDGOALS)),)
 Makefile.dep: $(FILE_DEP) $(SRCS:%=$(SRC_DIR)/%) $(CONFIG_CACHE_SOURCE) $(DEP)
@@ -186,7 +183,14 @@ endif
 	$(Q)touch Makefile.dep.tmp
 
 # Calculate the deps via makedepend
-	$(call xargs,$(Q)$(MAKEDEPEND) -f$(SRC_OBJS_DIR)/Makefile.dep.tmp -o.o -Y -v -a -- $(CFLAGS_MAKEDEP) -- 2>/dev/null,$(SRCS:%=$(SRC_DIR)/%))
+	$(Q)$(MAKEDEPEND) -f$(SRC_OBJS_DIR)/Makefile.dep.tmp -o.o -Y -v -- $(CFLAGS_MAKEDEP) -- $(SRCS:%=$(SRC_DIR)/%) 2>/dev/null
+
+# Convert x:/... paths to /x/... for mingw
+ifeq ($(OS), MINGW)
+	@cat Makefile.dep.tmp | sed 's@/\([a-zA-Z]\):\/@\/\1\/@g' > Makefile.dep.tmp.mingw
+	@cp Makefile.dep.tmp.mingw Makefile.dep.tmp
+	@rm -f Makefile.dep.tmp.mingw
+endif
 
 # Remove all comments and includes that don't start with $(SRC_DIR)
 # Remove $(SRC_DIR) from object-file-name
@@ -212,7 +216,7 @@ endif
 	{                                   \
 		print $$0                         \
 	}                                   \
-	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | LC_ALL=C $(SORT) > Makefile.dep
+	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | $(SORT) > Makefile.dep
 
 	$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak
 
@@ -231,21 +235,9 @@ $(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
 	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<
 
-$(filter-out %sse2.o, $(filter-out %ssse3.o, $(filter-out %sse4.o, $(OBJS_CPP)))): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
+$(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -o $@ $<
-
-$(filter %sse2.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -msse2 -o $@ $<
-
-$(filter %ssse3.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -mssse3 -o $@ $<
-
-$(filter %sse4.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -msse4.1 -o $@ $<
+	$(Q)$(CXX_HOST) $(CXXFLAGS) $(CFLAGS) -c -o $@ $<
 
 $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
@@ -253,35 +245,46 @@ $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 
 $(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP)
 	$(E) '$(STAGE) Compiling resource $(<:$(SRC_DIR)/%.rc=%.rc)'
-	$(Q)$(WINDRES) -o $@ $<
+	$(Q)$(WINDRES) -o $@ -I `basename $<` $<
 
 $(BIN_DIR)/$(TTD): $(TTD)
-	$(Q)cp $(TTD) $(BIN_DIR)/$(TTD)
-ifeq ($(OS), UNIX)
-	$(Q)cp $(MEDIA_DIR)/openttd.32.bmp $(BIN_DIR)/baseset/
-endif
-ifeq ($(OS), OSX)
-	$(Q)cp $(ROOT_DIR)/os/macosx/splash.png $(BIN_DIR)/baseset/
-endif
+	$(Q)cp $< $@
 
 $(TTD): $(OBJS) $(CONFIG_CACHE_LINKER)
 	$(E) '$(STAGE) Linking $@'
-	$(Q)+$(CXX_HOST) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
+ifeq ($(OS), PSP)
+	# Because of a bug in the PSP GCC tools, linking via CXX results
+	#  in total chaos and more problems then you can handle. So we need
+	#  CC to link OpenTTD for PSP
+	$(Q)$(CC_HOST) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
+else
+	$(Q)$(CXX_HOST) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
+endif
 ifdef STRIP
 	$(Q)$(STRIP) $@
-endif
 ifeq ($(OS), DOS)
 	$(E) '$(STAGE) Adding CWSDPMI stub to $@'
 	$(Q)$(ROOT_DIR)/os/dos/make_dos_binary_selfcontained.sh $(SRC_OBJS_DIR)/$@
 endif
+endif
+
+# The targets to compile the endian-code
+
+endian_target.h: $(ENDIAN_CHECK) $(CONFIG_CACHE_ENDIAN)
+	$(E) '$(STAGE) Testing endianness for target'
+	$(Q)./$(ENDIAN_CHECK) $(ENDIAN_FORCE) > $@
+
+$(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
+	$(E) '$(STAGE) Compiling and Linking $@'
+	$(Q)$(CXX_BUILD) $(CXXFLAGS_BUILD) $(CFLAGS_BUILD) $< -o $@
 
 # Revision files
 
 $(SRC_DIR)/rev.cpp: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/rev.cpp.in
-	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s@\!\!ISODATE\!\!@$(ISODATE)@g;s@!!VERSION!!@$(VERSION)@g;s@!!MODIFIED!!@$(MODIFIED)@g;s@!!DATE!!@`date +%d.%m.%y`@g;s@!!GITHASH!!@$(GITHASH)@g;s@!!ISTAG!!@$(ISTAG)@g;s@!!ISSTABLETAG!!@$(ISSTABLETAG)@g" > $(SRC_DIR)/rev.cpp
+	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!MODIFIED!!@$(MODIFIED)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/rev.cpp
 
 $(SRC_DIR)/os/windows/ottdres.rc: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/os/windows/ottdres.rc.in
-	$(Q)cat $(SRC_DIR)/os/windows/ottdres.rc.in | sed "s@\!\!ISODATE\!\!@$(ISODATE)@g;s@!!VERSION!!@$(VERSION)@g;s@!!DATE!!@`date +%d.%m.%y`@g;s@!!GITHASH!!@$(GITHASH)@g;s@!!ISTAG!!@$(ISTAG)@g;s@!!ISSTABLETAG!!@$(ISSTABLETAG)@g" > $(SRC_DIR)/os/windows/ottdres.rc
+	$(Q)cat $(SRC_DIR)/os/windows/ottdres.rc.in | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/os/windows/ottdres.rc
 
 FORCE:
 
@@ -289,7 +292,7 @@ depend: $(DEPS)
 
 clean:
 	$(E) '$(STAGE) Cleaning up object files'
-	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(BIN_DIR)/baseset/openttd.32.bmp $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_SOURCE)
+	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)
 
 mrproper: clean
 	$(Q)rm -f $(SRC_DIR)/rev.cpp $(SRC_DIR)/os/windows/ottdres.rc

README.md

@@ -1,839 +0,0 @@
-# OpenTTD
-
-## Table of contents
-
-- 1.0) [About](#10-about)
-- 2.0) [Contacting](#20-contacting)
-    - 2.1) [Reporting bugs](#21-reporting-bugs)
-    - 2.2) [Reporting desyncs](#22-reporting-desyncs)
-- 3.0) [Supported platforms](#30-supported-platforms)
-- 4.0) [Installing and running OpenTTD](#40-installing-and-running-openttd)
-    - 4.1) [(Required) 3rd party files](#41-required-3rd-party-files)
-    - 4.2) [OpenTTD directories](#42-openttd-directories)
-    - 4.3) [Portable installations (portable media)](#43-portable-installations-portable-media)
-    - 4.4) [Files in tar (archives)](#44-files-in-tar-archives)
-- 5.0) [OpenTTD features](#50-openttd-features)
-    - 5.1) [Logging of potentially dangerous actions](#51-logging-of-potentially-dangerous-actions)
-    - 5.2) [Frame rate and performance metrics](#52-frame-rate-and-performance-metrics)
-- 6.0) [Configuration file](#60-configuration-file)
-- 7.0) [Compiling](#70-compiling)
-    - 7.1) [Required/optional libraries](#71-requiredoptional-libraries)
-    - 7.2) [Supported compilers](#72-supported-compilers)
-    - 7.3) [Compilation of base sets](#73-compilation-of-base-sets)
-- 8.0) [Translating](#80-translating)
-    - 8.1) [Translation](#81-translation)
-    - 8.2) [Previewing](#82-previewing)
-- 9.0) [Troubleshooting](#90-troubleshooting)
-- 10.0) [Licensing](#100-licensing)
-- X.X) [Credits](#xx-credits)
-
-## 1.0) About
-
-OpenTTD is a transport simulation game based upon the popular game Transport
-Tycoon Deluxe, written by Chris Sawyer. It attempts to mimic the original
-game as closely as possible while extending it with new features.
-
-OpenTTD is licensed under the GNU General Public License version 2.0,
-but includes some 3rd party software under different licenses. See the
-section "Licensing" below for details.
-
-## 2.0) Contacting
-
-The easiest way to contact the OpenTTD team is by submitting bug reports or
-posting comments in our forums. You can also chat with us on IRC (#openttd
-on irc.oftc.net).
-
-The OpenTTD homepage is https://www.openttd.org.
-
-You can also find the OpenTTD forums at
-[https://www.tt-forums.net](https://www.tt-forums.net/viewforum.php?f=55).
-
-### 2.1) Reporting bugs
-
-First of all, check whether the bug is not already known. Do this by looking
-through the file called 'known-bugs.txt' which is distributed with OpenTTD
-like this readme.
-
-For tracking our bugs we are using GitHub's issue tracker. You can find
-the tracker at https://github.com/OpenTTD/OpenTTD/issues. Before actually
-reporting take a look through the already reported bugs there to see if
-the bug is already known. The 'known-bugs.txt' file might be a bit outdated
-at the moment you are reading it as only bugs known before the release
-are documented there. Also look through the recently closed bugs.
-
-When you are sure it is not already reported you should:
-
-- Make sure you are running a recent version, i.e. run the latest stable or
-   nightly based on where you found the bug.
-- Make sure you are not running a non-official binary, like a patch pack.
-   When you are playing with a patch pack you should report any bugs to the
-   forum thread related to that patch pack.
-- Make it reproducible for the developers. In other words, create a savegame
-   in which you can reproduce the issue once loaded. It is very useful to give
-   us the crash.dmp, crash.sav, crash.log and crash screenshot which are
-   created on crashes.
-- Check whether the bug is already reported on our bug tracker. This includes
-   searching for recently closed bug reports as the bug might already be fixed.
-
-After you have done all that you can report the bug. Please include the
-following information in your bug report:
-
-- OpenTTD version (PLEASE test the latest Git revision/nightly build)
-- Bug details, including instructions how to reproduce it
-- Platform (Windows, Linux, FreeBSD, …) and compiler (including version) if
-   you compiled OpenTTD yourself.
-- The processor architecture of your OS (32-bit Windows, 64-bit Windows,
-   Linux on an ARM, Mac OS X on a PowerPC, etc.)
-- Attach a saved game **and** a screenshot if possible
-- If this bug only occurred recently please note the last version without
-   the bug and the first version including the bug. That way we can fix it
-   quicker by looking at the changes made.
-- Attach crash.dmp, crash.log and crash.sav. These files are usually created
-   next to your openttd.cfg. The crash handler will tell you the location.
-
-### 2.2) Reporting desyncs
-
-As desyncs are hard to make reproducible OpenTTD has the ability to log all
-actions done by clients so we can replay the whole game in an effort to make
-desyncs better reproducible. You need to turn this ability on. When turned
-on an automatic savegame will be made once the map has been constructed in
-the 'save/autosave' directory, see OpenTTD directories to know where to find
-this directory. Furthermore the log file 'commands-out.log' will be created
-and all actions will be written to there.
-
-To enable the desync debugging you need to set the debug level for 'desync'
-to at least 1. You do this by starting OpenTTD with '`-d desync=<level>`' as
-parameter or by typing '`debug_level desync=<level>`' in OpenTTD's internal
-console.
-The desync debug levels are:
-
-- 0: nothing.
-- 1: dumping of commands to 'commands-out.log'.
-- 2: same as 1 plus checking vehicle caches and dumping that too.
-- 3: same as 2 plus monthly saves in autosave.
-- 4 and higher: same as 3
-
-Restarting OpenTTD will overwrite 'commands-out.log'. OpenTTD will not remove
-the savegames (dmp_cmds_*.sav) made by the desync debugging system, so you
-have to occasionally remove them yourself!
-
-The naming format of the desync savegames is as follows:
-dmp_cmds_XXXXXXXX_YYYYYYYY.sav. The XXXXXXXX is the hexadecimal representation
-of the generation seed of the game and YYYYYYYY is the hexadecimal
-representation of the date of the game. This sorts the savegames by game and
-then by date making it easier to find the right savegames.
-
-When a desync has occurred with the desync debugging turned on you should file
-a bug report with the following files attached:
-
-- commands-out.log as it contains all the commands that were done
-- the last saved savegame (search for the last line beginning with
-   'save: dmp_cmds_' in commands-out.log). We use this savegame to check
-   whether we can quickly reproduce the desync. Otherwise we will need …
-- the first saved savegame (search for the first line beginning with 'save'
-   where the first part, up to the last underscore '_', is the same). We need
-   this savegame to be able to reproduce the bug when the last savegame is not
-   old enough. If you loaded a scenario or savegame you need to attach that.
-- optionally you can attach the savegames from around 50%, 75%, 85%, 90% and
-   95% of the game's progression. We can use these savegames to speed up the
-   reproduction of the desync, but we should be able to reproduce these
-   savegames based on the first savegame and commands-out.log.
-- in case you use any NewGRFs you should attach the ones you used unless
-   we can easily find them ourselves via bananas or when they are in the
-   #openttdcoop pack.
-
-Do NOT remove the dmp_cmds savegames of a desync you have reported until the
-desync has been fixed; if you, by accident, send us the wrong savegames we
-will not be able to reproduce the desync and thus will be unable to fix it.
-
-## 3.0) Supported platforms
-
-OpenTTD has been ported to several platforms and operating systems. It should
-not be very difficult to port it to a new platform. The currently working
-platforms are:
-
-- BeOS (SDL or Allegro)
-- DOS (Allegro)
-- FreeBSD (SDL)
-- Linux (SDL or Allegro)
-- macOS (universal) (Cocoa video and sound drivers)
-- MorphOS (SDL)
-- OpenBSD (SDL)
-- OS/2 (SDL)
-- Windows (Win32 GDI (faster) or SDL or Allegro)
-
-## 4.0) Installing and running OpenTTD
-
-Installing OpenTTD is fairly straightforward. Either you have downloaded an
-archive which you have to extract to a directory where you want OpenTTD to
-be installed, or you have downloaded an installer, which will automatically
-extract OpenTTD in the given directory.
-
-OpenTTD looks in multiple locations to find the required data files (described
-in section 4.2). Installing any 3rd party files into a 'shared' location has
-the advantage that you only need to do this step once, rather than copying the
-data files into all OpenTTD versions you have.
-
-Savegames, screenshots, etc are saved relative to the config file (openttd.cfg)
-currently being used. This means that if you use a config file in one of the
-shared directories, savegames will reside in the save/ directory next to the
-openttd.cfg file there.
-
-If you want savegames and screenshots in the directory where the OpenTTD binary
-resides, simply have your config file in that location. But if you remove this
-config file, savegames will still be in this directory (see notes in
-section 4.2 'OpenTTD directories')
-
-OpenTTD comes without AIs, 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.
-Another way is manually downloading the AIs from the forum although then you
-need to make sure that you install all the required AI libraries too; they get
-automatically selected (and downloaded) if you get the AIs via the 'Check
-Online Content'. If you do not have an AI but have configured OpenTTD to start
-an AI a message will be shown that the 'dummy' AI has been started.
-
-### 4.1) (Required) 3rd party files
-
-Before you run OpenTTD, you need to put the game's data files into a baseset/
-directory which can be located in various places addressed in the following
-section.
-
-For OpenTTD you need to acquire some third party data files. For this you have
-the choice of using the original Transport Tycoon Deluxe data files or a set
-of free data files.
-
-Do NOT copy files included with OpenTTD into 'shared' directories (explained in
-the following sections) as sooner or later you will run into graphical glitches
-when using other versions of the game.
-
-#### 4.1.1) Free graphics and sound files
-
-The free data files, split into OpenGFX for graphics, OpenSFX for sounds and
-OpenMSX for music can be found at:
-
-- https://www.openttd.org/download-opengfx for OpenGFX
-- https://www.openttd.org/download-opensfx for OpenSFX
-- https://www.openttd.org/download-openmsx for OpenMSX
-
-Please follow the readme of these packages about the installation procedure.
-The Windows installer can optionally download and install these packages.
-
-#### 4.1.2) Original Transport Tycoon Deluxe graphics and sound files
-
-If you want to play with the original Transport Tycoon Deluxe data files you
-have to copy the data files from the CD-ROM into the baseset/ directory. It
-does not matter whether you copy them from the DOS or Windows version of
-Transport Tycoon Deluxe. The Windows install can optionally copy these files.
-You need to copy the following files:
-- sample.cat
-- trg1r.grf or TRG1.GRF
-- trgcr.grf or TRGC.GRF
-- trghr.grf or TRGH.GRF
-- trgir.grf or TRGI.GRF
-- trgtr.grf or TRGT.GRF
-
-#### 4.1.3) Original Transport Tycoon Deluxe music
-
-If you want the Transport Tycoon Deluxe music, copy the appropriate files from
-the original game into the baseset folder.
-- TTD for Windows: All files in the gm/ folder (gm_tt00.gm up to gm_tt21.gm)
-- TTD for DOS: The GM.CAT file
-- Transport Tycoon Original: The GM.CAT file, but rename it to GM-TTO.CAT
-
-#### 4.1.4) AIs
-
-If you want AIs use the in-game content downloader. If for some reason that is
-not possible or you want to use an AI that has not been uploaded to the content
-download system download the tar file and place it in the ai/ directory. If the
-AI needs libraries you will have to download those too and put them in the
-ai/library/ directory. All AIs and AI Libraries that have been uploaded to
-the content download system can be found at https://noai.openttd.org/downloads.
-The AIs and libraries can be found their in the form of .tar.gz packages.
-OpenTTD can read inside tar files but it does not extract .tar.gz files by itself.
-
-To figure out which libraries you need for an AI you have to start the AI and
-wait for an error message to pop up. The error message will tell you
-'could not find library "lib-name"'. Download that library and try again.
-
-#### 4.1.5) Game scripts
-
-If you want an extra challenge in OpenTTD you can download so-called game
-scripts via the in-game content downloader. These game scripts have varying
-functionality, though they can generally influence town growth, subsidies, add
-goals to reach or provide a different ranking system.
-
-If you download a game script manually you have to follow the same rules as for
-AIs, except that game scripts are placed in the game/ directory instead of the
-ai/ directory.
-
-### 4.2) OpenTTD directories
-
-OpenTTD uses its own directory to store its required 3rd party base set files
-(see section 4.1 'Required 3rd party files') and non-compulsory extension and
-configuration files. See below for their proper place within this OpenTTD main
-data directory.
-
-The main OpenTTD directories can be found in various locations, depending on
-your operating system:
-
-1. The current working directory (from where you started OpenTTD)
-
-    For non-Windows operating systems OpenTTD will not scan for files in this
-    directory if it is your personal directory, i.e. '~/', or when it is the
-    root directory, i.e. '/'.
-
-2. Your personal directory
-    - 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)
-    - 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)
-    - macOS: `/Library/Application Support/OpenTTD`
-    - Linux: not available
-4. The binary directory (where the OpenTTD executable is)
-    - Windows: `C:\Program Files\OpenTTD`
-    - Linux: `/usr/games`
-5. The installation directory (Linux only)
-    - Linux: `/usr/share/games/openttd`
-6. The application bundle (macOS only)
-
-    It includes the OpenTTD files (grf+lng) and it will work as long as they
-    are not touched
-
-Different types of data or extensions go into different subdirectories of the
-chosen main OpenTTD directory:
-
-| data type           | directory         | additional info             |
-| ------------------- | ----------------- | --------------------------- |
-| Config File         | (no subdirectory) |                             |
-| Screenshots         | screenshot        |                             |
-| Base Graphics       | baseset           | (or a subdirectory thereof) |
-| Sound Sets          | baseset           | (or a subdirectory thereof) |
-| NewGRFs             | newgrf            | (or a subdirectory thereof) |
-| 32bpp Sets          | newgrf            | (or a subdirectory thereof) |
-| Music Sets          | baseset           | (or a subdirectory thereof) |
-| AIs                 | ai                | (or a subdirectory thereof) |
-| AI Libraries        | ai/library        | (or a subdirectory thereof) |
-| Game Scripts (GS)   | game              | (or a subdirectory thereof) |
-| GS Libraries        | game/library      | (or a subdirectory thereof) |
-| Savegames           | save              |                             |
-| Automatic Savegames | save/autosave     |                             |
-| Scenarios           | scenario          |                             |
-
-The (automatically created) directory content_download is for OpenTTD's internal
-use and no files should be added to it or its subdirectories manually.
-
-#### Notes:
-
-- Linux in the previous list means .deb, but most paths should be similar for
-   others.
-- The previous search order is also used for NewGRFs and openttd.cfg.
-- If openttd.cfg is not found, then it will be created using the 2, 4, 1, 3,
-   5 order. When built with XDG base directory support, openttd.cfg will be
-   created in $XDG_CONFIG_HOME/openttd which is usually ~/.config/openttd.
-- Savegames will be relative to the config file only if there is no save/
-   directory in paths with higher priority than the config file path, but
-   autosaves and screenshots will always be relative to the config file.
-   Unless the configuration file is in $XDG_CONFIG_HOME/openttd, then all
-   other files will be saved under $XDG_DATA_HOME/openttd.
-
-#### The preferred setup:
-
-Place 3rd party files in shared directory (or in personal directory if you do
-not have write access on shared directory) and have your openttd.cfg config
-file in personal directory (where the game will then also place savegames and
-screenshots).
-
-### 4.3) Portable installations (portable media)
-
-You can install OpenTTD on external media so you can take it with you, i.e.
-using a USB key, or a USB HDD, etc.
-Create a directory where you shall store the game in (i.e. OpenTTD/).
-Copy the binary (OpenTTD.exe, OpenTTD.app, openttd, etc), baseset/ and your
-openttd.cfg to this directory.
-You can copy binaries for any operating system into this directory, which will
-allow you to play the game on nearly any computer you can attach the external
-media to.
-As always - additional grf files are stored in the newgrf/ dir (for details,
-again, see section 4.1).
-
-### 4.4) Files in tar (archives)
-
-OpenTTD can read files that are in an uncompressed tar (archive), which
-makes it easy to bundle files belonging to the same script, NewGRF or base
-set. Music sets are the only exception as they cannot be stored in a tar
-file due to being played by external applications.
-
-OpenTTD sees each tar archive as the 'root' of its search path. This means that
-having a file with the same path in two different tar files means that one
-cannot be opened, after all only one file will be found first. As such it is
-advisable to put an uniquely named folder in the root of the tar and put all the
-content in that folder. For example, all downloaded content has a path that
-concatenates the name of the content and the version, which makes the path
-unique. For custom tar files it is advised to do this as well.
-
-The normal files are also referred to by their relative path from the search
-directory, this means that also normal files could hide files in a tar as
-long as the relative path from the search path of the normal file is the
-same as the path in the tar file. Again it is advised to have an unique path
-to the normal file so they do not collide with the files from other tar
-files.
-
-## 5.0) OpenTTD features
-
-OpenTTD has a lot of features going beyond the original Transport Tycoon Deluxe
-emulation. Unfortunately, there is currently no comprehensive list of features,
-but there is a basic features list on the web, and some optional features can be
-controlled through the Advanced Settings dialog. We also implement some
-features known from [TTDPatch](https://www.ttdpatch.net).
-
-Several important non-standard controls:
-
-- Ctrl modifies many commands and makes them more powerful. For example Ctrl
-   clicking on signals with the build signal tool changes their behaviour,
-   holding Ctrl while the track build tool is activated changes it to the track
-   removal tool, and so on. See https://wiki.openttd.org/Hidden_features
-   for a non-comprehensive list or look at the tooltips.
-- Ingame console. More information at https://wiki.openttd.org/Console
-- Hovering over a GUI element shows tooltips. This can be changed to right click
-   via the advanced settings.
-
-### 5.1) Logging of potentially dangerous actions
-
-OpenTTD is a complex program, and together with NewGRF, it may show a buggy
-behaviour. But not only bugs in code can cause problems. There are several
-ways to affect game state possibly resulting in program crash or multiplayer
-desyncs.
-
-Easier way would be to forbid all these unsafe actions, but that would affect
-game usability for many players. We certainly do not want that.
-However, we receive bug reports because of this. To reduce time spent with
-solving these problems, these potentially unsafe actions are logged in
-the savegame (including crash.sav). Log is stored in crash logs, too.
-
-Information logged:
-
-- Adding / removing / changing order of NewGRFs
-- Changing NewGRF parameters, loading compatible NewGRF
-- Changing game mode (scenario editor <-> normal game)
-- Loading game saved in a different OpenTTD / TTDPatch / Transport Tycoon Deluxe /
-   original Transport Tycoon version
-- Running a modified OpenTTD build
-- Changing settings affecting NewGRF behaviour (non-network-safe settings)
-- Triggering NewGRF bugs
-
-No personal information is stored.
-
-You can show the game log by typing 'gamelog' in the console or by running
-OpenTTD in debug mode.
-
-### 5.2) Frame rate and performance metrics
-
-The Help menu in-game has a function to open the Frame rate window. This
-window shows various real-time performance statistics, measuring what parts
-of the game require the most processing power currently.
-
-A summary of the statistics can also be retrieved from the console with the
-`fps` command. This is especially useful on dedicated servers, where the
-administrator might want to determine what's limiting performance in a slow
-game.
-
-The frame rate is given as two figures, the simulation rate and the graphics
-frame rate. Usually these are identical, as the screen is rendered exactly
-once per simulated tick, but in the future there might be support for graphics
-and simulation running at different rates. When the game is paused, the
-simulation rate drops to zero.
-
-In addition to the simulation rate, a game speed factor is also calculated.
-This is based on the target simulation speed, which is 30 milliseconds per
-game tick. At that speed, the expected frame rate is 33.33 frames/second, and
-the game speed factor is how close to that target the actual rate is. When
-the game is in fast forward mode, the game speed factor shows how much
-speed up is achieved.
-
-The lower part of the window shows timing statistics for individual parts of
-the game. The times shown are short-term and long-term averages of how long
-it takes to process one tick of game time, all figures are in milliseconds.
-
-Clicking a line in the lower part of the window opens a graph window, giving
-detailed readings on each tick simulated by the game.
-
-The following is an explanation of the different statistics:
-
-- *Game loop* - Total processing time used per simulated "tick" in the game.
-  This includes all pathfinding, world updates, and economy handling.
-- *Cargo handling* - Time spent loading/unloading cargo at stations, and
-  industries and towns sending/retrieving cargo from stations.
-- *Train ticks*, *Road vehicle ticks*, *Ship ticks*, *Aircraft ticks* -
-  Time spent on pathfinding and other processing for each player vehicle type.
-- *World ticks* - Time spent on other world/landscape processing. This
-  includes towns growing, building animations, updates of farmland and trees,
-  and station rating updates.
-- *GS/AI total*, *Game script*, and *AI players* - Time spent running logic
-  for game scripts and AI players. The total may show as less than the current
-  sum of the individual scripts, this is because AI players at lower
-  difficulty settings do not run every game tick, and hence contribute less
-  to the average across all ticks. Keep in mind that the "Current" figure is
-  also an average, just only over short term.
-- *Link graph delay* - Time overruns of the cargo distribution link graph
-  update thread. Usually the link graph is updated in a background thread,
-  but these updates need to synchronise with the main game loop occasionally,
-  if the time spent on link graph updates is longer than the time taken to
-  otherwise simulate the game while it was updating, these delays are counted
-  in this figure.
-- *Graphics rendering* - Total time spent rendering all graphics, including
-  both GUI and world viewports. This typically spikes when panning the view
-  around, and when more things are happening on screen at once.
-- *World viewport rendering* - Isolated time spent rendering just world
-  viewports. If this figure is significantly lower than the total graphics
-  rendering time, most time is spent rendering GUI than rendering world.
-- *Video output* - Speed of copying the rendered graphics to the display
-  adapter. Usually this should be very fast (in the range of 0-3 ms), large
-  values for this can indicate a graphics driver problem.
-- *Sound mixing* - Speed of mixing active audio samples together. Usually
-  this should be very fast (in the range of 0-3 ms), if it is slow, consider
-  switching to the NoSound set.
-
-If the frame rate window is shaded, the title bar will instead show just the
-current simulation rate and the game speed factor.
-
-## 6.0) Configuration file
-
-The configuration file for OpenTTD (openttd.cfg) is in a simple Windows-like
-.INI format. It is mostly undocumented. Almost all settings can be changed
-ingame by using the 'Advanced Settings' window.
-When you cannot find openttd.cfg you should look in the directories as
-described in section 4.2. If you do not have an openttd.cfg OpenTTD will
-create one after closing.
-
-## 7.0) Compiling
-
-### Windows:
-
-You need Microsoft Visual Studio 2015 Update 3 or more recent. Open the project file
-and it should build automatically. In case you want to build with SDL support
-you need to add WITH_SDL to the project settings.
-
-PNG (WITH_PNG), ZLIB (WITH_ZLIB), LZO (WITH_LZO), Freetype (WITH_FREETYPE) and
-LZMA (WITH_LZMA) support is enabled by default. For these to work you need their
-development files. To get them just use vcpkg from https://github.com/Microsoft/vcpkg
-using x86-windows-static and x64-windows-static triplets.
-For more help with VS see docs/Readme_Windows_MSVC.md.
-
-You can also build it using the Makefile with MSYS/MinGW or Cygwin/MinGW.
-Please read the Makefile for more information.
-
-### Solaris, FreeBSD, OpenBSD:
-
-Use '`gmake`', but do a '`./configure`' before the first build.
-
-### Linux/Unix:
-
-OpenTTD can be built with GNU '`make`'. On non-GNU systems it is called '`gmake`'.
-However, for the first build one has to do a '`./configure`' first.
-
-### macOS:
-
-Use '`make`' or Xcode (which will then call make for you)
-This will give you a binary for your CPU type (PPC/Intel)
-However, for the first build one has to do a '`./configure`' first.
-To make a universal binary type '`./configure --enabled-universal`'
-instead of '`./configure`'.
-
-### BeOS:
-
-Use '`make`', but do a '`./configure`' before the first build.
-
-### MorphOS:
-
-Use '`make`'. However, for the first build one has to do a '`./configure`'
-first. Note that you need the MorphOS SDK, latest libnix updates (else C++
-parts of OpenTTD will not build) and the powersdl.library SDK. Optionally libz,
-libpng and freetype2 developer files.
-
-### OS/2:
-
-A comprehensive GNU build environment is required to build the OS/2 version.
-See the docs/Readme_OS2.txt file for more information.
-
-### DOS:
-
-A build environment with DJGPP is needed as well as libraries such as
-Allegro, zlib and libpng, which all can be downloaded from the DJGPP
-website. Compilation is straight forward: use '`make`', but do a '`./configure`'
-before the first build. The build binary will need cwsdpmi.exe to be in
-the same directory as the openttd executable. cwsdpmi.exe can be found in
-the os/dos/cwsdpmi subdirectory. If you compile with stripping turned on a
-binary will be generated that does not need cwsdpmi.exe by adding the
-cswdstub.exe to the created OpenTTD binary.
-
-### 7.1) Required/optional libraries
-
-The following libraries are used by OpenTTD for:
-
-- libSDL/liballegro: hardware access (video, sound, mouse)
-- zlib: (de)compressing of old (0.3.0-1.0.5) savegames, content downloads,
-   heightmaps
-- liblzo2: (de)compressing of old (pre 0.3.0) savegames
-- liblzma: (de)compressing of savegames (1.1.0 and later)
-- libpng: making screenshots and loading heightmaps
-- libfreetype: loading generic fonts and rendering them
-- libfontconfig: searching for fonts, resolving font names to actual fonts
-- libicu: handling of right-to-left scripts (e.g. Arabic and Persian) and
-   natural sorting of strings.
-
-OpenTTD does not require any of the libraries to be present, but without
-liblzma you cannot open most recent savegames and without zlib you cannot
-open most older savegames or use the content downloading system.
-Without libSDL/liballegro on non-Windows and non-macOS machines you have
-no graphical user interface; you would be building a dedicated server.
-
-### 7.2) Supported compilers
-
-The following compilers are known to compile OpenTTD:
-
-- Microsoft Visual C++ (MSVC) 2015, 2017 and 2019.
-- GNU Compiler Collection (GCC) 3.3 - 4.4, 4.6 - 4.8.
-    - Versions 4.1 and earlier give bogus warnings about uninitialised variables.
-    - Versions 4.4, 4.6 give bogus warnings about freeing non-heap objects.
-    - Versions 4.6 and later give invalid warnings when lto is enabled.
-- Intel C++ Compiler (ICC) 12.0.
-- Clang/LLVM 2.9 - 3.0
-   Version 2.9 gives bogus warnings about code nonconformity.
-
-The following compilers are known not to compile OpenTTD:
-
-- Microsoft Visual C++ (MSVC) 2013 and earlier.
-   These old versions do not support modern C++ language features.
-- GNU Compiler Collection (GCC) 3.2 and earlier.
-   These old versions fail due to OpenTTD's template usage.
-- GNU Compiler Collection (GCC) 4.5. It optimizes enums too aggressively.
-   See https://github.com/OpenTTD/OpenTTD/issues/5513 and references therein.
-- Intel C++ Compiler (ICC) 11.1 and earlier.
-    - Version 10.0 and earlier fail a configure check and fail with recent
-       system headers.
-    - Version 10.1 fails to compile station_gui.cpp.
-    - Version 11.1 fails with an internal error when compiling network.cpp.
-- Clang/LLVM 2.8 and earlier.
-- (Open) Watcom.
-
-If any of these compilers can compile OpenTTD again, please let us know.
-Patches to support more compilers are welcome.
-
-### 7.3) Compilation of base sets
-
-To recompile the extra graphics needed to play with the original Transport
-Tycoon Deluxe graphics you need GRFCodec (which includes NFORenum) as well.
-GRFCodec can be found at https://www.openttd.org/download-grfcodec.
-The compilation of these extra graphics does generally not happen, unless
-you remove the graphics file using '`make maintainer-clean`'.
-
-Re-compilation of the base sets, thus also use of '`--maintainer-clean`' can
-leave the repository in a modified state as different grfcodec versions can
-cause binary differences in the resulting grf. Also translations might have
-been added for the base sets which are not yet included in the base set
-information files. Use the configure option '`--without-grfcodec`' to avoid
-modification of the base set files by the build process.
-
-## 8.0) Translating
-
-See https://www.openttd.org/development for up-to-date information.
-
-The use of the online Translator service, located at
-https://translator.openttd.org, is highly encouraged. For getting an account
-simply follow the guidelines in the FAQ of the translator website.
-
-If for some reason the website is down for a longer period of time, the
-information below might be of help.
-
-Please contact the translations manager (https://www.openttd.org/contact)
-before beginning the translation process! This avoids double work, as
-someone else may have already started translating to the same language.
-
-### 8.1) Translation
-
-So, now that you have notified the development team about your intention to
-translate (You did, right? Of course you did.) you can pick up english.txt
-(found in the Git repository under /src/lang) and translate.
-
-You must change the first two lines of the file appropriately:
-
-    ##name English-Name-Of-Language
-    ##ownname Native-Name-Of-Language
-
-Note: Do not alter the following parts of the file:
-
-- String identifiers (the first word on each line)
-- Parts of the strings which are in curly braces (such as {STRING})
-- Lines beginning with ## (such as ##id), other than the first two lines
-   of the file
-
-### 8.2) Previewing
-
-In order to view the translation in the game, you need to compile your language
-file with the strgen utility. As this utility is tailored to a specific OpenTTD
-version, you need to compile it yourself. Just take the normal OpenTTD sources
-and build that. During the build process the strgen utility will be made.
-
-strgen is a command-line utility. It takes the language filename as parameter.
-
-Example:
-
-    strgen lang/german.txt
-
-This results in compiling german.txt and produces another file named german.lng.
-Any missing strings are replaced with the English strings. Note that it looks
-for english.txt in the lang subdirectory, which is where your language file
-should also be.
-
-That is all! You should now be able to select the language in the game options.
-
-## 9.0) Troubleshooting
-
-To see all startup options available to you, start OpenTTD with the
-'`./openttd -h`' option. This might help you tweak some of the settings.
-
-If the game is acting strange and you feel adventurous you can try the
-'`-d [[<name>=]<level>]`' flag, where the higher levels will give you more
-debugging output. The 'name' variable can help you to display only some type of
-debugging messages. This is mostly undocumented so best is to look in the
-source code file debug.c for the various debugging types. For more information
-look at https://wiki.openttd.org/Command_line.
-
-The most frequent problem is missing data files. Please install OpenGFX and
-possibly OpenSFX and OpenMSX. See section 4.1.1 for more information.
-
-Under certain circumstance, especially on Ubuntu OpenTTD can be extremely slow
-and/or freeze. See known-bugs.txt for more information and how to solve this
-problem on your computer.
-
-Under Windows 98 and lower it is impossible to use a dedicated server; it will
-fail to start. Perhaps this is for the better because those OSes are not known
-for their stability.
-
-With the added support for font-based text selecting a non-latin language can
-result in lots of question marks ('?') being shown on screen. Please open your
-configuration file (openttd.cfg - see Section 4.2 for where to find it)
-and add a suitable font for the small, medium and / or large font, e.g.:
-
-    small_font = "Tahoma"
-    medium_font = "Tahoma"
-    large_font = "Tahoma"
-
-You should use a font name like 'Tahoma' or a path to the desired font.
-
-Any NewGRF file used in a game is stored inside the savegame and will refuse to
-load if you do not have that NewGRF file available. A list of missing files can
-be viewed in the NewGRF window accessible from the file load dialogue window.
-
-You can try to obtain the missing files from that NewGRF dialogue or – if they
-are not available online – you can search manually through our
-[forum's graphics development section](https://www.tt-forums.net/viewforum.php?f=66)
-or [GRFCrawler](https://grfcrawler.tt-forums.net). Put the NewGRF files in
-OpenTTD's newgrf folder (see section 4.2 'OpenTTD directories') and rescan the
-list of available NewGRFs. Once you have all missing files, you are set to go.
-
-## 10.0) Licensing
-
-OpenTTD is licensed under the GNU General Public License version 2.0. For
-the complete license text, see the file 'COPYING'. This license applies
-to all files in this distribution, except as noted below.
-
-The squirrel implementation in src/3rdparty/squirrel is licensed under
-the Zlib license. 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 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 exe2coff implementation in os/dos/exe2coff is available under the
-GPL, with a number of additional terms. See os/dos/exe2coff/copying and
-os/dos/exe2coff/copying.dj for the exact licensing terms.
-
-The CWSDPMI implementation in os/dos/cwsdpmi is distributed under a
-custom binary-only license that prohibits modification. The exact
-licensing terms can be found in os/dos/cwsdpmi/cwsdpmi.txt. The sources
-for these files can be downloaded at its author site, at
-http://homer.rice.edu/~sandmann/cwsdpmi/csdpmi5s.zip.
-
-CONTRIBUTING.md 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.
-
-## X.X) Credits
-
-### 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) - Windows Expert (since 0.4.5)
-- 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)
-- 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:
-
-- 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)
-- 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) - WebTranslator 1 and 2 (0.3 - 0.5)
-- Zdeněk Sojka (SmatZ) - Bug finder and fixer (0.6 - 1.3)
-- 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)
-
-### 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 - 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, 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)
-
-### Thanks to:
-
-- Josef Drexler - For his great work on TTDPatch.
-- Marcin Grzegorczyk - For his TTDPatch work and documentation of Transport Tycoon Deluxe internals and track foundations
-- Stefan Meißner (sign_de) - For his work on the console
-- Mike Ragsdale - OpenTTD installer
-- Christian Rosentreter (tokai) - MorphOS / AmigaOS port
-- Richard Kempton (RichK67) - Additional airports, initial TGP implementation
-- Alberto Demichelis - Squirrel scripting language
-- L. Peter Deutsch - MD5 implementation
-- Michael Blunck - For revolutionizing TTD with awesome 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
-- Bug Reporters - Thanks for all bug reports
-- Chris Sawyer - For an amazing game!

azure-pipelines-ci.yml

@@ -1,69 +0,0 @@
-trigger:
-- master
-- release/*
-pr:
-- master
-- release/*
-
-jobs:
-- job: windows
-  displayName: 'Windows'
-  pool:
-    vmImage: 'VS2017-Win2016'
-
-  strategy:
-    matrix:
-      Win32:
-        BuildPlatform: 'Win32'
-      Win64:
-        BuildPlatform: 'x64'
-
-  steps:
-  - template: azure-pipelines/templates/ci-git-rebase.yml
-  - template: azure-pipelines/templates/windows-dependencies.yml
-  - template: azure-pipelines/templates/ci-opengfx.yml
-  - template: azure-pipelines/templates/windows-build.yml
-    parameters:
-      BuildPlatform: $(BuildPlatform)
-  - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
-      cd projects
-      call regression.bat
-    displayName: 'Test'
-
-- job: linux
-  displayName: 'Linux'
-  pool:
-    vmImage: 'ubuntu-16.04'
-
-  strategy:
-    matrix:
-      commit-checker: {}
-      linux-amd64-clang-3.8: {}
-      linux-amd64-gcc-6: {}
-      linux-i386-gcc-6: {}
-
-  steps:
-  - template: azure-pipelines/templates/ci-git-rebase.yml
-  # The dockers already have the dependencies installed
-  # The dockers already have OpenGFX installed
-  - template: azure-pipelines/templates/linux-build.yml
-    parameters:
-      Image: compile-farm-ci
-      Tag: $(Agent.JobName)
-
-- job: macos
-  displayName: 'MacOS'
-  pool:
-    vmImage: 'macOS-10.13'
-
-  variables:
-    MACOSX_DEPLOYMENT_TARGET: 10.9
-
-  steps:
-  - template: azure-pipelines/templates/ci-git-rebase.yml
-  - template: azure-pipelines/templates/osx-dependencies.yml
-  - template: azure-pipelines/templates/ci-opengfx.yml
-  - template: azure-pipelines/templates/osx-build.yml
-  - script: 'make regression'
-    displayName: 'Test'

azure-pipelines-release-stable.yml

@@ -1,10 +0,0 @@
-trigger:
-  branches:
-    include:
-      - refs/tags/*
-pr: none
-
-jobs:
-- template: azure-pipelines/templates/release.yml
-  parameters:
-    IsStableRelease: true

azure-pipelines-release.yml

@@ -1,7 +0,0 @@
-trigger: none
-pr: none
-
-jobs:
-- template: azure-pipelines/templates/release.yml
-  parameters:
-    IsStableRelease: false

azure-pipelines/changelog.sh

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

azure-pipelines/manifest.sh

@@ -1,60 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-if [ -z "$1" ]; then
-    echo "Usage: $0 <folder-with-bundles>"
-    exit 1
-fi
-
-FOLDER=$1
-
-if [ ! -e .version ] || [ ! -e .release_date ]; then
-    echo "This script should be executed in the root of an extracted source tarball"
-    exit 1
-fi
-
-# Find the name based on the version
-if [ -e .is_stable ]; then
-    isTesting=$(cat .version | grep "RC\|beta" || true)
-    if [ -z "${isTesting}" ]; then
-        NAME="stable"
-    else
-        NAME="testing"
-    fi
-else
-    NAME=$(cat .version | cut -d- -f2 | cut -d- -f-2)
-fi
-
-# Convert the date to a YAML date
-DATE=$(cat .release_date | tr ' ' T | sed 's/TUTC/:00-00:00/')
-VERSION=$(cat .version)
-BASE="openttd-${VERSION}"
-
-echo "name: ${NAME}" >> manifest.yaml
-echo "date: ${DATE}" >> manifest.yaml
-echo "base: ${BASE}-" >> manifest.yaml
-echo "files:" >> manifest.yaml
-
-error=""
-for i in $(ls ${FOLDER} | grep -v ".txt$\|.md$\|sum$" | sort); do
-    if [ -n "$(echo $i | grep pdb.xz)" ]; then continue; fi
-    if [ -n "$(echo $i | grep dbg.deb)" ]; then continue; fi
-
-    if [ ! -e ${FOLDER}/$i.md5sum ] || [ ! -e ${FOLDER}/$i.sha1sum ] || [ ! -e ${FOLDER}/$i.sha256sum ]; then
-        echo "ERROR: missing checksum file for ${i}" 1>&2
-        error="y"
-        continue
-    fi
-
-    echo "- id: $i" >> manifest.yaml
-    echo "  size: $(stat -c"%s" ${FOLDER}/$i)" >> manifest.yaml
-    echo "  md5sum: $(cat ${FOLDER}/$i.md5sum | cut -d\  -f1)" >> manifest.yaml
-    echo "  sha1sum: $(cat ${FOLDER}/$i.sha1sum | cut -d\  -f1)" >> manifest.yaml
-    echo "  sha256sum: $(cat ${FOLDER}/$i.sha256sum | cut -d\  -f1)" >> manifest.yaml
-done
-
-if [ -n "${error}" ]; then
-    echo "ERROR: exiting due to earlier errors" 1>&2
-    exit 1
-fi

azure-pipelines/templates/ci-git-rebase.yml

@@ -1,10 +0,0 @@
-steps:
-# Rebase to target branch for every PR. This means users don't have to
-# rebase every time target branch changes. As long as the PR applies cleanly, we
-# will validate it.
-- bash: |
-    git config user.email 'info@openttd.org'
-    git config user.name 'OpenTTD CI'
-    git rebase origin/${SYSTEM_PULLREQUEST_TARGETBRANCH}
-  displayName: 'Rebase to target branch'
-  condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))

azure-pipelines/templates/ci-opengfx.yml

@@ -1,8 +0,0 @@
-steps:
-- bash: |
-    set -ex
-    cd bin/baseset
-    curl -L https://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip > opengfx-0.5.2-all.zip
-    unzip opengfx-0.5.2-all.zip
-    rm -f opengfx-0.5.2-all.zip
-  displayName: 'Install OpenGFX'

azure-pipelines/templates/linux-build.yml

@@ -1,36 +0,0 @@
-parameters:
-  Image: ''
-  Tag: ''
-  ContainerCommand: ''
-
-steps:
-# 'envVars' in the 'Docker@1' task is a bit funky. When you want to use a
-# variable, you have to quote it. But the quote is also sent directly to
-# Docker and ends up in the variable, which you don't want. To work around
-# this, we set the correct variable first (which becomes an env-variable), and
-# pass that env-variable through to Docker. We cannot use the normal
-# 'variables' entry, as we are a template. So that results in this bit of
-# Bash code. Not because it is pretty, but it is the only way we found that
-# works.
-- bash: |
-    echo "##vso[task.setvariable variable=TARGET_BRANCH]${SYSTEM_PULLREQUEST_TARGETBRANCH}"
-    echo "Target branch is ${SYSTEM_PULLREQUEST_TARGETBRANCH}"
-  displayName: "Set target branch"
-  condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
-
-- task: Docker@1
-  ${{ if eq(parameters.Image, 'compile-farm') }}:
-    displayName: 'Build'
-  ${{ if eq(parameters.Image, 'compile-farm-ci') }}:
-    displayName: 'Build and test'
-    # Run the commit-checker only if it is a Pull Request
-    condition: and(succeeded(), or(ne(variables['Agent.JobName'], 'commit-checker'), eq(variables['Build.Reason'], 'PullRequest')))
-  inputs:
-    command: 'Run an image'
-    imageName: openttd/${{ parameters.Image }}:${{ parameters.Tag }}
-    volumes: '$(Build.SourcesDirectory):$(Build.SourcesDirectory)'
-    workingDirectory: '$(Build.SourcesDirectory)'
-    containerCommand: ${{ parameters.ContainerCommand }}
-    runInBackground: false
-    envVars: |
-      TARGET_BRANCH

azure-pipelines/templates/linux-claim-bundles.yml

@@ -1,5 +0,0 @@
-steps:
-# Because we run the compile in a docker (under root), we are not owner
-# of the 'bundles' folder. Fix that by executing a chown on it.
-- bash: sudo chown -R $(id -u):$(id -g) bundles
-  displayName: 'Claim bundles folder back'

azure-pipelines/templates/osx-build.yml

@@ -1,5 +0,0 @@
-steps:
-- script: './configure PKG_CONFIG_PATH=/usr/local/lib/pkgconfig --enable-static'
-  displayName: 'Configure'
-- script: 'make -j2'
-  displayName: 'Build'

azure-pipelines/templates/osx-dependencies.yml

@@ -1,12 +0,0 @@
-steps:
-- script: |
-    set -ex
-    HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config lzo xz libpng freetype
-    # Remove the dynamic libraries of these libraries, to ensure we use
-    # the static versions. That is important, as it is unlikely any
-    # end-user has these brew libraries installed.
-    rm /usr/local/Cellar/lzo/*/lib/*.dylib
-    rm /usr/local/Cellar/xz/*/lib/*.dylib
-    rm /usr/local/Cellar/libpng/*/lib/*.dylib
-    rm /usr/local/Cellar/freetype/*/lib/*.dylib
-  displayName: 'Install dependencies'

azure-pipelines/templates/release-bundles.yml

@@ -1,19 +0,0 @@
-parameters:
-  CalculateChecksums: true
-
-steps:
-- ${{ if eq(parameters.CalculateChecksums, true) }}:
-  - bash: |
-      set -ex
-      cd bundles
-      for i in $(ls); do
-        openssl dgst -r -md5 -hex $i > $i.md5sum
-        openssl dgst -r -sha1 -hex $i > $i.sha1sum
-        openssl dgst -r -sha256 -hex $i > $i.sha256sum
-      done
-    displayName: 'Calculate checksums'
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish bundles'
-  inputs:
-    PathtoPublish: bundles/
-    ArtifactName: bundles

azure-pipelines/templates/release-fetch-source.yml

@@ -1,20 +0,0 @@
-# Fetch the source tarball as prepared by an earlier job. In there is the
-# version predefined. This ensures we are all going to compile the same
-# source with the same version.
-
-steps:
-- checkout: none
-- task: DownloadBuildArtifacts@0
-  displayName: 'Download source'
-  inputs:
-    downloadType: specific
-    itemPattern: 'bundles/openttd-*-source.tar.xz'
-    downloadPath: '$(Build.ArtifactStagingDirectory)'
-- bash: tar --xz -xf ../a/bundles/openttd-*-source.tar.xz --strip-components=1
-  displayName: 'Extracting source'
-- bash: |
-    set -e
-    VERSION=$(cat .version)
-    echo "${VERSION}"
-    echo "##vso[build.updatebuildnumber]${VERSION}"
-  displayName: 'Change BuildNumber to version'

azure-pipelines/templates/release-manifest.yml

@@ -1,20 +0,0 @@
-parameters:
-  IsStableRelease: false
-
-steps:
-- task: DownloadBuildArtifacts@0
-  displayName: 'Download all bundles'
-  inputs:
-    downloadType: specific
-    itemPattern: 'bundles/*'
-    downloadPath: '$(Build.ArtifactStagingDirectory)'
-- ${{ if eq(parameters.IsStableRelease, true) }}:
-  - script: |
-      touch .is_stable
-    displayName: 'Mark as stable release'
-- script: |
-    set -ex
-    ./azure-pipelines/manifest.sh ../a/bundles/
-    mkdir -p bundles
-    mv manifest.yaml bundles/
-  displayName: 'Create manifest.yaml'

azure-pipelines/templates/release-prepare-source.yml

@@ -1,35 +0,0 @@
-# Set the revisions, and remove the VCS files.
-# This ensures everything else picks up on the predefined versions, and not
-# that because of some build process the version all of a sudden changes.
-
-steps:
-- script: |
-    set -ex
-
-    if [ -n "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}" ]; then
-      # We are triggered from a GitHub Pull Request
-      git checkout -B pr${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}
-    elif [ "${BUILD_SOURCEBRANCHNAME}" = "merge" ] || [ "${BUILD_SOURCEBRANCHNAME}" = "head" ]; then
-      # We are manually triggered based on a GitHub Pull Request
-      PULLREQUESTNUMBER=$(echo ${BUILD_SOURCEBRANCH} | cut -d/ -f3)
-      git checkout -B pr${PULLREQUESTNUMBER}
-    else
-      git checkout -B ${BUILD_SOURCEBRANCHNAME}
-    fi
-
-    ./findversion.sh > .ottdrev
-    ./azure-pipelines/changelog.sh > .changelog
-    TZ='UTC' date +"%Y-%m-%d %H:%M UTC" > .release_date
-    cat .ottdrev | cut -f 1 -d$'\t' > .version
-    echo "Release Date: $(cat .release_date)"
-    echo "Revision: $(cat .ottdrev)"
-    echo "Version: $(cat .version)"
-  displayName: 'Create version files'
-- script: |
-    set -e
-    VERSION=$(cat .version)
-    echo "${VERSION}"
-    echo "##vso[build.updatebuildnumber]${VERSION}"
-  displayName: 'Change BuildNumber to version'
-- script: find . -iname .hg -or -iname .git -or -iname .svn | xargs rm -rf
-  displayName: 'Remove VCS information'

azure-pipelines/templates/release.yml

@@ -1,175 +0,0 @@
-parameters:
-  # If this is false, not all targets are triggered. For example:
-  # The NSIS installer for Windows and the creation of debs only work for
-  # releases. Not for any other type of binary. So they are skilled if this
-  # is set to false.
-  IsStableRelease: false
-
-jobs:
-- job: source
-  displayName: 'Source'
-  pool:
-    vmImage: 'ubuntu-16.04'
-
-  steps:
-  - template: release-prepare-source.yml
-  - script: |
-      set -ex
-
-      # Rename the folder to openttd-NNN-source
-      mkdir openttd-$(Build.BuildNumber)
-      find . -maxdepth 1 -not -name . -not -name openttd-$(Build.BuildNumber) -exec mv {} openttd-$(Build.BuildNumber)/ \;
-      # Copy back release_date, as it is needed for the template 'release-bundles'
-      cp openttd-$(Build.BuildNumber)/.release_date .release_date
-
-      mkdir bundles
-      tar --xz -cf bundles/openttd-$(Build.BuildNumber)-source.tar.xz openttd-$(Build.BuildNumber)
-      zip -9 -r -q bundles/openttd-$(Build.BuildNumber)-source.zip openttd-$(Build.BuildNumber)
-    displayName: 'Create bundle'
-  - template: release-bundles.yml
-
-- job: meta
-  displayName: 'Metadata'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  dependsOn: source
-
-  steps:
-  - template: release-fetch-source.yml
-  - script: |
-      set -ex
-
-      mkdir -p bundles
-      cp .changelog bundles/changelog.txt
-      cp .release_date bundles/released.txt
-      cp README.md bundles/README.md
-    displayName: 'Copy meta files'
-  - template: release-bundles.yml
-    parameters:
-      CalculateChecksums: false
-
-- job: docs
-  displayName: 'Docs'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  dependsOn: source
-
-  steps:
-    - template: release-fetch-source.yml
-    - template: linux-build.yml
-      parameters:
-        Image: compile-farm
-        ContainerCommand: '$(Build.BuildNumber)'
-        Tag: docs
-    - template: linux-claim-bundles.yml
-    - template: release-bundles.yml
-
-- job: windows
-  displayName: 'Windows'
-  pool:
-    vmImage: 'VS2017-Win2016'
-  dependsOn: source
-
-  strategy:
-    matrix:
-      Win32:
-        BuildPlatform: 'Win32'
-        BundlePlatform: 'win32'
-      Win64:
-        BuildPlatform: 'x64'
-        BundlePlatform: 'win64'
-
-  steps:
-  - template: release-fetch-source.yml
-  - template: windows-dependencies.yml
-  - template: windows-dependency-zip.yml
-  - ${{ if eq(parameters.IsStableRelease, true) }}:
-    - template: windows-dependency-nsis.yml
-  - template: windows-build.yml
-    parameters:
-      BuildPlatform: $(BuildPlatform)
-  - bash: |
-      set -ex
-      make -f Makefile.msvc bundle_pdb bundle_zip PLATFORM=$(BundlePlatform) BUNDLE_NAME=openttd-$(Build.BuildNumber)-windows-$(BundlePlatform)
-    displayName: 'Create bundles'
-  - ${{ if eq(parameters.IsStableRelease, true) }}:
-    - bash: |
-        set -ex
-        # NSIS will be part of the Hosted image in the next update. Till then, we set the PATH ourself
-        export PATH="${PATH}:/c/Program Files (x86)/NSIS"
-        make -f Makefile.msvc bundle_exe PLATFORM=$(BundlePlatform) BUNDLE_NAME=openttd-$(Build.BuildNumber)-windows-$(BundlePlatform)
-      displayName: 'Create installer bundle'
-  - template: release-bundles.yml
-
-- ${{ if eq(parameters.IsStableRelease, true) }}:
-  - job: linux_stable
-    displayName: 'Linux'
-    pool:
-      vmImage: 'ubuntu-16.04'
-    dependsOn: source
-
-    strategy:
-      matrix:
-        linux-ubuntu-xenial-i386-gcc: {}
-        linux-ubuntu-xenial-amd64-gcc: {}
-        linux-ubuntu-bionic-i386-gcc: {}
-        linux-ubuntu-bionic-amd64-gcc: {}
-        linux-debian-jessie-i386-gcc: {}
-        linux-debian-jessie-amd64-gcc: {}
-        linux-debian-stretch-i386-gcc: {}
-        linux-debian-stretch-amd64-gcc: {}
-
-    steps:
-    - template: release-fetch-source.yml
-    - template: linux-build.yml
-      parameters:
-        Image: compile-farm
-        ContainerCommand: '$(Build.BuildNumber)'
-        Tag: $(Agent.JobName)
-    - template: linux-claim-bundles.yml
-    - template: release-bundles.yml
-
-- job: macos
-  displayName: 'MacOS'
-  pool:
-    vmImage: 'macOS-10.13'
-  dependsOn: source
-
-  variables:
-    MACOSX_DEPLOYMENT_TARGET: 10.9
-
-  steps:
-  - template: release-fetch-source.yml
-  - template: osx-dependencies.yml
-  - template: osx-build.yml
-  - script: 'make bundle_zip bundle_dmg BUNDLE_NAME=openttd-$(Build.BuildNumber)-macosx'
-    displayName: 'Create bundles'
-  - template: release-bundles.yml
-
-- job: manifest
-  displayName: 'Manifest'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  dependsOn:
-  - source
-  - docs
-  - windows
-  - ${{ if eq(parameters.IsStableRelease, true) }}:
-    - linux_stable
-  - macos
-  # "Skipped" is not a status, and is not succeeded. So it seems to be
-  # considered failed. So we trigger if all the earlier jobs are done (which
-  # might be succeeded, failed, or skipped), and run this job. This is not
-  # optimal, but given the rules, it is the only way to get this to work (as
-  # some jobs might be skipped).
-  condition: succeededOrFailed()
-
-  steps:
-  - template: release-fetch-source.yml
-  - template: release-manifest.yml
-    ${{ if eq(parameters.IsStableRelease, true) }}:
-      parameters:
-        IsStableRelease: true
-  - template: release-bundles.yml
-    parameters:
-      CalculateChecksums: false

azure-pipelines/templates/windows-build.yml

@@ -1,11 +0,0 @@
-parameters:
-  BuildPlatform: ''
-
-steps:
-- task: VSBuild@1
-  displayName: 'Build'
-  inputs:
-    solution: 'projects/openttd_vs141.sln'
-    platform: ${{ parameters.BuildPlatform }}
-    configuration: Release
-    maximumCpuCount: true

azure-pipelines/templates/windows-dependencies.yml

@@ -1,14 +0,0 @@
-steps:
-- bash: |
-    set -ex
-
-    curl -L https://github.com/OpenTTD/CompileFarm/releases/download/latest/windows-dependencies.zip > windows-dependencies.zip
-    unzip windows-dependencies.zip
-    rm -f windows-dependencies.zip
-
-    mv windows-dependencies/installed /c/vcpkg/
-    rm -rf windows-dependencies
-  displayName: 'Install dependencies'
-  workingDirectory: $(Build.ArtifactStagingDirectory)
-- script: c:\vcpkg\vcpkg.exe integrate install
-  displayName: 'Integrate vcpkg'

azure-pipelines/templates/windows-dependency-nsis.yml

@@ -1,26 +0,0 @@
-parameters:
-  condition: true
-
-steps:
-- bash: |
-    set -ex
-
-    mkdir nsis-plugin; cd nsis-plugin
-    curl -L https://devs.openttd.org/~truebrain/nsis-plugins/Nsis7z.zip > Nsis7z.zip
-    unzip Nsis7z.zip
-    cp -R Plugins/* "/c/Program Files (x86)/NSIS/Plugins/"
-    cd ..; rm -rf nsis-plugin
-
-    mkdir nsis-plugin; cd nsis-plugin
-    curl -L https://devs.openttd.org/~truebrain/nsis-plugins/NsisGetVersion.zip > NsisGetVersion.zip
-    unzip NsisGetVersion.zip
-    cp -R Plugins/* "/c/Program Files (x86)/NSIS/Plugins/x86-ansi/"
-    cd ..; rm -rf nsis-plugin
-
-    mkdir nsis-plugin; cd nsis-plugin
-    curl -L https://devs.openttd.org/~truebrain/nsis-plugins/NsisFindProc.zip > NsisFindProc.zip
-    unzip NsisFindProc.zip
-    cp -R *.dll "/c/Program Files (x86)/NSIS/Plugins/x86-ansi/"
-    cd ..; rm -rf nsis-plugin
-  displayName: 'Install NSIS with the 7z, GetVersion, and FindProc plugins'
-  condition: and(succeeded(), ${{ parameters.condition }})

azure-pipelines/templates/windows-dependency-zip.yml

@@ -1,5 +0,0 @@
-steps:
-- bash: |
-    set -ex
-    choco install zip
-  displayName: 'Install zip'

bin/ai/compat_0.7.nut

@@ -7,7 +7,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-AILog.Info("0.7 API compatibility in effect:");
+AILog.Info("0.7 API compatability in effect:");
 AILog.Info(" - AITown::GetLastMonthProduction's behaviour has slightly changed.");
 AILog.Info(" - AISubsidy::GetDestination returns STATION_INVALID for awarded subsidies.");
 AILog.Info(" - AISubsidy::GetSource returns STATION_INVALID for awarded subsidies.");
@@ -258,126 +258,3 @@ class AIWaypointList extends _AIWaypointList {
 		::_AIWaypointList.constructor(AIWaypoint.WAYPOINT_RAIL);
 	}
 }
-
-AIRoad._BuildRoadStation <- AIRoad.BuildRoadStation;
-AIRoad.BuildRoadStation <- function(tile, front, road_veh_type, station_id)
-{
-	if (AIRoad.IsRoadStationTile(tile) && AICompany.IsMine(AITile.GetOwner(tile))) return false;
-
-	return AIRoad._BuildRoadStation(tile, front, road_veh_type, station_id);
-}
-
-AIRoad._BuildDriveThroughRoadStation <- AIRoad.BuildDriveThroughRoadStation;
-AIRoad.BuildDriveThroughRoadStation <- function(tile, front, road_veh_type, station_id)
-{
-	if (AIRoad.IsRoadStationTile(tile) && AICompany.IsMine(AITile.GetOwner(tile))) return false;
-
-	return AIRoad._BuildDriveThroughRoadStation(tile, front, road_veh_type, station_id);
-}
-
-AIBridgeList.HasNext <-
-AIBridgeList_Length.HasNext <-
-AICargoList.HasNext <-
-AICargoList_IndustryAccepting.HasNext <-
-AICargoList_IndustryProducing.HasNext <-
-AIDepotList.HasNext <-
-AIEngineList.HasNext <-
-AIGroupList.HasNext <-
-AIIndustryList.HasNext <-
-AIIndustryList_CargoAccepting.HasNext <-
-AIIndustryList_CargoProducing.HasNext <-
-AIIndustryTypeList.HasNext <-
-AIList.HasNext <-
-AIRailTypeList.HasNext <-
-AISignList.HasNext <-
-AIStationList.HasNext <-
-AIStationList_Vehicle.HasNext <-
-AISubsidyList.HasNext <-
-AITileList.HasNext <-
-AITileList_IndustryAccepting.HasNext <-
-AITileList_IndustryProducing.HasNext <-
-AITileList_StationType.HasNext <-
-AITownList.HasNext <-
-AIVehicleList.HasNext <-
-AIVehicleList_DefaultGroup.HasNext <-
-AIVehicleList_Group.HasNext <-
-AIVehicleList_SharedOrders.HasNext <-
-AIVehicleList_Station.HasNext <-
-AIWaypointList.HasNext <-
-AIWaypointList_Vehicle.HasNext <-
-function()
-{
-	return !this.IsEnd();
-}
-
-AIIndustry._IsCargoAccepted <- AIIndustry.IsCargoAccepted;
-AIIndustry.IsCargoAccepted <- function(industry_id, cargo_id)
-{
-	return AIIndustry._IsCargoAccepted(industry_id, cargo_id) != AIIndustry.CAS_NOT_ACCEPTED;
-}
-
-AIAbstractList <- AIList;
-
-AIList.ChangeItem <- AIList.SetValue;
-
-AIRail.ERR_NONUNIFORM_STATIONS_DISABLED <- 0xFFFF;
-
-AICompany.GetCompanyValue <- function(company)
-{
-	return AICompany.GetQuarterlyCompanyValue(company, AICompany.CURRENT_QUARTER);
-}
-
-AITown.GetLastMonthTransported <- AITown.GetLastMonthSupplied;
-
-AIEvent.AI_ET_INVALID <- AIEvent.ET_INVALID;
-AIEvent.AI_ET_TEST <- AIEvent.ET_TEST;
-AIEvent.AI_ET_SUBSIDY_OFFER <- AIEvent.ET_SUBSIDY_OFFER;
-AIEvent.AI_ET_SUBSIDY_OFFER_EXPIRED <- AIEvent.ET_SUBSIDY_OFFER_EXPIRED;
-AIEvent.AI_ET_SUBSIDY_AWARDED <- AIEvent.ET_SUBSIDY_AWARDED;
-AIEvent.AI_ET_SUBSIDY_EXPIRED <- AIEvent.ET_SUBSIDY_EXPIRED;
-AIEvent.AI_ET_ENGINE_PREVIEW <- AIEvent.ET_ENGINE_PREVIEW;
-AIEvent.AI_ET_COMPANY_NEW <- AIEvent.ET_COMPANY_NEW;
-AIEvent.AI_ET_COMPANY_IN_TROUBLE <- AIEvent.ET_COMPANY_IN_TROUBLE;
-AIEvent.AI_ET_COMPANY_MERGER <- AIEvent.ET_COMPANY_MERGER;
-AIEvent.AI_ET_COMPANY_BANKRUPT <- AIEvent.ET_COMPANY_BANKRUPT;
-AIEvent.AI_ET_VEHICLE_CRASHED <- AIEvent.ET_VEHICLE_CRASHED;
-AIEvent.AI_ET_VEHICLE_LOST <- AIEvent.ET_VEHICLE_LOST;
-AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT <- AIEvent.ET_VEHICLE_WAITING_IN_DEPOT;
-AIEvent.AI_ET_VEHICLE_UNPROFITABLE <- AIEvent.ET_VEHICLE_UNPROFITABLE;
-AIEvent.AI_ET_INDUSTRY_OPEN <- AIEvent.ET_INDUSTRY_OPEN;
-AIEvent.AI_ET_INDUSTRY_CLOSE <- AIEvent.ET_INDUSTRY_CLOSE;
-AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
-AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
-AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
-AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
-AIOrder.AIOF_NONE <- AIOrder.OF_NONE
-AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
-AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
-AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
-AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
-AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
-AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
-AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
-AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
-AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
-AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
-AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
-AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
-AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
-AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
-AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
-AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
-
-/* 1.9 adds a vehicle type parameter. */
-AIBridge._GetName <- AIBridge.GetName;
-AIBridge.GetName <- function(bridge_id)
-{
-	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
-}
-
-/* 1.9 adds parent_group_id to CreateGroup function */
-AIGroup._CreateGroup <- AIGroup.CreateGroup;
-AIGroup.CreateGroup <- function(vehicle_type)
-{
-	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
-}

bin/ai/compat_1.0.nut

@@ -6,130 +6,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.0 API compatibility in effect.");
-
-AIRoad._BuildRoadStation <- AIRoad.BuildRoadStation;
-AIRoad.BuildRoadStation <- function(tile, front, road_veh_type, station_id)
-{
-	if (AIRoad.IsRoadStationTile(tile) && AICompany.IsMine(AITile.GetOwner(tile))) return false;
-
-	return AIRoad._BuildRoadStation(tile, front, road_veh_type, station_id);
-}
-
-AIRoad._BuildDriveThroughRoadStation <- AIRoad.BuildDriveThroughRoadStation;
-AIRoad.BuildDriveThroughRoadStation <- function(tile, front, road_veh_type, station_id)
-{
-	if (AIRoad.IsRoadStationTile(tile) && AICompany.IsMine(AITile.GetOwner(tile))) return false;
-
-	return AIRoad._BuildDriveThroughRoadStation(tile, front, road_veh_type, station_id);
-}
-
-AIBridgeList.HasNext <-
-AIBridgeList_Length.HasNext <-
-AICargoList.HasNext <-
-AICargoList_IndustryAccepting.HasNext <-
-AICargoList_IndustryProducing.HasNext <-
-AIDepotList.HasNext <-
-AIEngineList.HasNext <-
-AIGroupList.HasNext <-
-AIIndustryList.HasNext <-
-AIIndustryList_CargoAccepting.HasNext <-
-AIIndustryList_CargoProducing.HasNext <-
-AIIndustryTypeList.HasNext <-
-AIList.HasNext <-
-AIRailTypeList.HasNext <-
-AISignList.HasNext <-
-AIStationList.HasNext <-
-AIStationList_Vehicle.HasNext <-
-AISubsidyList.HasNext <-
-AITileList.HasNext <-
-AITileList_IndustryAccepting.HasNext <-
-AITileList_IndustryProducing.HasNext <-
-AITileList_StationType.HasNext <-
-AITownList.HasNext <-
-AIVehicleList.HasNext <-
-AIVehicleList_DefaultGroup.HasNext <-
-AIVehicleList_Depot.HasNext <-
-AIVehicleList_Group.HasNext <-
-AIVehicleList_SharedOrders.HasNext <-
-AIVehicleList_Station.HasNext <-
-AIWaypointList.HasNext <-
-AIWaypointList_Vehicle.HasNext <-
-function()
-{
-	return !this.IsEnd();
-}
-
-AIIndustry._IsCargoAccepted <- AIIndustry.IsCargoAccepted;
-AIIndustry.IsCargoAccepted <- function(industry_id, cargo_id)
-{
-	return AIIndustry._IsCargoAccepted(industry_id, cargo_id) != AIIndustry.CAS_NOT_ACCEPTED;
-}
-
-AIAbstractList <- AIList;
-
-AIList.ChangeItem <- AIList.SetValue;
-
-AIRail.ERR_NONUNIFORM_STATIONS_DISABLED <- 0xFFFF;
-
-AICompany.GetCompanyValue <- function(company)
-{
-	return AICompany.GetQuarterlyCompanyValue(company, AICompany.CURRENT_QUARTER);
-}
-
-AITown.GetLastMonthTransported <- AITown.GetLastMonthSupplied;
-
-AIEvent.AI_ET_INVALID <- AIEvent.ET_INVALID;
-AIEvent.AI_ET_TEST <- AIEvent.ET_TEST;
-AIEvent.AI_ET_SUBSIDY_OFFER <- AIEvent.ET_SUBSIDY_OFFER;
-AIEvent.AI_ET_SUBSIDY_OFFER_EXPIRED <- AIEvent.ET_SUBSIDY_OFFER_EXPIRED;
-AIEvent.AI_ET_SUBSIDY_AWARDED <- AIEvent.ET_SUBSIDY_AWARDED;
-AIEvent.AI_ET_SUBSIDY_EXPIRED <- AIEvent.ET_SUBSIDY_EXPIRED;
-AIEvent.AI_ET_ENGINE_PREVIEW <- AIEvent.ET_ENGINE_PREVIEW;
-AIEvent.AI_ET_COMPANY_NEW <- AIEvent.ET_COMPANY_NEW;
-AIEvent.AI_ET_COMPANY_IN_TROUBLE <- AIEvent.ET_COMPANY_IN_TROUBLE;
-AIEvent.AI_ET_COMPANY_ASK_MERGER <- AIEvent.ET_COMPANY_ASK_MERGER;
-AIEvent.AI_ET_COMPANY_MERGER <- AIEvent.ET_COMPANY_MERGER;
-AIEvent.AI_ET_COMPANY_BANKRUPT <- AIEvent.ET_COMPANY_BANKRUPT;
-AIEvent.AI_ET_VEHICLE_CRASHED <- AIEvent.ET_VEHICLE_CRASHED;
-AIEvent.AI_ET_VEHICLE_LOST <- AIEvent.ET_VEHICLE_LOST;
-AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT <- AIEvent.ET_VEHICLE_WAITING_IN_DEPOT;
-AIEvent.AI_ET_VEHICLE_UNPROFITABLE <- AIEvent.ET_VEHICLE_UNPROFITABLE;
-AIEvent.AI_ET_INDUSTRY_OPEN <- AIEvent.ET_INDUSTRY_OPEN;
-AIEvent.AI_ET_INDUSTRY_CLOSE <- AIEvent.ET_INDUSTRY_CLOSE;
-AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
-AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
-AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
-AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
-AIOrder.AIOF_NONE <- AIOrder.OF_NONE
-AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
-AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
-AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
-AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
-AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
-AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
-AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
-AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
-AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
-AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
-AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
-AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
-AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
-AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
-AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
-AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
-
-/* 1.9 adds a vehicle type parameter. */
-AIBridge._GetName <- AIBridge.GetName;
-AIBridge.GetName <- function(bridge_id)
-{
-	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
-}
-
-/* 1.9 adds parent_group_id to CreateGroup function */
-AIGroup._CreateGroup <- AIGroup.CreateGroup;
-AIGroup.CreateGroup <- function(vehicle_type)
-{
-	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
-}

bin/ai/compat_1.1.nut

@@ -1,72 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.1 API compatibility in effect.");
-
-AICompany.GetCompanyValue <- function(company)
-{
-	return AICompany.GetQuarterlyCompanyValue(company, AICompany.CURRENT_QUARTER);
-}
-
-AITown.GetLastMonthTransported <- AITown.GetLastMonthSupplied;
-
-AIEvent.AI_ET_INVALID <- AIEvent.ET_INVALID;
-AIEvent.AI_ET_TEST <- AIEvent.ET_TEST;
-AIEvent.AI_ET_SUBSIDY_OFFER <- AIEvent.ET_SUBSIDY_OFFER;
-AIEvent.AI_ET_SUBSIDY_OFFER_EXPIRED <- AIEvent.ET_SUBSIDY_OFFER_EXPIRED;
-AIEvent.AI_ET_SUBSIDY_AWARDED <- AIEvent.ET_SUBSIDY_AWARDED;
-AIEvent.AI_ET_SUBSIDY_EXPIRED <- AIEvent.ET_SUBSIDY_EXPIRED;
-AIEvent.AI_ET_ENGINE_PREVIEW <- AIEvent.ET_ENGINE_PREVIEW;
-AIEvent.AI_ET_COMPANY_NEW <- AIEvent.ET_COMPANY_NEW;
-AIEvent.AI_ET_COMPANY_IN_TROUBLE <- AIEvent.ET_COMPANY_IN_TROUBLE;
-AIEvent.AI_ET_COMPANY_ASK_MERGER <- AIEvent.ET_COMPANY_ASK_MERGER;
-AIEvent.AI_ET_COMPANY_MERGER <- AIEvent.ET_COMPANY_MERGER;
-AIEvent.AI_ET_COMPANY_BANKRUPT <- AIEvent.ET_COMPANY_BANKRUPT;
-AIEvent.AI_ET_VEHICLE_CRASHED <- AIEvent.ET_VEHICLE_CRASHED;
-AIEvent.AI_ET_VEHICLE_LOST <- AIEvent.ET_VEHICLE_LOST;
-AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT <- AIEvent.ET_VEHICLE_WAITING_IN_DEPOT;
-AIEvent.AI_ET_VEHICLE_UNPROFITABLE <- AIEvent.ET_VEHICLE_UNPROFITABLE;
-AIEvent.AI_ET_INDUSTRY_OPEN <- AIEvent.ET_INDUSTRY_OPEN;
-AIEvent.AI_ET_INDUSTRY_CLOSE <- AIEvent.ET_INDUSTRY_CLOSE;
-AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
-AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
-AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
-AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
-AIEvent.AI_ET_TOWN_FOUNDED <- AIEvent.ET_TOWN_FOUNDED;
-AIOrder.AIOF_NONE <- AIOrder.OF_NONE
-AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
-AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
-AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
-AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
-AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
-AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
-AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
-AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
-AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
-AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
-AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
-AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
-AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
-AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
-AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
-AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
-
-/* 1.9 adds a vehicle type parameter. */
-AIBridge._GetName <- AIBridge.GetName;
-AIBridge.GetName <- function(bridge_id)
-{
-	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
-}
-
-/* 1.9 adds parent_group_id to CreateGroup function */
-AIGroup._CreateGroup <- AIGroup.CreateGroup;
-AIGroup.CreateGroup <- function(vehicle_type)
-{
-	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
-}

bin/ai/compat_1.2.nut

@@ -1,24 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.2 API compatibility in effect.");
-
-/* 1.9 adds a vehicle type parameter. */
-AIBridge._GetName <- AIBridge.GetName;
-AIBridge.GetName <- function(bridge_id)
-{
-	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
-}
-
-/* 1.9 adds parent_group_id to CreateGroup function */
-AIGroup._CreateGroup <- AIGroup.CreateGroup;
-AIGroup.CreateGroup <- function(vehicle_type)
-{
-	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
-}

bin/ai/compat_1.3.nut

@@ -1,24 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.3 API compatibility in effect.");
-
-/* 1.9 adds a vehicle type parameter. */
-AIBridge._GetName <- AIBridge.GetName;
-AIBridge.GetName <- function(bridge_id)
-{
-	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
-}
-
-/* 1.9 adds parent_group_id to CreateGroup function */
-AIGroup._CreateGroup <- AIGroup.CreateGroup;
-AIGroup.CreateGroup <- function(vehicle_type)
-{
-	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
-}

bin/ai/compat_1.4.nut

@@ -1,24 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.4 API compatibility in effect.");
-
-/* 1.9 adds a vehicle type parameter. */
-AIBridge._GetName <- AIBridge.GetName;
-AIBridge.GetName <- function(bridge_id)
-{
-	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
-}
-
-/* 1.9 adds parent_group_id to CreateGroup function */
-AIGroup._CreateGroup <- AIGroup.CreateGroup;
-AIGroup.CreateGroup <- function(vehicle_type)
-{
-	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
-}

bin/ai/compat_1.5.nut

@@ -1,24 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.5 API compatibility in effect.");
-
-/* 1.9 adds a vehicle type parameter. */
-AIBridge._GetName <- AIBridge.GetName;
-AIBridge.GetName <- function(bridge_id)
-{
-	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
-}
-
-/* 1.9 adds parent_group_id to CreateGroup function */
-AIGroup._CreateGroup <- AIGroup.CreateGroup;
-AIGroup.CreateGroup <- function(vehicle_type)
-{
-	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
-}

bin/ai/compat_1.6.nut

@@ -1,24 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.6 API compatibility in effect.");
-
-/* 1.9 adds a vehicle type parameter. */
-AIBridge._GetName <- AIBridge.GetName;
-AIBridge.GetName <- function(bridge_id)
-{
-	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
-}
-
-/* 1.9 adds parent_group_id to CreateGroup function */
-AIGroup._CreateGroup <- AIGroup.CreateGroup;
-AIGroup.CreateGroup <- function(vehicle_type)
-{
-	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
-}

bin/ai/compat_1.7.nut

@@ -1,24 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.7 API compatibility in effect.");
-
-/* 1.9 adds a vehicle type parameter. */
-AIBridge._GetName <- AIBridge.GetName;
-AIBridge.GetName <- function(bridge_id)
-{
-	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
-}
-
-/* 1.9 adds parent_group_id to CreateGroup function */
-AIGroup._CreateGroup <- AIGroup.CreateGroup;
-AIGroup.CreateGroup <- function(vehicle_type)
-{
-	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
-}

bin/ai/compat_1.8.nut

@@ -1,24 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.8 API compatibility in effect.");
-
-/* 1.9 adds a vehicle type parameter. */
-AIBridge._GetName <- AIBridge.GetName;
-AIBridge.GetName <- function(bridge_id)
-{
-	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
-}
-
-/* 1.9 adds parent_group_id to CreateGroup function */
-AIGroup._CreateGroup <- AIGroup.CreateGroup;
-AIGroup.CreateGroup <- function(vehicle_type)
-{
-	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
-}

bin/ai/regression/completeness.sh

@@ -2,12 +2,12 @@
 
 # $Id$
 
-if ! [ -f ai/regression/completeness.sh ]; then
+if ! [ -f ai/regression/regression.nut ]; then
 	echo "Make sure you are in the root of OpenTTD before starting this script."
 	exit 1
 fi
 
-cat ai/regression/tst_*/main.nut | tr ';' '\n' | awk '
+cat ai/regression/regression.nut | tr ';' '\n' | awk '
 /^function/ {
 	for (local in locals) {
 		delete locals[local]
@@ -61,7 +61,7 @@ cat ai/regression/tst_*/main.nut | tr ';' '\n' | awk '
 }
 ' | sed 's/	//g' | sort | uniq > tmp.in_regression
 
-grep 'DefSQ.*Method' ../src/script/api/ai/*.hpp.sq | grep -v 'AIError::' | grep -v 'AIAbstractList::Valuate' | grep -v '::GetClassName' | sed 's/^[^,]*, &//g;s/,[^,]*//g' | sort > tmp.in_api
+grep 'DefSQ.*Method' ../src/ai/api/*.hpp.sq | grep -v 'AIError::' | grep -v 'AIAbstractList::Valuate' | grep -v '::GetClassName' | sed 's/^[^,]*, &//g;s/,[^,]*//g' | sort > tmp.in_api
 
 diff -u tmp.in_regression tmp.in_api | grep -v '^+++' | grep '^+' | sed 's/^+//'
 

bin/ai/regression/regression.cfg

@@ -15,6 +15,3 @@ regression =
 [vehicle]
 road_side = right
 plane_speed = 2
-
-[construction]
-max_bridge_length = 100

bin/ai/regression/regression_info.nut

@@ -4,9 +4,9 @@ class Regression extends AIInfo {
 	function GetAuthor()      { return "OpenTTD NoAI Developers Team"; }
 	function GetName()        { return "Regression"; }
 	function GetShortName()   { return "REGR"; }
-	function GetDescription() { return "This runs regression-tests on some commands. On the same map the result should always be the same."; }
+	function GetDescription() { return "This runs regression-tests on all commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.9"; }
+	function GetAPIVersion()  { return "1.0"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }

bin/ai/regression/run.sh

@@ -2,11 +2,14 @@
 
 # $Id$
 
-if ! [ -f ai/regression/run.sh ]; then
+if ! [ -f ai/regression/regression.nut ]; then
 	echo "Make sure you are in the root of OpenTTD before starting this script."
 	exit 1
 fi
 
+cp ai/regression/regression.nut ai/regression/main.nut
+cp ai/regression/regression_info.nut ai/regression/info.nut
+
 if [ -f scripts/game_start.scr ]; then
 	mv scripts/game_start.scr scripts/game_start.scr.regression
 fi
@@ -19,53 +22,30 @@ fi
 if [ "$1" = "-g" ]; then
 	gdb="gdb --ex run --args "
 fi
-
-if [ -d "ai/regression/tst_$1" ]; then
-	tests="ai/regression/tst_$1"
-elif [ -d "ai/regression/tst_$2" ]; then
-	tests="ai/regression/tst_$2"
+if [ -n "$gdb" ]; then
+	$gdb ./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav
 else
-	tests=ai/regression/tst_*
+	./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d ai=2 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)", "0x00000000", $0); gsub("^dbg: \\[ai\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' > tmp.regression
 fi
 
-ret=0
-for tst in $tests; do
-	echo -n "Running $tst... "
-
-	# Make sure that only one info.nut is present for each test run. Otherwise openttd gets confused.
-	cp ai/regression/regression_info.nut $tst/info.nut
-
-	sav=$tst/test.sav
-	if ! [ -f $sav ]; then
-		sav=ai/regression/empty.sav
-	fi
-
-	if [ -n "$gdb" ]; then
-		$gdb ./openttd -x -c ai/regression/regression.cfg $params -g $sav
+if [ -z "$gdb" ]; then
+	res="`diff -ub ai/regression/regression.txt tmp.regression`"
+	if [ -z "$res" ]; then
+		echo "Regression test passed!"
 	else
-		./openttd -x -c ai/regression/regression.cfg $params -g $sav -d script=2 -d misc=9 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[script\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' | grep -v '^dbg: \[.*\]' > $tst/tmp.regression
+		echo "Regression test failed! Difference:"
+		echo "$res"
 	fi
+	echo ""
+	echo "Regression test done"
+fi
 
-	if [ -z "$gdb" ]; then
-		res="`diff -ub $tst/result.txt $tst/tmp.regression`"
-		if [ -z "$res" ]; then
-			echo "passed!"
-		else
-			echo "failed! Difference:"
-			echo "$res"
-			ret=1
-		fi
-	fi
-
-	rm $tst/info.nut
-
-	if [ "$1" != "-k" ]; then
-		rm -f $tst/tmp.regression
-	fi
-done
+rm -f ai/regression/main.nut ai/regression/info.nut
 
 if [ -f scripts/game_start.scr.regression ]; then
 	mv scripts/game_start.scr.regression scripts/game_start.scr
 fi
 
-exit $ret
+if [ "$1" != "-k" ]; then
+	rm -f tmp.regression
+fi

bin/ai/regression/run.vbs

@@ -1,154 +0,0 @@
-Option Explicit
-
-' $Id$
-'
-' 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/>.
-
-Dim FSO
-Set FSO = CreateObject("Scripting.FileSystemObject")
-
-Function GetTestList()
-	Dim retests, i, tests, dir
-	Set retests = New RegExp
-	Set GetTestList = CreateObject("Scripting.Dictionary")
-
-	retests.Pattern = "ai/regression/tst_*"
-	retests.Global = True
-	For i = 0 To WScript.Arguments.Count - 1
-		Dim test
-		test = "ai/regression/tst_" & WScript.Arguments.Item(i)
-		If FSO.FolderExists(test) Then
-			retests.Pattern = test
-			Exit For
-		End If
-	Next
-
-	For Each dir In FSO.GetFolder("ai/regression/").SubFolders
-		Dim name
-		name = "ai/regression/" & dir.Name
-		If retests.Test(name) Then
-			GetTestList.Add name, name
-		End If
-	Next
-End Function
-
-Function GetParams()
-	GetParams = "-snull -mnull -vnull:ticks=30000"
-	If WScript.Arguments.Count = 0 Then Exit Function
-	If WScript.Arguments.Item(0) <> "-r" Then Exit Function
-	GetParams = ""
-End Function
-
-Sub FilterFile(filename)
-	Dim lines, filter, file
-
-	Set file = FSO.OpenTextFile(filename, 1)
-	If Not file.AtEndOfStream Then
-		lines = file.ReadAll
-	End If
-	file.Close
-
-	Set filter = New RegExp
-	filter.Global = True
-	filter.Multiline = True
-	filter.Pattern = "0x(\(nil\)|0+)(x0)?"
-	lines = filter.Replace(lines, "0x00000000")
-	filter.Pattern = "^dbg: \[script\]"
-	lines = filter.Replace(lines, "")
-	filter.Pattern = "^ "
-	lines = filter.Replace(lines, "ERROR: ")
-	filter.Pattern = "ERROR: \[1\] \[P\] "
-	lines = filter.Replace(lines, "")
-	filter.Pattern = "^dbg: .*\r\n"
-	lines = filter.Replace(lines, "")
-
-	Set file = FSO.OpenTextFile(filename, 2)
-	file.Write lines
-	file.Close
-End Sub
-
-Function CompareFiles(filename1, filename2)
-	Dim file, lines1, lines2
-	Set file = FSO.OpenTextFile(filename1, 1)
-	If Not file.AtEndOfStream Then
-		lines1 = file.ReadAll
-	End IF
-	file.Close
-	Set file = FSO.OpenTextFile(filename2, 1)
-	If Not file.AtEndOfStream Then
-		lines2 = file.ReadAll
-	End IF
-	file.Close
-	CompareFiles = (lines1 = lines2)
-End Function
-
-Function RunTest(test, params, ret)
-	Dim WshShell, oExec, sav, command
-	Set WshShell = CreateObject("WScript.Shell")
-
-	' Make sure that only one info.nut is present for each test run. Otherwise openttd gets confused.
-	FSO.CopyFile "ai/regression/regression_info.nut", test & "/info.nut"
-
-	sav = test & "/test.sav"
-	If Not FSO.FileExists(sav) Then
-		sav = "ai/regression/empty.sav"
-	End If
-
-	command = ".\openttd -x -c ai/regression/regression.cfg " & params & " -g " & sav & " -d script=2 -d misc=9"
-	' 2>&1 must be after >tmp.regression, else stderr is not redirected to the file
-	WshShell.Run "cmd /c " & command & " >"& test & "/tmp.regression 2>&1", 0, True
-
-	FilterFile test & "/tmp.regression"
-
-	If CompareFiles(test & "/result.txt", test & "/tmp.regression") Then
-		RunTest = "passed!"
-	Else
-		RunTest = "failed!"
-		ret = 1
-	End If
-
-	FSO.DeleteFile test & "/info.nut"
-
-	If WScript.Arguments.Count > 0 Then
-		If WScript.Arguments.Item(0) = "-k" Then
-			Exit Function
-		End If
-	End If
-
-	FSO.DeleteFile test & "/tmp.regression"
-End Function
-
-On Error Resume Next
-WScript.StdOut.WriteLine ""
-If Err.Number <> 0 Then
-	WScript.Echo "This script must be started with cscript."
-	WScript.Quit 1
-End If
-On Error Goto 0
-
-If Not FSO.FileExists("ai/regression/run.vbs") Then
-	WScript.Echo "Make sure you are in the root of OpenTTD before starting this script."
-	WScript.Quit 1
-End If
-
-If FSO.FileExists("scripts/game_start.scr") Then
-	FSO.MoveFile "scripts/game_start.scr", "scripts/game_start.scr.regression"
-End If
-
-Dim params, test, ret
-params = GetParams()
-ret = 0
-
-For Each test in GetTestList()
-	WScript.StdOut.Write "Running " & test & "... "
-	WScript.StdOut.WriteLine RunTest(test, params, ret)
-Next
-
-If FSO.FileExists("scripts/game_start.scr.regression") Then
-	FSO.MoveFile "scripts/game_start.scr.regression", "scripts/game_start.scr"
-End If
-
-WScript.Quit ret

bin/ai/regression/tst_stationlist/main.nut

@@ -1,216 +0,0 @@
-/* $Id$ */
-
-class Regression extends AIController {
-	function Start();
-};
-
-
-function Regression::StationList()
-{
-	local list = AIStationList(AIStation.STATION_BUS_STOP + AIStation.STATION_TRUCK_STOP);
-
-	print("");
-	print("--StationList--");
-	print("  Count():             " + list.Count());
-	list.Valuate(AIStation.GetLocation);
-	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetCargoWaiting, 0);
-	print("  CargoWaiting(0) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetCargoWaiting, 1);
-	print("  CargoWaiting(1) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_Cargo()
-{
-	print("");
-	print("--StationList_Cargo--");
-
-	for (local mode = AIStationList_Cargo.CM_WAITING; mode <= AIStationList_Cargo.CM_PLANNED; ++mode) {
-		print("  " + mode);
-		for (local selector = AIStationList_Cargo.CS_BY_FROM; selector <= AIStationList_Cargo.CS_FROM_BY_VIA ; ++selector) {
-			print("    " + selector);
-			local list = AIStationList_Cargo(mode, selector, 6, 0, 7);
-			for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-				print("      " + i + " => " + list.GetValue(i));
-			}
-		}
-	}
-};
-
-function Regression::StationList_CargoPlanned()
-{
-	print("");
-	print("--StationList_CargoPlanned--");
-
-	for (local selector = AIStationList_Cargo.CS_BY_FROM; selector <= AIStationList_Cargo.CS_FROM_BY_VIA; ++selector) {
-		print("    " + selector);
-		local list = AIStationList_CargoPlanned(selector, 6, 0, 7);
-		for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-			print("      " + i + " => " + list.GetValue(i));
-		}
-	}
-};
-
-function Regression::StationList_CargoPlannedByFrom()
-{
-	print("");
-	print("--StationList_CargoPlannedByFrom--");
-	local list = AIStationList_CargoPlannedByFrom(2, 0);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoPlannedByVia()
-{
-	print("");
-	print("--StationList_CargoPlannedByVia--");
-	local list = AIStationList_CargoPlannedByVia(2, 0);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoPlannedViaByFrom()
-{
-	print("");
-	print("--StationList_CargoPlannedViaByFrom--");
-	local list = AIStationList_CargoPlannedViaByFrom(6, 0, 7);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoPlannedFromByVia()
-{
-	print("");
-	print("--StationList_CargoPlannedFromByVia--");
-	local list = AIStationList_CargoPlannedFromByVia(6, 0, 7);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoWaiting()
-{
-	print("");
-	print("--StationList_CargoWaiting--");
-
-	for (local selector = AIStationList_Cargo.CS_BY_FROM; selector <= AIStationList_Cargo.CS_FROM_BY_VIA; ++selector) {
-		print("    " + selector);
-		local list = AIStationList_CargoWaiting(selector, 6, 0, 7);
-		for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-			print("      " + i + " => " + list.GetValue(i));
-		}
-	}
-};
-
-function Regression::StationList_CargoWaitingByFrom()
-{
-	print("");
-	print("--StationList_CargoWaitingByFrom--");
-	local list = AIStationList_CargoWaitingByFrom(2, 0);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoWaitingByVia()
-{
-	print("");
-	print("--StationList_CargoWaitingByVia--");
-	local list = AIStationList_CargoWaitingByVia(2, 0);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoWaitingViaByFrom()
-{
-	print("");
-	print("--StationList_CargoWaitingViaByFrom--");
-	local list = AIStationList_CargoWaitingViaByFrom(6, 0, 7);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_CargoWaitingFromByVia()
-{
-	print("");
-	print("--StationList_CargoWaitingFromByVia--");
-	local list = AIStationList_CargoWaitingFromByVia(2, 0, 2);
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("      " + i + " => " + list.GetValue(i));
-	}
-};
-
-function Regression::StationList_Vehicle()
-{
-	local list = AIStationList_Vehicle(12);
-
-	print("");
-	print("--StationList_Vehicle--");
-	print("  Count():             " + list.Count());
-	list.Valuate(AIStation.GetLocation);
-	print("  Location ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetCargoWaiting, 0);
-	print("  CargoWaiting(0) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetCargoWaiting, 1);
-	print("  CargoWaiting(1) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetCargoRating, 1);
-	print("  CargoRating(1) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetDistanceManhattanToTile, 30000);
-	print("  DistanceManhattanToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.GetDistanceSquareToTile, 30000);
-	print("  DistanceSquareToTile(30000) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-	list.Valuate(AIStation.IsWithinTownInfluence, 0);
-	print("  IsWithinTownInfluence(0) ListDump:");
-	for (local i = list.Begin(); !list.IsEnd(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-}
-
-function Regression::Start()
-{
-	StationList();
-	StationList_Cargo();
-	StationList_CargoPlanned();
-	StationList_CargoPlannedByFrom();
-	StationList_CargoPlannedByVia();
-	StationList_CargoPlannedViaByFrom();
-	StationList_CargoPlannedFromByVia();
-	StationList_CargoWaiting();
-	StationList_CargoWaitingByFrom();
-	StationList_CargoWaitingByVia();
-	StationList_CargoWaitingViaByFrom();
-	StationList_CargoWaitingFromByVia();
-	StationList_Vehicle();
-}

bin/ai/regression/tst_stationlist/result.txt

@@ -1,127 +0,0 @@
-
---StationList--
-  Count():             5
-  Location ListDump:
-    6 => 42341
-    2 => 41831
-    7 => 41825
-    5 => 33421
-    4 => 33411
-  CargoWaiting(0) ListDump:
-    7 => 6
-    6 => 6
-    2 => 3
-    5 => 0
-    4 => 0
-  CargoWaiting(1) ListDump:
-    7 => 0
-    6 => 0
-    5 => 0
-    4 => 0
-    2 => 0
-
---StationList_Cargo--
-  0
-    0
-      6 => 6
-    1
-      6 => 2
-    2
-      2 => 4
-      7 => 2
-    3
-  1
-    0
-      7 => 18
-      6 => 16
-      2 => 7
-    1
-      6 => 8
-      2 => 3
-    2
-      2 => 16
-      6 => 14
-      7 => 11
-    3
-      6 => 10
-      2 => 8
-
---StationList_CargoPlanned--
-    0
-      7 => 18
-      6 => 16
-      2 => 7
-    1
-      6 => 8
-      2 => 3
-    2
-      2 => 16
-      6 => 14
-      7 => 11
-    3
-      6 => 10
-      2 => 8
-
---StationList_CargoPlannedByFrom--
-      7 => 8
-      6 => 8
-      2 => 7
-
---StationList_CargoPlannedByVia--
-      2 => 16
-      6 => 7
-
---StationList_CargoPlannedViaByFrom--
-      6 => 8
-      2 => 3
-
---StationList_CargoPlannedFromByVia--
-      6 => 10
-      2 => 8
-
---StationList_CargoWaiting--
-    0
-      6 => 6
-    1
-      6 => 2
-    2
-      2 => 4
-      7 => 2
-    3
-
---StationList_CargoWaitingByFrom--
-      2 => 3
-
---StationList_CargoWaitingByVia--
-      6 => 3
-
---StationList_CargoWaitingViaByFrom--
-      6 => 2
-
---StationList_CargoWaitingFromByVia--
-      6 => 3
-
---StationList_Vehicle--
-  Count():             2
-  Location ListDump:
-    5 => 33421
-    4 => 33411
-  CargoWaiting(0) ListDump:
-    5 => 0
-    4 => 0
-  CargoWaiting(1) ListDump:
-    5 => 0
-    4 => 0
-  CargoRating(1) ListDump:
-    5 => -1
-    4 => -1
-  DistanceManhattanToTile(30000) ListDump:
-    5 => 106
-    4 => 96
-  DistanceSquareToTile(30000) ListDump:
-    5 => 8818
-    4 => 7058
-  IsWithinTownInfluence(0) ListDump:
-    5 => 0
-    4 => 0
-ERROR: The script died unexpectedly.

bin/data/no_sound.obs

@@ -0,0 +1,49 @@
+; $Id$
+;
+; This represents more or less nothingness
+;
+[metadata]
+name              = NoSound
+shortname         = NULL
+version           = 2
+fallback          = true
+description       = A sound pack without any sounds.
+description.af_ZA = 'n Klank stel sonder enige klanke.
+description.ar_EG = مجموعة صوت بدوت اصوات مضافة
+description.bg_BG = Празен звуков пакет.
+description.ca_ES = Un joc de sons sense cap so.
+description.cs_CZ = Prázdná sada zvuků.
+description.da_DA = En lydpakke uden lyde.
+description.de_DE = Basissounds ohne Sound.
+description.el_GR = Ένα πάκετο ήχων χώρις ήχους.
+description.en_GB = A sound pack without any sounds.
+description.en_US = A sound pack without any sounds.
+description.es_ES = Un conjunto de sonidos vacío.
+description.et_ET = Ilma häälteta helipakk.
+description.fi_FI = Äänipaketti ilman ääniä.
+description.fr_FR = Un pack de sons sans sons.
+description.hr_HR = Zvučni paket bez ikakvih zvukova.
+description.hu_HU = Hang alapcsomag hangok nélkül.
+description.id_ID = Paket efek suara tanpa berisi suara.
+description.it_IT = Un pacchetto sonoro non contenente alcun suono.
+description.nb_NO = En lydpakke uten noen lyder.
+description.nl_NL = Een geluidset zonder geluid.
+description.nn_NO = Ei lydpakke utan nokon lydar.
+description.pl_PL = Zestaw dźwięków nie zawierający żadnych dźwięków.
+description.pt_PT = Um conjunto de sons vazio.
+description.ro_RO = Un set de sunete fără nici un sunet inclus.
+description.ru_RU = "Пустой" набор звукового оформления, не содержащий никаких звуков.
+description.sk_SK = Zvuková sada neobsahujúca zvuky.
+description.sl_SL = Zvočni paket brez zvoka.
+description.sr_RS = Prazan skup zvukova.
+description.sv_SE = Ett ljudpaket utan några ljud.
+description.tr_TR = Ses içermeyen boş bir ses kümesi.
+description.zh_TW = 不含任何音效的音效集。
+
+[files]
+samples      =
+
+[md5s]
+
+[origin]
+default      = This file was part of your OpenTTD installation.

bin/data/orig_dos.obg

@@ -0,0 +1,62 @@
+; $Id$
+;
+; This represents the original graphics as on the non-German Transport
+; Tycoon Deluxe DOS CD.
+;
+[metadata]
+name              = original_dos
+shortname         = TTDD
+version           = 1
+palette           = DOS
+description       = Original Transport Tycoon Deluxe DOS edition graphics.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe grafieke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة الدوس
+description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS.
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS.
+description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro DOS).
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe DOS-version.
+description.de_DE = Original Transport Tycoon Deluxe DOS Basisgrafiken.
+description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση DOS.
+description.en_GB = Original Transport Tycoon Deluxe DOS edition graphics.
+description.en_US = Original Transport Tycoon Deluxe DOS edition graphics.
+description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS.
+description.et_ET = Algse Transport Tycoon Deluxe DOSi versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS grafiikat.
+description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS).
+description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának grafikája.
+description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS.
+description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione DOS.
+description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS.
+description.nl_NL = Originele graphics van de Transport Tycoon Deluxe DOS-versie.
+description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS.
+description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS.
+description.pt_PT = Gráficos originais da edição DOS de Transport Tycoon Deluxe.
+description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS.
+description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для DOS.
+description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (DOS).
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za različico DOS.
+description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe DOS izdanja.
+description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü grafikleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的圖形。
+
+[files]
+base         = TRG1.GRF
+logos        = TRGI.GRF
+arctic       = TRGC.GRF
+tropical     = TRGH.GRF
+toyland      = TRGT.GRF
+extra        = OPENTTDD.GRF
+
+[md5s]
+TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
+OPENTTDD.GRF = 356cf9663aacb212fdbff609d99090d6
+
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTDD.GRF = This file was part of your OpenTTD installation.

bin/data/orig_dos.obs

@@ -0,0 +1,50 @@
+; $Id$
+;
+; This represents the original sounds as on the Transport
+; Tycoon Deluxe DOS CD.
+;
+[metadata]
+name              = original_dos
+shortname         = TTDO
+version           = 0
+description       = Original Transport Tycoon Deluxe DOS edition sounds.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe klanke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة الدوس
+description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за DOS.
+description.ca_ES = Sons originals de Transport Tycoon Deluxe per a DOS.
+description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro DOS).
+description.da_DA = Originallyd fra Transport Tycoon Deluxe DOS-version.
+description.de_DE = Original Transport Tycoon Deluxe DOS Basissounds.
+description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe έκδοση DOS.
+description.en_GB = Original Transport Tycoon Deluxe DOS edition sounds.
+description.en_US = Original Transport Tycoon Deluxe DOS edition sounds.
+description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión DOS.
+description.et_ET = Algse Transport Tycoon Deluxe DOSi versiooni helid.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS äänet.
+description.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe DOS izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának hangjai.
+description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version DOS).
+description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi DOS.
+description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione DOS.
+description.nb_NO = Originale lyder fra Transport Tycoon Deluxe for DOS.
+description.nl_NL = Originele geluiden van de Transport Tycoon Deluxe DOS-versie.
+description.nn_NO = Originale lydar frå Transport Tycoon Deluxe for DOS.
+description.pl_PL = Oryginalna edycja dźwięków dla Transport Tycoon Deluxe DOS.
+description.pt_PT = Sons originais da edição DOS de Transport Tycoon Deluxe.
+description.ro_RO = Setul de sunete original al Transport Tycoon Deluxe pentru DOS.
+description.ru_RU = Оригинальный набор звукового оформления из игры Transport Tycoon Deluxe для DOS.
+description.sk_SK = Pôvodné zvuky Transport Tycoon Deluxe (DOS).
+description.sl_SL = Originalni zvoki Transport Tycoon Deluxe različice DOS.
+description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe DOS izdanja.
+description.sv_SE = Originalljuden från Transport Tycoon Deluxe, DOS-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS sürümü sesleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的音效。
+
+[files]
+samples      = SAMPLE.CAT
+
+[md5s]
+SAMPLE.CAT   = 422ea3dd074d2859bb51639a6e0e85da
+
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/data/orig_dos_de.obg

@@ -0,0 +1,62 @@
+; $Id$
+;
+; This represents the original graphics as on the German Transport
+; Tycoon Deluxe DOS CD. It contains one broken sprite.
+;
+[metadata]
+name              = original_dos_de
+shortname         = TTDD
+version           = 0
+palette           = DOS
+description       = Original Transport Tycoon Deluxe DOS (German) edition graphics.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS (German) uitgawe grafieke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الالمانية نسخة الدوس
+description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS (немски) .
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS (Alemany).
+description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (německá verze pro DOS).
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe DOS (Tysk) version.
+description.de_DE = Original Transport Tycoon Deluxe DOS (Deutsch) Basisgrafiken.
+description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση DOS (Γερμανικό).
+description.en_GB = Original Transport Tycoon Deluxe DOS (German) edition graphics.
+description.en_US = Original Transport Tycoon Deluxe DOS (German) edition graphics.
+description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS (Alemán).
+description.et_ET = Algse Transport Tycoon Deluxe DOSi (Saksa) versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe DOS (Saksalainen) grafiikat.
+description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS allemande).
+description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS (Njemački) izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS (német) verziójának grafikája.
+description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS (Jerman).
+description.it_IT = Grafica originale di Transport Tycoon Deluxe (tedesco), edizione DOS.
+description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS (tysk).
+description.nl_NL = Originele graphics van de Duitse Transport Tycoon Deluxe DOS-versie.
+description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS (tysk).
+description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe DOS (German).
+description.pt_PT = Gráficos originais da edição DOS (Alemã) de Transport Tycoon Deluxe.
+description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru DOS (ediţia germană).
+description.ru_RU = Оригинальная графика из немецкой версии Transport Tycoon Deluxe для DOS.
+description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (DOS) (v jazyku nemčina).
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za nemško različico DOS.
+description.sr_RS = Originalni skup grafika nemačkog Transport Tycoon Deluxe DOS izdanja.
+description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, DOS-utgåvan (tyska).
+description.tr_TR = Orijinal Transport Tycoon Deluxe DOS (Almanca) sürümü grafikleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版 (德國版) 的圖形。
+
+[files]
+base         = TRG1.GRF
+logos        = TRGI.GRF
+arctic       = TRGC.GRF
+tropical     = TRGH.GRF
+toyland      = TRGT.GRF
+extra        = OPENTTDD.GRF
+
+[md5s]
+TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
+OPENTTDD.GRF = 356cf9663aacb212fdbff609d99090d6
+
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTDD.GRF = This file was part of your OpenTTD installation.

bin/data/orig_win.obg

@@ -0,0 +1,62 @@
+; $Id$
+;
+; This represents the original graphics as on the Transport
+; Tycoon Deluxe for Windows CD.
+;
+[metadata]
+name              = original_windows
+shortname         = TTDW
+version           = 0
+palette           = Windows
+description       = Original Transport Tycoon Deluxe Windows edition graphics.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe grafieke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة وندوز
+description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за Windows.
+description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a Windows.
+description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro Windows).
+description.da_DA = Originalgrafik fra Transport Tycoon Deluxe Windows-version.
+description.de_DE = Original Transport Tycoon Deluxe Windows Basisgrafiken.
+description.el_GR = Αρχικά γραφικά από το Transport Tycoon Deluxe έκδοση Windows.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition graphics.
+description.en_US = Original Transport Tycoon Deluxe Windows edition graphics.
+description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión Windows.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe Windows grafiikat.
+description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version Windows).
+description.hr_HR = Originalna grafika za Transport Tycoon Deluxe Windows izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának grafikája.
+description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi Windows.
+description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione Windows.
+description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for Windows.
+description.nl_NL = Originele graphics van de Transport Tycoon Deluxe Windows-versie.
+description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for Windows.
+description.pl_PL = Oryginalna edycja grafik dla Transport Tycoon Deluxe Windows.
+description.pt_PT = Gráficos originais da edição Windows de Transport Tycoon Deluxe.
+description.ro_RO = Setul grafic original al Transport Tycoon Deluxe pentru Windows.
+description.ru_RU = Оригинальная графика из Transport Tycoon Deluxe для Windows.
+description.sk_SK = Pôvodná grafika Transport Tycoon Deluxe (Windows).
+description.sl_SL = Originalna grafika Transport Tycoon Deluxe za različico oken(windows).
+description.sr_RS = Originalni skup grafika Transport Tycoon Deluxe Windows izdanja.
+description.sv_SE = Originalgrafiken från Transport Tycoon Deluxe, Windows-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü grafikleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的圖形。
+
+[files]
+base         = TRG1R.GRF
+logos        = TRGIR.GRF
+arctic       = TRGCR.GRF
+tropical     = TRGHR.GRF
+toyland      = TRGTR.GRF
+extra        = OPENTTDW.GRF
+
+[md5s]
+TRG1R.GRF    = b04ce593d8c5016e07473a743d7d3358
+TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
+TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
+TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
+TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
+OPENTTDW.GRF = 80346ea80de167068cfb975f93963941
+
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTDW.GRF = This file was part of your OpenTTD installation.

bin/data/orig_win.obs

@@ -0,0 +1,50 @@
+; $Id$
+;
+; This represents the original sounds as on the Transport
+; Tycoon Deluxe for Windows CD.
+;
+[metadata]
+name              = original_windows
+shortname         = TTDO
+version           = 0
+description       = Original Transport Tycoon Deluxe Windows edition sounds.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe klanke.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة وندوز
+description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за Windows.
+description.ca_ES = Sons originals de Transport Tycoon Deluxe per a Windows.
+description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro Windows).
+description.da_DA = Originallyd fra Transport Tycoon Deluxe Windows-version.
+description.de_DE = Original Transport Tycoon Deluxe Windows Basissounds.
+description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe έκδοση Windows.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition sounds.
+description.en_US = Original Transport Tycoon Deluxe Windows edition sounds.
+description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión Windows.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni helid.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxe Windows äänet.
+description.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe Windows izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának hangjai.
+description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version Windows).
+description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi Windows.
+description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione Windows.
+description.nb_NO = Originale lyder fra Transport Tycoon Deluxe for Windows.
+description.nl_NL = Originele geluiden van de Transport Tycoon Deluxe Windows-versie.
+description.nn_NO = Originale lydar frå Transport Tycoon Deluxe for Windows.
+description.pl_PL = Oryginalna edycja dźwięków dla Transport Tycoon Deluxe Windows.
+description.pt_PT = Sons originais da edição Windows de Transport Tycoon Deluxe.
+description.ro_RO = Setul de sunete original al Transport Tycoon Deluxe pentru Windows.
+description.ru_RU = Оригинальный набор звукового оформления из игры Transport Tycoon Deluxe для Windows.
+description.sk_SK = Pôvodné zvuky Transport Tycoon Deluxe (Windows).
+description.sl_SL = Originalni zvoki Transport Tycoon Deluxe različice oken(windows).
+description.sr_RS = Originalni skup zvukova Transport Tycoon Deluxe Windows izdanja.
+description.sv_SE = Originalljuden från Transport Tycoon Deluxe, Windows-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü sesleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音效。
+
+[files]
+samples      = SAMPLE.CAT
+
+[md5s]
+SAMPLE.CAT   = 9212e81e72badd4bbe1eaeae66458e10
+
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/game/compat_1.2.nut

@@ -1,32 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.2 API compatibility in effect.");
-
-GSTown._SetGrowthRate <- GSTown.SetGrowthRate;
-GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
-{
-	/* Growth rate 0 caused resetting the custom growth rate. While this was undocumented, it was used nevertheless (ofc). */
-	if (days_between_town_growth == 0) days_between_town_growth = GSTown.TOWN_GROWTH_NORMAL;
-	return GSTown._SetGrowthRate(town_id, days_between_town_growth);
-}
-
-/* 1.5 adds a game element reference to the news. */
-GSNews._Create <- GSNews.Create;
-GSNews.Create <- function(type, text, company)
-{
-    return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
-}
-
-/* 1.9 adds a vehicle type parameter. */
-GSBridge._GetName <- GSBridge.GetName;
-GSBridge.GetName <- function(bridge_id)
-{
-	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
-}

bin/game/compat_1.3.nut

@@ -1,32 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.3 API compatibility in effect.");
-
-GSTown._SetGrowthRate <- GSTown.SetGrowthRate;
-GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
-{
-	/* Growth rate 0 caused resetting the custom growth rate. While this was undocumented, it was used nevertheless (ofc). */
-	if (days_between_town_growth == 0) days_between_town_growth = GSTown.TOWN_GROWTH_NORMAL;
-	return GSTown._SetGrowthRate(town_id, days_between_town_growth);
-}
-
-/* 1.5 adds a game element reference to the news. */
-GSNews._Create <- GSNews.Create;
-GSNews.Create <- function(type, text, company)
-{
-    return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
-}
-
-/* 1.9 adds a vehicle type parameter. */
-GSBridge._GetName <- GSBridge.GetName;
-GSBridge.GetName <- function(bridge_id)
-{
-	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
-}

bin/game/compat_1.4.nut

@@ -1,24 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.4 API compatibility in effect.");
-
-/* 1.5 adds a game element reference to the news. */
-GSNews._Create <- GSNews.Create;
-GSNews.Create <- function(type, text, company)
-{
-    return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
-}
-
-/* 1.9 adds a vehicle type parameter. */
-GSBridge._GetName <- GSBridge.GetName;
-GSBridge.GetName <- function(bridge_id)
-{
-	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
-}

bin/game/compat_1.5.nut

@@ -1,17 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.5 API compatibility in effect.");
-
-/* 1.9 adds a vehicle type parameter. */
-GSBridge._GetName <- GSBridge.GetName;
-GSBridge.GetName <- function(bridge_id)
-{
-	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
-}

bin/game/compat_1.6.nut

@@ -1,17 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.6 API compatibility in effect.");
-
-/* 1.9 adds a vehicle type parameter. */
-GSBridge._GetName <- GSBridge.GetName;
-GSBridge.GetName <- function(bridge_id)
-{
-	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
-}

bin/game/compat_1.7.nut

@@ -1,17 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.7 API compatibility in effect.");
-
-/* 1.9 adds a vehicle type parameter. */
-GSBridge._GetName <- GSBridge.GetName;
-GSBridge.GetName <- function(bridge_id)
-{
-	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
-}

bin/game/compat_1.8.nut

@@ -1,17 +0,0 @@
-/* $Id$ */
-
-/*
- * 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("1.8 API compatibility in effect.");
-
-/* 1.9 adds a vehicle type parameter. */
-GSBridge._GetName <- GSBridge.GetName;
-GSBridge.GetName <- function(bridge_id)
-{
-	return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
-}

bin/game/compat_1.9.nut

@@ -1,8 +0,0 @@
-/* $Id$ */
-
-/*
- * 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/gm/no_music.obm

@@ -0,0 +1,81 @@
+; $Id$
+;
+; This represents more or less nothingness
+;
+[metadata]
+name              = NoMusic
+shortname         = NULL
+version           = 0
+fallback          = true
+description       = A music pack without actual music.
+description.af_ZA = 'n Musiek stel sonder enige musiek.
+description.ar_EG = مجموعة موسيقى بدون موسيقى
+description.bg_BG = Празен музикален пакет.
+description.ca_ES = Un joc de música sense cap música.
+description.cs_CZ = Prázná hudební sada.
+description.da_DA = En musikpakke uden musik.
+description.de_DE = Ein Musikset ohne Musik.
+description.el_GR = Ένα πάκετο μουσικής χωρίς πραγματική μουσική.
+description.en_GB = A music pack without actual music.
+description.en_US = A music pack without actual music.
+description.es_ES = Un conjunto de música vacío.
+description.et_ET = Muusikakomplekt ilma igasuguse muusikata.
+description.fi_FI = Musiikkipaketti, jossa ei ole musiikkia.
+description.fr_FR = Un pack de musiques sans musiques.
+description.hr_HR = Muzički paket bez ikakve muzike.
+description.hu_HU = Zenei alapcsomag zene nélkül.
+description.id_ID = Paket musik tanpa berisi musik.
+description.it_IT = Un pacchetto musicale non contenente alcuna musica.
+description.nb_NO = En musikkpakke uten noe musikk.
+description.nl_NL = Een muziekset zonder muziek.
+description.nn_NO = Ei musikkpakke utan noko musikk.
+description.pl_PL = Zestaw utworów muzycznych nie zawierający żadnej muzyki.
+description.pt_PT = Um conjunto de música vazio.
+description.ro_RO = Un set de muzică fără muzică inclusă.
+description.ru_RU = "Пустой" набор музыкального оформления, не содержащий никакой музыки.
+description.sk_SK = Sada hudby neobsahujúca hudbu.
+description.sl_SL = Glasbeni paket z vključeno glasbo.
+description.sr_RS = Prazan skup muzičkih numera.
+description.sv_SE = Ett musikpaket utan någon musik.
+description.tr_TR = Müzik içermeyen boş bir müzik paketi.
+description.zh_TW = 不含任何音樂的音樂集。
+
+[files]
+theme =
+old_0 =
+old_1 =
+old_2 =
+old_3 =
+old_4 =
+old_5 =
+old_6 =
+old_7 =
+old_8 =
+old_9 =
+new_0 =
+new_1 =
+new_2 =
+new_3 =
+new_4 =
+new_5 =
+new_6 =
+new_7 =
+new_8 =
+new_9 =
+ezy_0 =
+ezy_1 =
+ezy_2 =
+ezy_3 =
+ezy_4 =
+ezy_5 =
+ezy_6 =
+ezy_7 =
+ezy_8 =
+ezy_9 =
+
+[md5s]
+
+[names]
+
+[origin]
+default      = This file was part of your OpenTTD installation.

bin/gm/orig_win.obm

@@ -0,0 +1,125 @@
+; $Id$
+;
+; This represents the original music as on the Transport
+; Tycoon Deluxe for Windows CD.
+;
+[metadata]
+name              = original_windows
+shortname         = TTDW
+version           = 1
+description       = Original Transport Tycoon Deluxe Windows edition music.
+description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe musiek.
+description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الموسيقية نسخة وندوز
+description.bg_BG = Оригинална музика на Transport Tycoon Deluxe за Windows.
+description.ca_ES = Música Original de Transport Tycoon Deluxe per a Windows.
+description.cs_CZ = Původní hudba Transport Tycoon Deluxe (verze pro Windows).
+description.da_DA = Originalmusik fra Transport Tycoon Deluxe Windows-version.
+description.de_DE = Original Transport Tycoon Deluxe Windows Musikset.
+description.el_GR = Αρχική μουσική από το Transport Tycoon Deluxe έκδοση Windows.
+description.en_GB = Original Transport Tycoon Deluxe Windows edition music.
+description.en_US = Original Transport Tycoon Deluxe Windows edition music.
+description.es_ES = Música original de Transport Tycoon Deluxe versión Windows.
+description.et_ET = Algse Transport Tycoon Deluxe Windowsi versiooni muusika.
+description.fi_FI = Alkuperäinen Transport Tycoon Deluxe Windows musiikki.
+description.fr_FR = Musiques originales de Transport Tycoon Deluxe (version Windows).
+description.hr_HR = Originalna muzika za Transport Tycoon Deluxe Windows izdanje.
+description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának zenéje.
+description.id_ID = Musik pengiring orisinil Transport Tycoon Deluxe versi Windows.
+description.it_IT = Musica originale di Transport Tycoon Deluxe, edizione Windows.
+description.nb_NO = Original musikk fra Transport Tycoon Deluxe for Windows.
+description.nl_NL = Originele muziek van de Transport Tycoon Deluxe Windows-versie.
+description.nn_NO = Original musikk frå Transport Tycoon Deluxe for Windows.
+description.pl_PL = Oryginalna edycja utworów muzycznych w Transport Tycoon Deluxe Windows.
+description.pt_PT = Música original da edição Windows de Transport Tycoon Deluxe.
+description.ro_RO = Setul de muzică original al Transport Tycoon Deluxe pentru Windows.
+description.ru_RU = Оригинальный набор музыкального оформления из игры Transport Tycoon Deluxe.
+description.sk_SK = Pôvodná hudba z Transport Tycoon Deluxe (Windows).
+description.sl_SL = Originalna glasba Transport Tycoon Deluxe različice oken(windows).
+description.sr_RS = Originalni skup muzičkih numera Transport Tycoon Deluxe Windows izdanja.
+description.sv_SE = Originalmusiken från Transport Tycoon Deluxe, Windows-utgåvan.
+description.tr_TR = Orijinal Transport Tycoon Deluxe Windows sürümü müzikleri.
+description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的音樂。
+
+[files]
+theme = GM_TT00.GM
+old_0 = GM_TT02.GM
+old_1 = GM_TT06.GM
+old_2 = GM_TT03.GM
+old_3 = GM_TT12.GM
+old_4 = GM_TT08.GM
+old_5 = GM_TT13.GM
+old_6 = GM_TT14.GM
+old_7 = GM_TT10.GM
+old_8 =
+old_9 =
+new_0 = GM_TT04.GM
+new_1 = GM_TT01.GM
+new_2 = GM_TT05.GM
+new_3 = GM_TT15.GM
+new_4 = GM_TT11.GM
+new_5 = GM_TT16.GM
+new_6 = GM_TT09.GM
+new_7 =
+new_8 =
+new_9 =
+ezy_0 = GM_TT18.GM
+ezy_1 = GM_TT19.GM
+ezy_2 = GM_TT21.GM
+ezy_3 = GM_TT17.GM
+ezy_4 = GM_TT20.GM
+ezy_5 = GM_TT07.GM
+ezy_6 =
+ezy_7 =
+ezy_8 =
+ezy_9 =
+
+[md5s]
+GM_TT00.GM = 45cfec1b9d8c7a0ad45e755833cbf221
+GM_TT01.GM = ab14ed3392d848abd2a2e90a9d75d121
+GM_TT02.GM = dd4f696e4be5987ce738257b08b50171
+GM_TT03.GM = a1bfde23343df9e4063419bf29c166b8
+GM_TT04.GM = 4e6943aa0c455203d76c79389054747d
+GM_TT05.GM = cee281cb85a2e2343552d97640545a47
+GM_TT06.GM = 26d1de5efa8675f94065784e9d539e49
+GM_TT07.GM = 6f2691e17558f552ec4c565e4ab7139c
+GM_TT08.GM = a42bf2cb3340a822f1a69646fc7a487d
+GM_TT09.GM = eb35761a58a8df3c59ed8929cce13916
+GM_TT10.GM = 42fecd686720a785d20a78590c466a82
+GM_TT11.GM = 50ef1ef02e49d2112786dd45e69dc3ee
+GM_TT12.GM = 4ce707a0e0e72419f0681dd9bd95271b
+GM_TT13.GM = e765753be29d889ec818f38009103619
+GM_TT14.GM = 270e2d63bd32b95a4d007ce15a6ce45f
+GM_TT15.GM = 89e116a1c0c69f1845cc903a9bfbe460
+GM_TT16.GM = f824e2371b3bedfe61aad4b9c62dd6be
+GM_TT17.GM = 1b23eebb0796c1ab99cd97fa7082cf7b
+GM_TT18.GM = 15650de3bad645d0e88c4f5c7a2df92a
+GM_TT19.GM = 7aec079e15bd09588660b85545ac4dfc
+GM_TT20.GM = 1509097889dee617aa1e9a1738a5a930
+GM_TT21.GM = a8d0aaad02e1a762d8d54cf81da56bab
+
+[names]
+GM_TT00.GM = Tycoon DELUXE Theme
+GM_TT01.GM = Snarl Up
+GM_TT02.GM = Easy Driver
+GM_TT03.GM = Little Red Diesel
+GM_TT04.GM = City Groove
+GM_TT05.GM = Aliens Ate My Railway
+GM_TT06.GM = Stoke It
+GM_TT07.GM = Don't Walk!
+GM_TT08.GM = Sawyer's Tune
+GM_TT09.GM = Fell Apart On Me
+GM_TT10.GM = Can't Get There From Here
+GM_TT11.GM = Hard Drivin'
+GM_TT12.GM = Road Hog
+GM_TT13.GM = Hold That Train!
+GM_TT14.GM = Broomer's Oil Rag
+GM_TT15.GM = Goss Groove
+GM_TT16.GM = Small Town
+GM_TT17.GM = Cruise Control
+GM_TT18.GM = Stroll On
+GM_TT19.GM = Funk Central
+GM_TT20.GM = Jammit
+GM_TT21.GM = Movin' On
+
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

configure

@@ -47,8 +47,6 @@ PREFIX="$PWD/bin"
 OBJS_DIR="$PWD/objs"
 BASE_SRC_OBJS_DIR="$OBJS_DIR"
 LANG_OBJS_DIR="$OBJS_DIR/lang"
-GRF_OBJS_DIR="$OBJS_DIR/extra_grf"
-SETTING_OBJS_DIR="$OBJS_DIR/setting"
 BIN_DIR="$PREFIX"
 SRC_DIR="$ROOT_DIR/src"
 LANG_DIR="$SRC_DIR/lang"
@@ -75,14 +73,14 @@ save_params
 make_cflags_and_ldflags
 
 EXE=""
-if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ] || [ "$os" = "DOS" ]; then
+if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ] || [ "$os" = "DOS" ] || [ "$os" = "WINCE" ]; then
 	EXE=".exe"
 fi
 
 TTD="openttd$EXE"
 STRGEN="strgen$EXE"
+ENDIAN_CHECK="endian_check$EXE"
 DEPEND="depend$EXE"
-SETTINGSGEN="settings_gen$EXE"
 
 if [ -z "$sort" ]; then
 	PIPE_SORT="sed s@a@a@"
@@ -113,6 +111,7 @@ AWKCOMMAND='
 		if ($0 == "PNG"         && "'$png_config'" == "")          { next; }
 		if ($0 == "OSX"         && "'$os'" != "OSX")               { next; }
 		if ($0 == "OS2"         && "'$os'" != "OS2")               { next; }
+		if ($0 == "PSP"         && "'$os'" != "PSP")               { next; }
 		if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
 		if ($0 == "AI"          && "'$enable_ai'" == "0")          { next; }
 		if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
@@ -122,12 +121,11 @@ AWKCOMMAND='
 		if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
 		                 "'$os'" != "CYGWIN" && "'$os'" != "MSVC") { next; }
 		if ($0 == "MORPHOS"     && "'$os'" != "MORPHOS")           { next; }
+		if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
 		if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
 		if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0")  { next; }
 		if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
-		if ($0 == "FLUIDSYNTH"  && "'$fluidsynth'" == "" )         { next; }
 		if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0")       { next; }
-		if ($0 == "SSE"         && "'$with_sse'" != "1")           { next; }
 
 		skip += 1;
 
@@ -147,7 +145,7 @@ AWKCOMMAND='
 
 # Read the source.list and process it
 # Please escape ALL " within ` because e.g. "" terminates the string in some sh implementations
-SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | LC_ALL=C $PIPE_SORT`"
+SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | $PIPE_SORT`"
 
 OBJS_C="`  echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.c$/   { gsub(\".c$\",   \".o\", $0); print $0; }'`"
 OBJS_CPP="`echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.cpp$/ { gsub(\".cpp$\", \".o\", $0); print $0; }'`"
@@ -162,12 +160,10 @@ else
 	sort="$sort -u"
 fi
 
-CONFIGURE_FILES="$ROOT_DIR/configure $ROOT_DIR/config.lib $ROOT_DIR/Makefile.in $ROOT_DIR/Makefile.grf.in $ROOT_DIR/Makefile.lang.in $ROOT_DIR/Makefile.src.in $ROOT_DIR/Makefile.bundle.in $ROOT_DIR/Makefile.setting.in"
+CONFIGURE_FILES="$ROOT_DIR/configure $ROOT_DIR/config.lib $ROOT_DIR/Makefile.in $ROOT_DIR/Makefile.lang.in $ROOT_DIR/Makefile.src.in $ROOT_DIR/Makefile.bundle.in"
 
 generate_main
 generate_lang
-generate_settings
-generate_grf
 generate_src
 
 check_path_characters

docs/32bpp.txt

@@ -0,0 +1,36 @@
+32bpp and OpenTTD
+=================
+
+OpenTTD has 32bpp support. This means: OpenTTD still is 8bpp, but it has the
+posibility to override the graphics with 32bpp. This means that it isn't a
+replacement of grf or newgrf, but simply an addition. If you want to use 32bpp
+graphics of a newgrf, you do need the newgrf itself too (with 8bpp graphics).
+
+
+The Format
+----------
+
+32bpp images are stored in PNG. They should go in:
+  data/sprites/<grfname>/<SpriteID>.png
+
+For example, a grfname would be 'openttd' (without .grf, lowercase), and the
+SpriteID 3, to override the 3rd sprite in openttd.grf with a 32bpp version.
+
+The format of this PNG can be almost anything, but we advise to use RGBA
+format. Alpha-channel is fully supported.
+
+As the core of OpenTTD is 8bpp, and because you of course want company colours
+in your images, you will need to add a mask for every sprite that needs colour
+remapping. The name is simular as above, only you have to put a 'm' behind the
+SpriteID. This image should be a 8bpp palette image, where the palette is the
+OpenTTD palette. Upon load of the PNG, the mask is loaded too, and overrides
+the RGB (not the Alpha) of the original PNG image, and replacing it with a
+8bpp color remapped and converted to 32bpp.
+
+Another thing that OpenTTD needs in your png, is 2 tEXt chunks: x_offs and
+y_offs. This to define the x- and y-offset, of course. Use the tool we supply
+to add this information. Sadly enough most graphical editors trashes those
+chunks upon save, so you have to readd it every time you save your image.
+
+Your images should be the same as the grf, in size.
+

docs/HOWTO_compile_lang_files.txt

@@ -1,17 +1,5 @@
-OpenTTD and strgen
-Last updated:    2009-06-30
-------------------------------------------------------------------------
-
-
-Table of contents
------------------
-1.0) strgen usage
- * 1.1) Examples
- * 1.2) strgen command switches
-
-
-1.0) strgen usage
----- ------------
+STRGEN USAGE
+------------
 This guide is only interesting for people who want to alter something
 themselves without access to translator.openttd.org. Please note that
 your compiled language file will only be compatible with the OpenTTD version
@@ -26,10 +14,10 @@ strgen takes as argument a txt file and translates it to a lng file, allowing
 it to be used inside OpenTTD. strgen needs the master language file
 english.txt to work. Below are some examples of strgen usage.
 
-1.1) Examples
----- --------
+EXAMPLES
+--------
 Example 1:
-if you are in the root of your working copy (git repository), you should type
+if you are in the root of your working copy (svn code), you should type
 strgen/strgen -s lang lang/english.txt
 to compile englist.txt into english.lng. It will be placed in the lang dir
 
@@ -47,10 +35,10 @@ resulting language file to go to /tmp. Use
 You can interchange english.txt to whichever language you want to generate a
 .lng file for.
 
-1.2) strgen command switches
----- -----------------------
+STRGEN COMMAND SWITCHES
+-----------------------
 -v | --version
-strgen will tell what git revision it was last modified
+strgen will tell what svn revision it was last modified
 
 -t | --todo
 strgen will add <TODO> to any untranslated/missing strings and use the english

docs/Readme_Windows_MSVC.md

@@ -1,71 +0,0 @@
-# Compiling OpenTTD using Microsoft Visual C++
-
-Last updated: 2018-12-27
-
-## Supported MSVC compilers
-
-OpenTTD includes projects for Visual Studio 2015 Update 3 or more recent.
-You can download the free Visual Studio Community Edition from Microsoft at
-https://visualstudio.microsoft.com/vs/community/.
-
-## Required files
-
-### Microsoft platform files
-
-OpenTTD needs the Platform SDK, if it isn't installed already. This can be
-done during installing Visual Studio, by selecting
-`Visual C++ MFC for x86 and x64` (and possibly
-`Visual C++ ATL for x86 and x64` depending on your version). If not, you
-can get it at this location:
-
-- [MS Windows Platform SDK](https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk)
-
-Install the SDK by following the instructions as given.
-
-### OpenTTD dependencies
-
-Dependencies for OpenTTD on Windows are handled via
-[vcpkg](https://github.com/Microsoft/vcpkg/). First you need to install vcpkg
-by following the `Quick Start` intructions of their
-[README](https://github.com/Microsoft/vcpkg/blob/master/README.md).
-
-After this, you can install the dependencies OpenTTD needs. We advise to use
-the `static` versions, and OpenTTD currently needs the following dependencies:
-
-- freetype
-- liblzma
-- libpng
-- lzo
-- zlib
-
-To install both the x64 (64bit) and x86 (32bit) variants, you can use:
-
-```ps
-.\vcpkg install freetype:x64-windows-static liblzma:x64-windows-static libpng:x64-windows-static lzo:x64-windows-static zlib:x64-windows-static
-.\vcpkg install freetype:x86-windows-static liblzma:x86-windows-static libpng:x86-windows-static lzo:x86-windows-static zlib:x86-windows-static
-```
-
-## TTD Graphics files
-
-See section 4.1 of README.md for the required 3rdparty files and how to install them.
-
-## Compiling
-
-Open the appropriate `sln` (Solution) file for your version of Visual Studio:
-
-- VS 2015: projects/openttd_vs140.sln
-- VS 2017: projects/openttd_vs141.sln
-- VS 2019: projects/openttd_vs142.sln
-
-Set the build mode to `Release` in
-`Build > Configuration manager > Active solution configuration`.
-You can now compile.
-
-If everything works well the binary should be in `objs\Win[32|64]\Release\openttd.exe`
-and in `bin\openttd.exe`
-
-## Problems
-
-If compilation fails, double-check that you are using the latest github
-source. If it still doesn't work, check in on IRC (irc://irc.oftc.net/openttd),
-to ask for help.

docs/Readme_Windows_MSVC.txt

@@ -0,0 +1,108 @@
+Compiling OpenTTD using Microsoft Visual C++
+Last updated: 2010-01-03
+--------------------------------------------
+PLEASE READ THE ENTIRE DOCUMENT BEFORE DOING ANY ACTUAL CHANGES!!
+
+
+SUPPORTED MSVC COMPILERS
+------------------------
+OpenTTD includes projects for MSVC 2005.NET and MSVC 2008.NET. Both will
+compile out of the box, providing you have the required libraries/headers;
+which ones, see below. There is no support for VS6 or MSVC 2002, or
+MSVC 2003.NET. You are therefore strongly encouraged to either upgrade to
+MSVC 2008 Express (free) or use GCC.
+
+
+1) REQUIRED FILES
+-----------------
+You might already have some of the files already installed, so check before
+downloading; mostly because the DirectX SDK and Platform SDK are about
+500MB each.
+Download the following files:
+
+	* openttd-useful.zip (http://binaries.openttd.org/extra/openttd-useful/)
+	* DirectX 8.1 SDK (http://neuron.tuke.sk/~mizanin/eng/Dx81sdk-include-lib.rar) (or alternatively the latest DirectX SDK from Microsoft)
+	* MS Windows Platform SDK (http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en)
+	* afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H)
+
+...and of course the newest source from svn://svn.openttd.org/trunk
+
+You need an SVN-client to download the source from subversion:
+
+	* CLI Subversion (http://subversion.tigris.org/)
+	* GUI TortoiseSVN (http://tortoisesvn.tigris.org/)
+
+
+2) INCLUDES AND LIBRARIES
+-------------------------
+Put the newly downloaded files in the VC lib\ and include\ directories; where
+"C:\Program Files\Microsoft Visual Studio 9.0\VC" is your location of Visual C.
+If you are compiling for an x64 system, use the include\ and lib\ directories
+from the win64/ folder.
+
+	* openttd-useful.zip\include\*
+	* afxresh.h
+	to >	C:\Program Files\Microsoft Visual Studio 9.0\VC\Include
+
+	* openttd-useful.zip\lib\*
+	to >	C:\Program Files\Microsoft Visual Studio 9.0\VC\Lib
+
+Custom directories might be recommended, check 2.2)
+
+
+2.1) INCLUDES AND LIBRARIES - DIRECTX/PLATFORM SDK
+--------------------------------------------------
+Basically the same procedure as with the useful zip file, providing
+you are not using the Microsoft installer. Put the include files in the
+include\ directory and the library files to the Lib\ directory.
+
+It is recommended to use custom directories so you don't overwrite any
+default header or library files.
+
+
+2.2) CUSTOM DIRECTORIES
+-----------------------
+If you have put the above include and/or library files into custom folders,
+MSVC will not find them by default. You need to add these paths to VC through:
+
+Tools > Options > Projects and Solutions > VC++ Directories > show directories for
+
+	* Include files: Add the DirectX/Platform SDK include dir you've created
+	* Library files: Add the path to the SDK custom lib dir
+
+NOTE: make sure that the directory for the DirectX SDK is the first one in the
+list, above all others, otherwise compilation will most likely fail!!
+
+
+3) TTD GRAPHICS FILES
+---------------------
+See section 4.1 of readme.txt for the required 3rdparty files and how to install them.
+
+
+4) COMPILING
+------------
+Open trunk/openttd_vs[89]0.sln
+Set the build mode to 'Release' in
+Build > Configuration manager > Active solution configuration > select "Release"
+Compile...
+
+If everything works well the binary should be in trunk/objs/Win[32|64]/Release/openttd.exe
+
+
+5) EDITING, CHANGING SOURCE CODE
+--------------------------------
+Set the build mode (back to) 'Debug'
+Change the startup project to openttd by right-clicking the 'openttd' project
+in the Solution Explorer and selecting 'Set as Startup Project'. The 'openttd'
+project should now show up bold instead of 'strgen'.
+
+
+6) PROBLEMS?
+------------
+If compilation fails, double-check that you are using the latest SVN (!)
+source. If it still doesn't work, check in on IRC (irc://irc.oftc.net/openttd),
+to ask about reasons; or just wait. The problem will most likely solve itself
+within a few days as the problem is noticed and fixed.
+
+An up-to-date version of this README can be found on the wiki:
+http://wiki.openttd.org/Microsoft_Visual_C%2B%2B_2008_Express_Editions

docs/admin_network.txt

@@ -1,219 +0,0 @@
-OpenTTD's admin network
-Last updated:    2011-01-20
-------------------------------------------------------------------------
-
-
-Table of contents
------------------
-1.0) Preface
-2.0) Joining the network
-3.0) Asking for updates
- * 3.1) Polling manually
-4.0) Sending rcon commands
-5.0) Sending chat
- * 5.1) Receiving chat
-6.0) Disconnecting
-7.0) Certain packet information
-
-
-1.0) Preface
----- -------
-  The admin network provides a dedicated network protocol designed for other
-  applications to communicate with OpenTTD. Connected applications can execute
-  console commands remotely (rcon commands) with no further authentication.
-  Furthermore information about clients and companies can be provided.
-
-  Admin applications remain connected when starting a new game or loading a saved
-  game in contrast to normal OpenTTD clients that get disconnected.
-
-  This document describes the admin network and its protocol.
-
-  Please refer to the mentioned enums in src/network/core/tcp_admin.h
-
-  Please also note that further improvements to the admin protocol can mean that
-  more packet types will be sent by the server. For forward compatibility it is
-  therefore wise to ignore unknown packets. Future improvements might also add
-  additional data to packets. This data should be ignored. Data will never be
-  removed from packets in later versions, except the possibility that complete
-  packets are dropped in favour of a new packet.
-  This though will be reflected in the protocol version as announced in the
-  ADMIN_PACKET_SERVER_PROTOCOL in section 2.0).
-
-  A reference implementation in Java for a client connecting to the admin interface
-  can be found at: http://dev.openttdcoop.org/projects/joan
-
-
-2.0) Joining the network
----- -------------------
-  Create a TCP connection to the server on port 3977. The application is
-  expected to authenticate within 10 seconds.
-
-  To authenticate send a ADMIN_PACKET_ADMIN_JOIN packet.
-
-  The server will reply with ADMIN_PACKET_SERVER_PROTOCOL followed directly by
-  ADMIN_PACKET_SERVER_WELCOME.
-
-  ADMIN_PACKET_SERVER_PROTOCOL contains details about the protocol version.
-  It is the job of your application to check this number and decide whether
-  it will remain connected or not.
-  Furthermore, this packet holds details on every AdminUpdateType and the
-  supported AdminFrequencyTypes (bitwise representation).
-
-  ADMIN_PACKET_SERVER_WELCOME contains details on the server and the map,
-  e.g. if the server is dedicated, its NetworkLanguage, size of the Map, etc.
-
-  Once you have received ADMIN_PACKET_SERVER_WELCOME you are connected and
-  authorized to do your thing.
-  The server will not provide any game related updates unless you ask for them.
-  There are four packets the server will none the less send, if applicable:
-    - ADMIN_PACKET_SERVER_ERROR
-    - ADMIN_PACKET_SERVER_WELCOME
-    - ADMIN_PACKET_SERVER_NEWGAME
-    - ADMIN_PACKET_SERVER_SHUTDOWN
-
-  However, ADMIN_PACKET_SERVER_WELCOME only after a ADMIN_PACKET_SERVER_NEWGAME
-
-
-3.0) Asking for updates
----- ------------------
-  Asking for updates is done with ADMIN_PACKET_ADMIN_UPDATE_FREQUENCY.
-  With this packet you define which update you wish to receive at which
-  frequency.
-
-  Note: not every update type supports every frequency. If in doubt, you can
-  verify against the data received in ADMIN_PACKET_SERVER_PROTOCOL.
-
-  The server will not confirm your registered update. However, asking for an
-  invalid AdminUpdateType or a not supported AdminUpdateFrequency you will be
-  disconnected from the server with NETWORK_ERROR_ILLEGAL_PACKET.
-
-  Additional debug information can be found with a debug level of net=3.
-
-  ADMIN_UPDATE_DATE results in the server sending:
-    - ADMIN_PACKET_SERVER_DATE
-
-  ADMIN_UPDATE_CLIENT_INFO results in the server sending:
-    - ADMIN_PACKET_SERVER_CLIENT_JOIN
-    - ADMIN_PACKET_SERVER_CLIENT_INFO
-    - ADMIN_PACKET_SERVER_CLIENT_UPDATE
-    - ADMIN_PACKET_SERVER_CLIENT_QUIT
-    - ADMIN_PACKET_SERVER_CLIENT_ERROR
-
-  ADMIN_UPDATE_COMPANY_INFO results in the server sending:
-    - ADMIN_PACKET_SERVER_COMPANY_NEW
-    - ADMIN_PACKET_SERVER_COMPANY_INFO
-    - ADMIN_PACKET_SERVER_COMPANY_UPDATE
-    - ADMIN_PACKET_SERVER_COMPANY_REMOVE
-
-  ADMIN_UPDATE_COMPANY_ECONOMY results in the server sending:
-    - ADMIN_PACKET_SERVER_COMPANY_ECONOMY
-
-  ADMIN_UPDATE_COMPANY_STATS results in the server sending:
-    - ADMIN_PACKET_SERVER_COMPANY_STATS
-
-  ADMIN_UPDATE_CHAT results in the server sending:
-    - ADMIN_PACKET_SERVER_CHAT
-
-  ADMIN_UPDATE_CONSOLE results in the server sending:
-    - ADMIN_PACKET_SERVER_CONSOLE
-
-
-  ADMIN_UPDATE_CMD_LOGGING results in the server sending:
-    - ADMIN_PACKET_SERVER_CMD_LOGGING
-
-3.1) Polling manually
----- ----------------
-  Certain AdminUpdateTypes can also be polled:
-    - ADMIN_UPDATE_DATE
-    - ADMIN_UPDATE_CLIENT_INFO
-    - ADMIN_UPDATE_COMPANY_INFO
-    - ADMIN_UPDATE_COMPANY_ECONOMY
-    - ADMIN_UPDATE_COMPANY_STATS
-    - ADMIN_UPDATE_CMD_NAMES
-
-  ADMIN_UPDATE_CLIENT_INFO and ADMIN_UPDATE_COMPANY_INFO accept an additional
-  parameter. This parameter is used to specify a certain client or company.
-  Setting this parameter to UINT32_MAX (0xFFFFFFFF) will tell the server you
-  want to receive updates for all clients or companies.
-
-  Not supported AdminUpdateType in the poll will result in the server
-  disconnecting the application with NETWORK_ERROR_ILLEGAL_PACKET.
-
-  Additional debug information can be found with a debug level of net=3.
-
-
-4.0) Sending rcon commands
----- ---------------------
-  Rcon runs separate from the ADMIN_UPDATE_CONSOLE AdminUpdateType. Requesting
-  the execution of a remote console command is done with the packet
-  ADMIN_PACKET_ADMIN_RCON.
-
-  Note: No additional authentication is required for rcon commands.
-
-  The server will reply with one or more ADMIN_PACKET_SERVER_RCON packets.
-  Finally an ADMIN_PACKET_ADMIN_RCON_END packet will be sent. Applications
-  will not receive the answer twice if they have asked for the AdminUpdateType
-  ADMIN_UPDATE_CONSOLE, as the result is not printed on the servers console
-  (just like clients rcon commands).
-
-  Furthermore, sending a 'say' command (or any similar command) will not
-  be sent back into the admin network.
-  Chat from the server itself will only be sent to the admin network when it
-  was not sent from the admin network.
-
-  Note that when content is queried or updated via rcon, the processing
-  happens asynchronously. But the ADMIN_PACKET_ADMIN_RCON_END packet is sent
-  already right after the content is requested as there's no immediate output.
-  Thus other packages and the output of content rcon command may be sent at
-  an arbitrary later time, mixing into the output of other console activity,
-  e.g. also of possible subsequent other rcon commands sent.
-
-
-5.0) Sending chat
----- ------------
-  Sending a ADMIN_PACKET_ADMIN_CHAT results in chat originating from the server.
-
-  Currently four types of chat are supported:
-    - NETWORK_ACTION_CHAT
-    - NETWORK_ACTION_CHAT_CLIENT
-    - NETWORK_ACTION_CHAT_COMPANY
-    - NETWORK_ACTION_SERVER_MESSAGE
-
-  NETWORK_ACTION_SERVER_MESSAGE can be sent to a single client or company
-  using the respective DestType and ID.
-  This is a message prefixed with the 3 stars, e.g. *** foo has joined the game
-
-5.1) Receiving chat
----- -------------
-  Register ADMIN_UPDATE_CHAT at ADMIN_FREQUENCY_AUTOMATIC to receive chat.
-  The application will be able to receive all chat the server can see.
-
-  The configuration option network.server_admin_chat specifies whether
-  private chat for to the server is distributed into the admin network.
-
-
-6.0) Disconnecting
----- -------------
-  It is a kind thing to say good bye before leaving. Do this by sending the
-  ADMIN_PACKET_ADMIN_QUIT packet.
-
-
-7.0) Certain packet information
----- --------------------------
-  All ADMIN_PACKET_SERVER_* packets have an enum value greater 100.
-
-  ADMIN_PACKET_SERVER_WELCOME
-    Either directly follows ADMIN_PACKET_SERVER_PROTOCOL or is sent
-    after a new game has been started or a map loaded, i.e. also
-    after ADMIN_PACKET_SERVER_NEWGAME.
-
-  ADMIN_PACKET_SERVER_CLIENT_JOIN and ADMIN_PACKET_SERVER_COMPANY_NEW
-    These packets directly follow their respective INFO packets. If you receive
-    a CLIENT_JOIN / COMPANY_NEW packet without having received the INFO packet
-    it may be a good idea to POLL for the specific ID.
-
-  ADMIN_PACKET_SERVER_CMD_NAMES and ADMIN_PACKET_SERVER_CMD_LOGGING
-    Data provided with these packets is not stable and will not be
-    treated as such. Do not rely on IDs or names to be constant
-    across different versions / revisions of OpenTTD.
-    Data provided in this packet is for logging purposes only.

docs/desync.txt

@@ -1,268 +0,0 @@
-Some explanations about Desyncs
-Last updated: 2014-02-23
-------------------------------------------------------------------------
-
-
-Table of contents
------------------
-1.0) Desync theory
- * 1.1) OpenTTD multiplayer architecture
- * 1.2) What is a Desync and how is it detected
- * 1.3) Typical causes of Desyncs
-2.0) What to do in case of a Desync
- * 2.1) Cache debugging
- * 2.2) Desync recording
-3.0) Evaluating the Desync records
- * 3.1) Replaying
- * 3.2) Evaluation the replay
- * 3.3) Comparing savegames
-
-
-1.1) OpenTTD multiplayer architecture
----- --------------------------------
-  OpenTTD has a huge gamestate, which changes all of the time.
-  The savegame contains the complete gamestate at a specific point
-  in time. But this state changes completely each tick: Vehicles move
-  and trees grow.
-
-  However, most of these changes in the gamestate are deterministic:
-  Without a player interfering a vehicle follows its orders always
-  in the same way, and trees always grow the same.
-
-  In OpenTTD multiplayer synchronisation works by creating a savegame
-  when clients join, and then transfering that savegame to the client,
-  so it has the complete gamestate at a fixed point in time.
-
-  Afterwards clients only receive 'commands', that is: Stuff which is
-  not predictable, like
-   - player actions
-   - AI actions
-   - GameScript actions
-   - Admin Port command
-   - rcon commands
-   - ...
-
-  These commands contain the information on how to execute the command,
-  and when to execute it. Time is measured in 'network frames'.
-  Mind that network frames to not match ingame time. Network frames
-  also run while the game is paused, to give a defined behaviour to
-  stuff that is executing while the game is paused.
-
-  The deterministic part of the gamestate is run by the clients on
-  their own. All they get from the server is the instruction to
-  run the gamestate up to a certain network time, which basically
-  says that there are no commands scheduled in that time.
-
-  When a client (which includes the server itself) wants to execute
-  a command (i.e. a non-predictable action), it does this by
-   - calling DoCommandP resp. DoCommandPInternal
-   - These functions first do a local test-run of the command to
-     check simple preconditions. (Just to give the client an
-     immediate response without bothering the server and waiting for
-     the response.) The test-run may not actually change the
-     gamestate, all changes must be discarded.
-   - If the local test-run succeeds the command is sent to the server.
-   - The server inserts the command into the command queue, which
-     assigns a network frame to the commands, i.e. when it shall be
-     executed on all clients.
-   - Enhanced with this specific timestamp, the command is send to all
-     clients, which execute the command simultaneously in the same
-     network frame in the same order.
-
-1.2) What is a Desync and how is it detected
----- ---------------------------------------
-  In the ideal case all clients have the same gamestate as the server
-  and run in sync. That is, vehicle movement is the same on all
-  clients, and commands are executed the same everywhere and
-  have the same results.
-
-  When a Desync happens, it means that the gamestates on the clients
-  (including the server) are no longer the same. Just imagine
-  that a vehicle picks the left line instead of the right line at
-  a junction on one client.
-
-  The important thing here is, that noone notices when a Desync
-  occurs. The desync client will continue to simulate the gamestate
-  and execute commands from the server. Once the gamestate differs
-  it will increasingly spiral out of control: If a vehicle picks a
-  different route, it will arrive at a different time at a station,
-  which will load different cargo, which causes other vehicles to
-  load other stuff, which causes industries to notice different
-  servicing, which causes industries to change production, ...
-  the client could run all day in a different universe.
-
-  To limit how long a Desync can remain unnoticed, the server
-  transfers some checksums every now and then for the gamestate.
-  Currently this checksum is the state of the random number
-  generator of the game logic. A lot of things in OpenTTD depend
-  on the RNG, and if the gamestate differs, it is likely that the
-  RNG is called at different times, and the state differs when
-  checked.
-
-  The clients compare this 'checksum' with the checksum of their
-  own gamestate at the specific network frame. If they differ,
-  the client disconnects with a Desync error.
-
-  The important thing here is: The detection of the Desync is
-  only an ultimate failure detection. It does not give any
-  indication on when the Desync happened. The Desync may after
-  all have occurred long ago, and just did not affect the checksum
-  up to now. The checksum may have matched 10 times or more
-  since the Desync happend, and only now the Desync has spiraled
-  enough to finally affect the checksum. (There was once a desync
-  which was only noticed by the checksum after 20 game years.)
-
-1.3) Typical causes of Desyncs
----- -------------------------
-  Desyncs can be caused by the following scenarios:
-   - The savegame does not describe the complete gamestate.
-      - Some information which affects the progression of the
-        gamestate is not saved in the savegame.
-      - Some information which affects the progression of the
-        gamestate is not loaded from the savegame.
-        This includes the case that something is not completely
-        reset before loading the savegame, so data from the
-        previous game is carried over to the new one.
-   - The gamestate does not behave deterministic.
-      - Cache mismatch: The game logic depends on some cached
-        values, which are not invalidated properly. This is
-        the usual case for NewGRF-specific Desyncs.
-      - Undefined behaviour: The game logic performs multiple
-        things in an undefined order or with an undefined
-        result. E.g. when sorting something with a key while
-        some keys are equal. Or some computation that depends
-        on the CPU architecture (32/64 bit, little/big endian).
-   - The gamestate is modified when it shall not be modified.
-      - The test-run of a command alters the gamestate.
-      - The gamestate is altered by a player or script without
-        using commands.
-
-
-2.1) Cache debugging
----- ---------------
-  Desyncs which are caused by inproper cache validation can
-  often be found by enabling cache validation:
-   - Start OpenTTD with '-d desync=2'.
-   - This will enable validation of caches every tick.
-     That is, cached values are recomputed every tick and compared
-     to the cached value.
-   - Differences are logged to 'commands-out.log' in the autosave
-     folder.
-
-  Mind that this type of debugging can also be done in singleplayer.
-
-2.2) Desync recording
----- ----------------
-  If you have a server, which happens to encounter Desyncs often,
-  you can enable recording of the gamestate alterations. This
-  will later allow the replay the gamestate and locate the Desync
-  cause.
-
-  There are two levels of Desync recording, which are enabled
-  via '-d desync=2' resp. '-d desync=3'. Both will record all
-  commands to a file 'commands-out.log' in the autosave folder.
-
-  If you have the savegame from the start of the server, and
-  this command log you can replay the whole game. (see Section 3.1)
-
-  If you do not start the server from a savegame, there will
-  also be a savegame created just after a map has been generated.
-  The savegame will be named 'dmp_cmds_*.sav' and be put into
-  the autosave folder.
-
-  In addition to that '-d desync=3' also creates regular savegames
-  at defined spots in network time. (more defined than regular
-  autosaves). These will be created in the autosave folder
-  and will also be named 'dmp_cmds_*.sav'.
-
-  These saves allow comparing the gamestate with the original
-  gamestate during replaying, and thus greatly help debugging.
-  However, they also take a lot of disk space.
-
-
-3.1) Replaying
----- ---------
-  To replay a Desync recording, you need these files:
-   - The savegame from when the server was started, resp.
-     the automatically created savegame from when the map
-     was generated.
-   - The 'commands-out.log' file.
-   - Optionally the 'dmp_cmds_*.sav'.
-  Put these files into a safe spot. (Not your autosave folder!)
-
-  Next, prepare your OpenTTD for replaying:
-   - Get the same version of OpenTTD as the original server was running.
-   - Uncomment/enable the define 'DEBUG_DUMP_COMMANDS' in
-     'src/network/network_func.h'.
-     (DEBUG_FAILED_DUMP_COMMANDS is explained later)
-   - Put the 'commands-out.log' into the root save folder, and rename
-      it to 'commands.log'.
-   - Run 'openttd -D -d desync=3 -g startsavegame.sav'.
-     This replays the server log and creates new 'commands-out.log'
-     and 'dmp_cmds_*.sav' in your autosave folder.
-
-3.2) Evaluation the replay
----- ---------------------
-  The replaying will also compare the checksums which are part of
-  the 'commands-out.log' with the replayed gamestate.
-  If they differ, it will trigger a 'NOT_REACHED'.
-
-  If the replay succeeds without mismatch, that is the replay reproduces
-  the original server state:
-   - Repeat the replay starting from incrementally later 'dmp_cmds_*.sav'
-     while truncating the 'commands.log' at the beginning appropriately.
-     The 'dmp_cmds_*.sav' can be your own ones from the first reply, or
-     the ones from the original server (if you have them).
-     (This simulates the view of joining clients during the game.)
-   - If one of those replays fails, you have located the Desync between
-     the last dmp_cmds that reproduces the replay and the first one
-     that fails.
-
-  If the replay does not succeed without mismatch, you can check the logs
-  whether there were failed commands. Then you may try to replay with
-  DEBUG_FAILED_DUMP_COMMANDS enabled. If the replay then fails, the
-  command test-run of the failed command modified the game state.
-
-  If you have the original 'dmp_cmds_*.sav', you can also compare those
-  savegames with your own ones from the replay. You can also comment/disable
-  the 'NOT_REACHED' mentioned above, to get another 'dmp_cmds_*.sav' from
-  the replay after the mismatch has already been detected.
-  See Section 3.2 on how to compare savegames.
-  If the saves differ you have located the Desync between the last dmp_cmds
-  that match and the first one that does not. The difference of the saves
-  may point you in the direction of what causes it.
-
-  If the replay succeeds without mismatch, and you do not have any
-  'dmp_cmd_*.sav' from the original server, it is a lost case.
-  Enable creation of the 'dmp_cmd_*.sav' on the server, and wait for the
-  next Desync.
-
-  Finally, you can also compare the 'commands-out.log' from the original
-  server with the one from the replay. They will differ in stuff like
-  dates, and the original log will contain the chat, but otherwise they
-  should match.
-
-3.2) Comparing savegames
----- -------------------
-  The binary form of the savegames from the original server and from
-  your replay will always differ:
-   - The savegame contains paths to used NewGRF files.
-   - The gamelog will log your loading of the savegame.
-   - The savegame data of AIs and the Gamescript will differ.
-     Scripts are not run during the replay, only their recorded commands
-     are replayed. Their internal state will thus not change in the
-     replay and will differ.
-
-  To compare savegame more semantically, there exist some ugly hackish
-  tools at:
-     http://devs.openttd.org/~frosch/texts/zpipe.c
-     http://devs.openttd.org/~frosch/texts/printhunk.c
-
-  The first one decompresses OpenTTD savegames. The second one creates
-  a textual representation of an uncompressed savegame, by parsing hunks
-  and arrays and such. With both tools you need to be a bit careful
-  since they work on stdin and stdout, which may not deal well with
-  binary data.
-
-  If you have the textual representation of the savegames, you can
-  compare them with regular diff tools.

docs/landscape.html

@@ -4,104 +4,64 @@
 <head>
  <meta name="Author" content="Marcin Grzegorczyk">
  <meta name="Description" content="Structure of OpenTTD (OTTD) landscape arrays">
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  <title>OpenTTD Landscape Internals</title>
 </head>
 
 <body>
 
  <h3><a name="Landscape">Landscape</a></h3>
+ <p>Eight attributes (counting &quot;<span style="font-weight: bold;">type_height</span>&quot;) hold the informations about a tile.<BR>
+  These attributes are referred to as
+  "<span style="font-weight: bold;">type_height</span>",
+  "<span style="font-weight: bold;">m1</span>", "<span style="font-weight: bold;">m2</span>",
+  "<span style="font-weight: bold;">m3</span>", "<span style="font-weight: bold;">m4</span>",
+  "<span style="font-weight: bold;">m5</span>", "<span style="font-weight: bold;">m6</span>"
+  and "<span style="font-weight: bold;">m7</span>".<BR>
+  The most important value is the class of a tile, stored in the upper 4 bits
+  of the <span style="font-weight: bold;">type_height</span> attribute. The lower 4 bits are used to encode the height and
+  slope data.
+ </p>
+
+ Special Attribute : <span style="font-weight: bold;">m6</span>. There are 4 bits of it that are used accross multiple tile classes<br>
+ <ul>
+  <li>
+   <a name = "bridge_direction">
+   Bits 7..6 :
+   <table border="1">
+    <tr bgcolor="#CCCCCC"><td colspan="2">Presence and direction of bridge above,<br>for tiles that support this.</td></tr>
+    <tr><td><tt>00</tt>&nbsp; </td><td>no bridge</td></tr>
+    <tr><td><tt>01</tt>&nbsp; </td><td>Axis X (North-East)</td></tr>
+    <tr><td><tt>02</tt>&nbsp; </td><td>Axis Y (South-West)</td></tr>
+   </table>
+  </li>
+  <li>
+   <a name = "tropic_zone">
+   Bits 1..0 :
+   <table border="1">
+    <tr bgcolor="#CCCCCC"><td colspan="2">Only meaningfull in tropic climate.<br>It contains the definition of the available zones</td></tr>
+    <tr><td><tt>00</tt>&nbsp; </td><td>normal</td></tr>
+    <tr><td><tt>01</tt>&nbsp; </td><td>desert</td></tr>
+    <tr><td><tt>02</tt>&nbsp; </td><td>rain forest</td></tr>
+   </table>
+   In any other climate, those 2 bits are free of use.
+  </li>
+ </ul>
  <p>
   For a graphical representation of the tile-layout have a look at
   <a href="landscape_grid.html">Landscape grid</a> page.
  </p>
- <p>Nine attributes (counting &quot;<span style="font-weight: bold;">type</span>&quot; and
-  &quot;<span style="font-weight: bold;">height</span>&quot;) hold the informations about a tile.<BR>
-  These attributes are referred to as
-  &quot;<span style="font-weight: bold;">type</span>",
-  &quot;<span style="font-weight: bold;">height</span>",
-  &quot;<span style="font-weight: bold;">m1</span>&quot;, &quot;<span style="font-weight: bold;">m2</span>&quot;,
-  &quot;<span style="font-weight: bold;">m3</span>&quot;, &quot;<span style="font-weight: bold;">m4</span>&quot;,
-  &quot;<span style="font-weight: bold;">m5</span>&quot;, &quot;<span style="font-weight: bold;">m6</span>&quot;
-  and "<span style="font-weight: bold;">m7</span>".<br>
-  The most important value is the class of a tile, stored in the upper 4 bits
-  of the <span style="font-weight: bold;">type</span> attribute.
- </p>
 
- Frequently repeating patterns:
- <ul>
-  <li><span style="font-weight: bold;">type</span>
-   <ul>
-    <li>
-     <a name="type"></a>
-     Bits 7..4:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">The tile type.</td></tr>
-      <tr><td style="width: 5em;"><tt>00</tt></td><td>Ground</td></tr>
-      <tr><td><tt>01</tt></td><td>Railway tracks</td></tr>
-      <tr><td><tt>02</tt></td><td>Roads</td></tr>
-      <tr><td><tt>03</tt></td><td>Town building</td></tr>
-      <tr><td><tt>04</tt></td><td>Trees</td></tr>
-      <tr><td><tt>05</tt></td><td>Station tiles</td></tr>
-      <tr><td><tt>06</tt></td><td>Water</td></tr>
-      <tr><td><tt>07</tt></td><td>Void</td></tr>
-      <tr><td><tt>08</tt></td><td>Industries</td></tr>
-      <tr><td><tt>09</tt></td><td>Tunnel / bridge</td></tr>
-      <tr><td><tt>0A</tt></td><td>Objects</td></tr>
-     </table>
-    </li>
-     Bits 3..2:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">Presence and direction of bridge above.</td></tr>
-      <tr><td style="width: 5em;"><tt>00</tt></td><td>no bridge</td></tr>
-      <tr><td><tt>01</tt></td><td>Axis X (North-East)</td></tr>
-      <tr><td><tt>02</tt></td><td>Axis Y (South-West)</td></tr>
-     </table>
-    <li>
-     <a name="tropic_zone"></a>
-     Bits 1..0:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">Only meaningfull in tropic climate. It contains the definition of the available zones</td></tr>
-      <tr><td style="width: 5em;"><tt>00</tt></td><td>normal</td></tr>
-      <tr><td><tt>01</tt></td><td>desert</td></tr>
-      <tr><td><tt>02</tt></td><td>rain forest</td></tr>
-     </table>
-     In any other climate these 2 bits are theoretically free of use, however using them does not seem useful.
-    </li>
-   </ul>
-  <li><span style="font-weight: bold;">m1</span>
-   <ul>
-    <li>
-     <a name="WaterClass"></a>
-      Bits 6..5:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">The type of water that is on a tile.
-      <tr><td style="width: 5em;"><tt>00</tt></td><td align=left>Sea</td></tr>
-      <tr><td><tt>01</tt></td><td align=left>Canal</td></tr>
-      <tr><td><tt>02</tt></td><td align=left>River</td></tr>
-      <tr><td><tt>03</tt></td><td align=left>Invalid, i.e. no water on this tile</td></tr>
-     </table>
-     Some tiles, such as houses, reuse these bits of other purposes.
-    </li>
-    <li>
-     <a name="OwnershipInfo"></a>
-     Bits 4..0:
-     <table border="1" style="width: 30em;">
-      <tr bgcolor="#CCCCCC"><td colspan="2">The owner of a tile can be either companies (human or AI) or "Game entities".
-      <tr><td style="width: 5em;"><tt>00..0E</tt></td><td align=left>Normal companies</td></tr>
-      <tr><td><tt>0F</tt></td><td align=left>a town owns the tile</td></tr>
-      <tr><td><tt>10</tt></td><td align=left>nobody owns the tile</td></tr>
-      <tr><td><tt>11</tt></td><td align=left>"water" owns the tile</td></tr>
-      <tr><td><tt>FF</tt></td><td align=left>spectator in MP or in scenario editor</td></tr>
-     </table>
-     Some tiles, such as houses and industries, reuse these bits of other purposes.
-    </li>
-   </ul>
-  </li>
-  <li><span style="font-weight: bold;">m7:</span><br>
-   Animation frame/state. Used for houses, industries, objects and stations.
-  </li>
- </ul>
+  The <a name="OwnershipInfo">owner of a tile</a>, as frequently associated with attribute m1,
+  can be either companies (human or AI) or "Game entities".
+  They are identified using:
+  <table border="1">
+   <tr><td><tt>00..0E</tt>&nbsp; </td><td align=left>Normal companies</td></tr>
+   <tr><td><tt>0F</tt>&nbsp; </td><td align=left>a town owns the tile</td></tr>
+   <tr><td><tt>10</tt>&nbsp; </td><td align=left>nobody owns the tile</td></tr>
+   <tr><td><tt>11</tt>&nbsp; </td><td align=left>"water" owns the tile</td></tr>
+   <tr><td><tt>FF</tt>&nbsp; </td><td align=left>spectator in MP or in scenario editor</td></tr>
+  </table>
 
  <p>OTTD's class-specific periodic tile processing routine is called once every +256 ticks for each tile.</p>
 
@@ -118,9 +78,8 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the tile (normally <tt>10</tt>)</li>
+     <li>m1: <a href="#OwnershipInfo">owner</a> of the tile (normally <tt>10</tt>)</li>
      <li>m2: see fields</li>
-     <li>m3 bits 7..5: type of hedge on NE border of the tile</li>
      <li>m3 bits 3..0: see fields</li>
      <li>m3 bit 4: set if the tile is covered with snow</li>
      <li>m4 bits 7..5: type of hedge on the SW border of the tile (1 through 6, or 0=none)</li>
@@ -210,7 +169,8 @@
        </tr>
       </table>
      </li>
-     <li>m6 bits 4..2: type of hedge on NW border of the tile</li>
+     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     </ul>
    </td>
   </tr>
@@ -223,10 +183,10 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the tile</li>
+     <li>m1: <a href="#OwnershipInfo">owner</a> of the tile</li>
      <li>m2: see signals</li>
      <li>m3 bits 7..4: see signals</li>
-     <li>m8 bits 5..0 = <a name="TrackType">track type</a>:
+     <li>m3 bits 3..0 = <a name="TrackType">track type</a>:
       <table>
        <tr>
         <td><tt>0</tt>&nbsp; </td>
@@ -522,6 +482,8 @@
        <li>m5 bit 4: pbs reservation state</li>
       </ul>
      </li>
+     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     </ul>
    </td>
   </tr>
@@ -549,7 +511,6 @@
        </tr>
       </table>
      </li>
-     <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
      <li>m5 bits 7 clear: road or level-crossing
       <ul>
        <li>m6 bits 5..3:
@@ -584,9 +545,10 @@
          </tr>
         </table>
        </li>
+       <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
        <li>m5 bit 6 clear: road
         <ul>
-         <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
+         <li>m1: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
          <li>m7 bits 3..0: counter for the roadworks</li>
          <li>m5 bits 3..0: road layout road type 0 (normal road): bit set = road piece present:
           <table>
@@ -625,9 +587,8 @@
        </li>
        <li>m5 bit 6 set: level crossing
         <ul>
-         <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the railway track</li>
-         <li>m5 bit 5: set if crossing lights are on</li>
-         <li>m5 bit 4: pbs reservation state</li>
+         <li>m1: <a href="#OwnershipInfo">owner</a> of the railway track</li>
+         <li>m3 bits 3..0: <a href="#TrackType">railway track type</a></li>
          <li>m5 bit 0: direction
           <table>
            <tr>
@@ -640,17 +601,18 @@
            </tr>
           </table>
          </li>
+         <li>m5 bit 5: set if crossing lights are on</li>
          <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
-         <li>m8 bits 5..0: <a href="#TrackType">railway track type</a></li>
+         <li>m5 bit 4: pbs reservation state</li>
         </ul>
        </li>
       </ul>
      </li>
      <li>m5 bit 7 set, bit 6 clear: road depot
       <ul>
-       <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the depot</li>
+       <li>m1: <a href="#OwnershipInfo">owner</a> of the depot</li>
        <li>m2: Depot index</li>
-       <li>m5 bits 1..0: exit towards:
+       <li>m5 bits 3..0: exit towards:
         <table>
          <tr>
           <td><tt>0</tt>&nbsp; </td>
@@ -673,9 +635,10 @@
          </tr>
         </table>
        </li>
-       <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
       </ul>
      </li>
+     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     </ul>
    </td>
   </tr>
@@ -706,7 +669,7 @@
        </li>
       </ul>
      <li>m3 bit 6 : bit 8 of house type (m4), allowing 512 different types.</li>
-     <li>m3 bit 5 : free</li>
+     <li>m3 bit 5 : bit 6 of current animation frame (see m6)</li>
      <li>m3 bits 4..0 : triggers activated <a href="#newhouses">(newhouses)</a></li>
      <li>m4 : <a href="landscape_externals.html">town building type</a> (with m3[6] bit)</li>
      <li>m5 : see m3 bit 7</li>
@@ -714,7 +677,7 @@
       <ul>
        <li>If <a href="#newhouses">newhouses</a> is activated
         <ul>
-         <li>bits 7..2 : Periodic processing time remaining</li>
+         <li>bits 7..2 : Current animation frame (bits 5..0); bit 6 in m3</li>
         </ul>
        </li>
        <li>Standard behaviour
@@ -722,13 +685,14 @@
          <li>bits 7..2 : lift position (for houses type 04 and 05)</li>
         </ul>
        </li>
+       <li>bits 1..0 : tropic zone specifier</li>
       </ul>
      </li>
      <li>m7 :
       <ul>
        <li>If <a href="#newhouses">newhouses</a> is activated
         <ul>
-         <li>Current animation frame</li>
+         <li>Periodic processing time remaining</li>
         </ul>
        </li>
        <li>Standard behaviour (only for houses type 04 and 05)
@@ -744,7 +708,7 @@
       </ul>
      </li>
     </ul>
-    <small><a name="newhouses"></a>Newhouses is the name englobing a newGRF feature developped by TTDPatch devs (mainly Csaboka).<br>
+    <small><a name="newhouses">Newhouses is the name englobing a newGRF feature developped by TTDPatch devs (mainly Csaboka).<br>
     It allows the replacement of the properties as well as the graphics of houses in the game.<br>
     To distinguish between the standard behaviour and the newGRF one, HouseID (m4 + m3[6]) is tested for anything above 110.<br>
     110 is the count of standard houses. So above 110 means there is a new definition of at least one house</small>
@@ -759,8 +723,7 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 6..5: water class (sea or land)</li>
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> (normally <tt>10</tt>)</li>
+     <li>m1: <a href="#OwnershipInfo">owner</a> (normally <tt>10</tt>)</li>
      <li>m2 bits 8..6: ground
       <table>
 
@@ -827,6 +790,8 @@
       </table>
       <small>Note: the actually displayed set of trees depends on both type and number of trees</small>
      </li>
+     <li>m4 bits 7..5: type of hedge on the SW border of the tile (1 through 6, or 0=none)</li>
+     <li>m4 bits 4..2: type of hedge on the SE border of the tile (1 through 6, or 0=none)</li>
      <li>m5 bits 7..6: number of trees minus one</li>
      <li>m5 bits 2..0: growth status:
       <table border="0">
@@ -844,6 +809,7 @@
        </tr>
       </table>
      </li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     </ul>
    </td>
   </tr>
@@ -856,11 +822,12 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 6..5: water class for buoys, water part of docks and for airport tiles</li>
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the station</li>
+     <li>m1: <a href="#OwnershipInfo">owner</a> of the station</li>
      <li>m2: index into the array of stations</li>
-     <li>m3 bits 7..4: persistent random data for railway stations/waypoints and airports)</li>
+     <li>m3 bits 7..4: persistent random data for newstations (railway stations/waypoints)</li>
      <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram tracks (road stop)</li>
+     <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway stations/waypoints</li>
+     <li>m3 bits 1..0: water class for buoys and water part of docks</li>
      <li>m4: custom station id; 0 means standard graphics</li>
      <li>m5: graphics index (range from 0..255 for each station type):
       <table>
@@ -904,7 +871,7 @@
        </tr>
 
        <tr>
-        <td nowrap valign=top><tt>00</tt>..<tt>FF</tt></td>
+        <td nowrap valign=top><tt>00</tt>..<tt>8F</tt></td>
         <td align=left>all airports</td>
        </tr>
 
@@ -976,10 +943,10 @@
      <li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy, waypoint)</li>
      <li>m6 bit 2: pbs reservation state for railway stations/waypoints</li>
 
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
      <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road (road stops)</li>
      <li>m7 bits 7..6: present road types (road stops)</li>
-     <li>m7: animation frame (railway stations/waypoints, airports)</li>
-     <li>m8 bits 5..0: <a href="#TrackType">track type</a> for railway stations/waypoints</li>
+     <li>m7: animation frame (railway stations/waypoints)</li>
     </ul>
    </td>
   </tr>
@@ -992,9 +959,9 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 6..5 : Water class (sea, canal or river)
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> (for sea, rivers, and coasts normally <tt>11</tt>)</li>
+     <li>m1: <a href="#OwnershipInfo">owner</a> (for sea, rivers, and coasts normally <tt>11</tt>)</li>
      <li>m2: Depot index (for depots only)</li>
+     <li>m3 bits 1..0 : Water class (sea, canal or river)
      <li>m4: Random data for canal or river tiles</li>
      <li>m5: tile type:
       <table>
@@ -1089,6 +1056,8 @@
        </tr>
       </table>
      </li>
+     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     </ul>
    </td>
   </tr>
@@ -1106,7 +1075,7 @@
 
   <tr bgcolor="#CCCCCC">
    <td valign=top nowrap><strong><a name="Class8"><tt> 8</tt></a></strong></td>
-   <td><strong>Industries </strong></td>
+   <td><strong>Industry tile </strong></td>
   </tr>
   <tr>
    <td valign=top nowrap>&nbsp;</td>
@@ -1121,7 +1090,7 @@
       </ul>
      </li>
      <li>m2: index into the array of industries</li>
-     <li>m3: random bits (NewGRF)</li>
+     <li>m3: animation state</li>
      <li>m4: animation loop</li>
      <li>m5: type (plus m6 bit 2):<br>
       <small>(note: this is not the same as the industry type, which is stored in the array of industries)</small>
@@ -1138,7 +1107,7 @@
           <tr>
            <td nowrap valign=top><tt>01</tt>&nbsp; </td>
            <td align=left>wheel tower when animated<br>
-            animation state in m7 bits 5..0; m7 bit 6 set = sound already generated</td>
+            animation state in m3 bits 5..0; m3 bit 6 set = sound already generated</td>
           </tr>
          </table>
         </td>
@@ -1154,7 +1123,7 @@
           </tr>
           <tr>
            <td nowrap valign=top><tt>0A</tt>&nbsp; </td>
-           <td align=left>transformer; animation progress in m7(valid range <tt>0</tt>..<tt>7</tt>)</td>
+           <td align=left>transformer; animation progress in m3(valid range <tt>0</tt>..<tt>7</tt>)</td>
           </tr>
          </table>
         </td>
@@ -1197,7 +1166,7 @@
           </tr>
           <tr>
            <td nowrap valign=top><tt>1E</tt>..<tt>20</tt>&nbsp; </td>
-           <td align=left>various stages of animation; progress of animation in m7</td>
+           <td align=left>various stages of animation; progress of animation in m3</td>
           </tr>
          </table>
         </td>
@@ -1228,7 +1197,7 @@
           </tr>
           <tr>
            <td nowrap valign=top><tt>30</tt>&nbsp; </td>
-           <td align=left>wheel tower when animated; animation state in m7 bits 5..0; m7 bit 6 set = sound already generated</td>
+           <td align=left>wheel tower when animated; animation state in m3 bits 5..0; m3 bit 6 set = sound already generated</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>31</tt>&nbsp; </td>
@@ -1268,7 +1237,7 @@
           </tr>
           <tr>
            <td nowrap valign=top><tt>58</tt>&nbsp; </td>
-           <td align=left>wheel tower when animated; animation state in m7 bits 5..0; m7 bit 6 set = sound already generated</td>
+           <td align=left>wheel tower when animated; animation state in m3 bits 5..0; m3 bit 6 set = sound already generated</td>
           </tr>
          </table></td>
        </tr>
@@ -1363,7 +1332,7 @@
          <table>
           <tr>
            <td nowrap valign=top><tt>8F</tt>&nbsp; </td>
-           <td align=left>Animated part; animation state in m7 (valid range <tt>00</tt>..<tt>31</tt>)<br>
+           <td align=left>Animated part; animation state in m3 (valid range <tt>00</tt>..<tt>31</tt>)<br>
                         Tile animation is started (m4 zeroed) on the periodic processing.<br>
                         While the animation is in progress, m4 holds the number
                         of animation cycles that have already taken place.<br>
@@ -1393,7 +1362,7 @@
           </tr>
           <tr>
            <td nowrap valign=top><tt>A2</tt>&nbsp; </td>
-           <td align=left>bubble capture facility; animation state in m7 (valid range <tt>00</tt>..<tt>27</tt>)</td>
+           <td align=left>bubble capture facility; animation state in m3 (valid range <tt>00</tt>..<tt>27</tt>)</td>
           </tr>
          </table>
         </td>
@@ -1430,7 +1399,8 @@
      </li>
      <li>m6 bits 5..3: random triggers (NewGRF)</li>
      <li>m6 bit 2: bit 8 of type (see m5)</li>
-     <li>m7: animation frame</li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
+     <li>m7: random bits (NewGRF)</li>
     </ul>
    </td>
   </tr>
@@ -1443,8 +1413,9 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a></li>
+     <li>m1: <a href="#OwnershipInfo">owner</a></li>
      <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram</li>
+     <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway</li>
      <li>m5 bit 4: pbs reservation state for railway</li>
      <li>m5 bits 7 clear: tunnel entrance/exit</li>
      <li>m5 bit 7 set: bridge ramp
@@ -1554,7 +1525,6 @@
         <td><tt>2</tt>&nbsp;</td>
         <td>water</td>
        </tr>
-      </table>
      </li>
      <li>m5 bits 1..0: direction onto the bridge / out of the tunnel
       <table>
@@ -1579,28 +1549,61 @@
        </tr>
       </table>
      </li>
+     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
      <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road</li>
      <li>m7 bit 5 set = on snow or desert</li>
      <li>m7 bits 7..6: present road types for road</li>
-     <li>m8 bits 5..0: <a href="#TrackType">track type</a> for railway</li>
     </ul>
    </td>
   </tr>
 
   <tr bgcolor="#CCCCCC">
    <td valign=top nowrap><strong><a name="ClassA"><tt> A</tt></a></strong></td>
-   <td><strong><tt>Objects</tt></strong></td>
+   <td><strong><tt>Unmovables</tt></strong></td>
   </tr>
   <tr>
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bits 6..5 : Water class (sea, canal, river or land)</li>
-     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the object (for lighthouses and transmitters normally <tt>10</tt>)</li>
-     <li>m2: index into the array of objects, bits 0 to 15 (upper bits in m5)</li>
-     <li>m3: random bits</li>
-     <li>m5: index into the array of objects, bits 16 to 23 (lower bits in m2)</li>
-     <li>m7: animation counter</li>
+     <li>m1: <a href="#OwnershipInfo">owner</a> of the object (for lighthouses and transmitters normally <tt>10</tt>)</li>
+     <li>m2: see company statue
+     <li>m3 bits 4..2: size of HQ
+     <li>m3 bits 1..0: section identification of the HQ
+     <li>m5: tile type:
+      <table>
+       <tr>
+        <td nowrap valign=top><tt>00</tt>&nbsp; </td>
+        <td align=left>transmitter</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>01</tt>&nbsp; </td>
+        <td align=left>lighthouse</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>02</tt>&nbsp; </td>
+        <td align=left>company statue
+         <ul>
+          <li>m2: TownID on which the statue is built in</li>
+         </ul>
+        </td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>03</tt>&nbsp; </td>
+        <td align=left>company-owned land</td>
+       </tr>
+
+       <tr>
+        <td nowrap valign=top><tt>04</tt><tt></tt>&nbsp; </td>
+        <td align=left>company headquarters</td>
+       </tr>
+      </table>
+     </li>
+     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     </ul>
    </td>
   </tr>

docs/landscape_externals.html

@@ -4,7 +4,7 @@
 <head>
  <meta name="Author" content="Marcin Grzegorczyk">
  <meta name="Description" content="Structure of OpenTTD (OTTD) landscape arrays">
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  <title>OpenTTD Landscape externals</title>
 </head>
 

docs/landscape_grid.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type">
   <meta name="Description" content="Structure of OpenTTD (OTTD) landscape arrays #2">
   <title>OpenTTD Landscape Internals - #2</title>
   <style type="text/css">
@@ -17,7 +17,7 @@
 </head>
 <body style="direction: ltr;">
 <h3 style="font-weight: bold;">Landscape</h3>
-<span style="font-weight: bold;"></span>Nine attributes hold the information about a tile.
+<span style="font-weight: bold;"></span>Six attributes hold the information about a tile.
 This can be seen in the <a href="landscape.html">Landscape</a> document. This page tries to give an overview of used and free bits of
 the array so you can quickly see what is used and what is not.
 <ul>
@@ -28,24 +28,21 @@ the array so you can quickly see what is used and what is not.
 </ul>
 <p>
 <ul>
-  <li><span style="font-weight: bold;">type</span> - 8 bits in size, tile class (bits 4..7), bridge (bits 2..3) tropic zone (bits 0..1, only valid in tropic climate)</li>
-  <li><span style="font-weight: bold;">height</span> - 8 bits in size, stores tile height</li>
+  <li><span style="font-weight: bold;">type_height</span> - 8 bits in size, stores tile height (lower 4 bits) and tile class (upper 4 bits)</li>
   <li><span style="font-weight: bold;">m1</span> - 8 bits in size, used to identify the owner of that tile (eg piece of rail, bridge, etc.)</li>
   <li><span style="font-weight: bold;">m2</span> - 16 bits in size, used to identify the index of the given tile (object) in the (object-)array</li>
   <li><span style="font-weight: bold;">m3</span> - 8 bits in size, is used for general storage</li>
   <li><span style="font-weight: bold;">m4</span> - 8 bits in size, is used for general storage</li>
   <li><span style="font-weight: bold;">m5</span> - 8 bits in size, is used for general storage</li>
-  <li><span style="font-weight: bold;">m6</span> - 8 bits in size, is used for general storage</li>
+  <li><span style="font-weight: bold;">m6</span> - 8 bits in size, special meaning : lower 2 bits only valid in tropic climate, upper 2 bits for bridges</li>
   <li><span style="font-weight: bold;">m7</span> - 8 bits in size, is used for general storage</li>
-  <li><span style="font-weight: bold;">m8</span> - 16 bits in size, is used for general storage</li>
 </ul>
 
 <table align=center border="1" cellpadding="2" cellspacing="2">
   <tbody>
     <tr>
       <th colspan=2>class</th>
-      <th>type (8)</th>
-      <th>height (8)</th>
+      <th>type_height (8)</th>
       <th>m1 (8)</th>
       <th>m2 (16)</th>
       <th>m3 (8)</th>
@@ -53,169 +50,144 @@ the array so you can quickly see what is used and what is not.
       <th>m5 (8)</th>
       <th>m6 (8)</th>
       <th>m7 (8)</th>
-      <th>m8 (16)</th>
     </tr>
     <tr>
       <td colspan=2 class="caption">bits</td>
       <td class="bits">7654 3210</td>
       <td class="bits">7654 3210</td>
-      <td class="bits">7654 3210</td>
       <td class="bits">FEDC BA98 7654 3210</td>
       <td class="bits">7654 3210</td>
       <td class="bits">7654 3210</td>
       <td class="bits">7654 3210</td>
       <td class="bits">7654 3210</td>
       <td class="bits">7654 3210</td>
-      <td class="bits">FEDC BA98 7654 3210</td>
     </tr>
     <tr>
       <td rowspan="2">0</td>
       <td class="caption">ground</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOO</span><span class="option">~ ~~~~</span></td>
+      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits">XXXX <span class="free">OOOO</span></td>
+      <td class="bits"><span class="free">OOO</span>X <span class="free">OOOO</span></td>
       <td class="bits">XXXX XX<span class="free">OO</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOO</span>X XX<span class="free">OO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">farmland</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
+      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOO</span>X XXXX</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOO</span>X XX<span class="free">OO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td rowspan=3>1</td>
       <td class="caption">rail</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOO</span>X XXXX</td>
+      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO</span> XXXX <span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits">XXXX XXXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO OO</span>XX XXXX</td>
     </tr>
     <tr>
       <td class="caption">rail with signals</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO</span> XXXX XXXX XXXX</td>
-      <td class="bits">XXXX <span class="free">OOOO</span></td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">-inherit-</td>
     </tr>
     <tr>
       <td class="caption">depot</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
-      <td class="bits">XX<span class="free">O</span>X <span class="free">OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO</span> XXXX</td>
+      <td class="bits">XX<span class="free">O</span>X <span class="free">O</span>XXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">-inherit-</td>
     </tr>
     <tr>
       <td rowspan=3>2</td>
       <td class="caption">road</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOO</span>X XXXX</td>
+      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits">XXXX X<span class="free">O</span>XX</td>
       <td class="bits">XXX<span class="free">O</span> XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">level crossing</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX <span class="free">OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">XXXX <span class="free">OOO</span>X</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OO</span>XX XXXX</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">XXXX<span class="free"> OOO</span>X</td>
+      <td class="bits">XXXX X<span class="free">O</span>XX</td>
+      <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
       <td class="caption">road depot</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX <span class="free">OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">XXX<span class="free">O</span> XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits">XXX<span class="free">O OOOO</span></td>
     </tr>
     <tr>
       <td>3</td>
       <td class="caption">house</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XX<span class="free">O</span><span class="option">~ ~~</span>XX</td>
+      <td class="bits">XXX<span class="option">~ ~~</span>XX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXX<span class="abuse">X XXXX</span></td>
-      <td class="bits"><span class="abuse">XXXX XX</span><span class="free">OO</span></td>
+      <td class="bits"><span class="abuse">XXXX XX</span>XX</td>
       <td class="bits">XXXX <span class="abuse">XXXX</span></td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td>4</td>
       <td class="caption">trees</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">O</span>XX<span class="option">~ ~~~~</span></td>
+      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="free">OOOO OOO</span>X XXXX XXXX</td>
       <td class="bits"><span class="option">~~</span>XX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XXXX XX<span class="free">OO</span></td>
       <td class="bits">XX<span class="free">OO O</span>XXX</td>
+      <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td rowspan=7>5</td>
       <td class="caption">rail station</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">O</span>XXX XXXX</td>
+      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XXXX <span class="free">OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OO</span>XX XXXX</td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
       <td class="caption">rail waypoint</td>
@@ -227,168 +199,154 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
     </tr>
     <tr>
       <td class="caption">road stop</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
       <td class="bits">XXXX <span class="free">OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
       <td class="bits">XX<span class="free">O</span>X XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">dock</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">airport</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX <span class="free">OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">buoy</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">oilrig</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
-      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td rowspan=3>6</td>
       <td class="caption">sea, shore</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">O</span>XXX XXXX</td>
+      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">X<span class="option">~~</span>X XXXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">canal, river</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">-inherit-</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">shipdepot</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">-inherit-</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td>8</td>
       <td class="caption">industry</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXX<span class="free">O</span> <span class="abuse">XXXX</span></td>
+      <td class="bits">XXX<span class="free">O</span> <span class="abuse">
+        XXXX</span></td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
+      <td class="bits"><span class="free">OO</span>XX XXXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
     <tr>
       <td rowspan=2>9</td>
       <td class="caption">tunnel entrance</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOO</span>X XXXX</td>
+      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits">XXXX <span class="free">OOOO</span></td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">X<span class="free">OO</span>X XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OO</span>XX XXXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits">XXXX X<span class="free">O</span>XX</td>
     </tr>
     <tr>
       <td>bridge ramp</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
       <td class="bits">-inherit-</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits">-inherit-</td>
     </tr>
     <tr>
       <td rowspan=2>A</td>
-      <td class="caption">objects</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">O</span>XXX XXXX</td>
-      <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="caption">unmovables</td>
       <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOO</span>X XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
+    </tr>
+    <tr>
+      <td class="caption">company statue</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">XXXX XXXX XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">-inherit-</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
   </tbody>
 </table>

docs/linkgraph.txt

@@ -1,30 +0,0 @@
-Some clarifications about the link graph
-----------------------------------------
-
-InitializeLinkGraphs joins all threads, so if the game is abandoned
-with some threads still running, they're joined as soon as the next game
-(possibly the title game) is started. See also InitializeGame.
-
-The MCF (multi-commodity flow) algorithm can be quite CPU-hungry as it's
-NP-hard and takes exponential time (though with a very small constant
-factor) in the number of nodes.
-This is why it is run in a separate thread where possible. However after
-some time the thread is joined and if it hasn't finished by then the game
-will hang. This problem gets worse if we are running on a platform without
-threads. However, as those are usually the ones with less CPU power I
-assume the contention for the CPU would make the game hard to play even
-with threads or even without cargodist (autosave ...). I might be wrong,
-but I won't put any work into this before someone shows me some problem.
-
-You can configure the link graph recalculation time. A link graph
-recalculation time of X days means that each link graph job has X days
-to run before it is joined. The downside is that the flow stats won't be
-updated before the job is finished and thus a high value means less
-updates and longer times until changes in capacities are accounted for.
-If you play a very large map with a complicated link graph you may want to
-raise the time setting to avoid lags. The same holds for systems with slow
-CPUs.
-
-Another option to avoid excessive lags is to reduce the accuracy of link
-graph calculations. Generally the accuracy is inversely correlated to the
-CPU requirements of the MCF algorithm.

docs/multiplayer.txt

@@ -1,219 +1,121 @@
-Multiplayer manual for OpenTTD
-Last updated:    2011-02-16
-------------------------------------------------------------------------
+Multiplayer Manual for OpenTTD (0.3.5)
+=======================================
 
+1. Starting a Server
+---------------------
 
-Table of contents
------------------
-1.0) Starting a server
-2.0) Connecting to a server
- * 2.1) Connecting to a server over the console
-3.0) Playing internet games
-4.0) Tips for servers
- * 4.1) Imposing landscaping limits
-5.0) Some useful things
-6.0) Troubleshooting
-
-
-1.0) Starting a server
----- -----------------
- - 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)
+ - 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
----- ----------------------
+2. Connecting to a Server
+--------------------------
+
  - 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 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.
+ - 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)
+ - 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
----- ---------------------------------------
+
+3. Connecting to a Server over the Console
+-------------------------------------------
+
  - Open the console and type in the following command:
-    connect <ip/host>:<port>#<company-no>
+
+    connect <ip/host>:<port>#<player-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.
+4. Playing Internet-Games
+--------------------------
 
- - 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.
+ - Since OpenTTD 0.3.5 the network protocol has been rewritten and is very stable, even over slow connections.
 
- - 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.
+ - 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.
+
+ - 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:
+
+   - net_frame_freq:
+      change it in console with: net_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.
+   - net_sync_freq:
+      change it in console with: net_sync_freq = <number>
+     the number should be between the 50 and 1000, not much lower, not much higer. 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 net_frame_freq has more effect on the bandwidth then net_sync_freq. You should never change net_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.
+5. Tips for servers
+--------------------
 
- - 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 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 automaticly 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.
  - You can also do this manually via the console: 'reset_company'.
+    Both ways, the company will go bankrupt.
 
- - 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 automaticly 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, enable Advertising. To do this, select 'Internet (advertise)'
+    in the Start Server menu, or type in console: 'set server_advertise 1'.
 
- - 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.
-
- - 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
-
- - 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.
-
-      The default value 4096 covers an area of 64 x 64 tiles.
-
-    - '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).
-
-      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).
-
-      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.
+ - 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). 1 client uses +/- 3 kb/s up and down. To decrease
+    this amount, set 'net_frame_freq' to 1 for example. This will reduce it to 1.5 kb/s per client.
 
 
-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 Screen
+6. Some useful things
+----------------------
 
- - You can give other players some money via the ClientList (under the 'head'
-   in the mainbar).
+ - You can protect your company so nobody else can join uninvited. To do this, check your Company Screen
+
+ - 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!
 
+ - From 0.3.5, desyncs should not happen anymore
 
-6.0) Troubleshooting
----- ---------------
- - 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.
+ - From 0.3.5, patch-settings are also synced. You can now play without deleting openttd.cfg, and with, for example, extra large trains enabled.
+
+7. Troubleshooting
+------------------
+
+ - My advertised server does not show up in the 'advertised server list' (servers.openttd.org)
+     Run openttd with the '-d net=2' parameter, as this will show whether it receives replies from the master server.
+     If it does not receive replies it is most likely that you need to configure your router to forward the OpenTTD ports 3979 (both TCP and UDP) to the computer that is hosting the game.

docs/obg_format.txt

@@ -42,8 +42,6 @@ description  = foo
 description.en_US = howdie
 ; palette used by the set; either DOS or Windows
 palette      = DOS
-; preferred blitter, optional; either 8bpp (default) or 32bpp.
-blitter      = 8bpp
 
 ; The files section lists the files that replace sprites.
 ; The file names are case sensitive.

docs/obm_format.txt

@@ -45,15 +45,12 @@ description.en_US = howdie
 ; The file names are case sensitive.
 ; You can have empty file names; in that case no song will be loaded
 ; for that 'entry'.
-; If you want to load music from the MPS DOS music driver "cat" format,
-; specify just the name of the .cat file the song is located in, then
-; fill out the "catindex" section.
 [files]
 ; The theme song for OpenTTD
 theme = THEME_SONG.GM
 ; The songs in the 'old style' category
-old_0 = GM.CAT
-old_1 = GM.CAT
+old_0 =
+old_1 =
 old_2 =
 old_3 =
 old_4 =
@@ -89,17 +86,9 @@ ezy_9 =
 ; Note that the list of files is case sensitive. Each file listed in the
 ; files section must be listed here with it's song name, otherwise you
 ; will get a lot of warnings when starting OpenTTD.
-; You don't need to fill this out for "cat" format music, the song names
-; are loaded directly from the file in that case.
 [names]
 THEME_SONG.GM = Tycoon DELUXE Theme
 
-; If you are loading music from the DOS version "cat" format, specify
-; which index into the file the song has.
-[catindex]
-old_0 = 1
-old_1 = 3
-
 ; The md5s section lists the MD5 checksum for the files that replace them.
 ; Note that the list of files is case sensitive. Each file listed in the
 ; files section must be listed here with it's MD5 checksum, otherwise you
@@ -107,13 +96,6 @@ old_1 = 3
 [md5s]
 THEME_SONG.GM = 45cfec1b9d8c7a0ad45e755833cbf221
 
-; If a song needs to have parts of the start or end cut off to avoid long
-; silences, you can specify MIDI tick codes for start:end of the actual
-; music part for each file here.
-; Not all music drivers might support this feature.
-[timingtrim]
-THEME_SONG.GM = 768:53760
-
 ; The origin section provides the possibility to put and extra line into
 ; the warning that a file is missing/corrupt. This can be used to tell
 ; them where to find it. It works on the filename specified in the

docs/openttd.6

@@ -1,152 +1,114 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd October 13, 2014
+.Dd Apr 01, 2010
 .Dt OPENTTD 6
-.Os
 .Sh NAME
 .Nm openttd
-.Nd open source clone of the Microprose game \(lqTransport Tycoon Deluxe\(rq
+.Nd An open source clone of the Microprose game "Transport Tycoon Deluxe"
 .Sh SYNOPSIS
 .Nm
 .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 ...
-.Op Fl D Oo Ar host Oc Ns Op : Ns Ar port
-.Op Fl g Op Ar savegame
+.Op Fl d Ar [level | cat=lvl[,...]]
+.Op Fl D Ar [host][:port]
+.Op Fl g Ar [savegame]
 .Op Fl G Ar seed
+.Op Fl i Ar palette
 .Op Fl I Ar graphicsset
-.Op Fl l Ar host Ns Op : Ns Ar port
+.Op Fl l Ar host[: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 player
+.Op Fl n Ar host[:port][#player]
 .Op Fl p Ar password
 .Op Fl P Ar password
-.Op Fl q Ar savegame
-.Op Fl r Ar width Ns x Ns Ar height
+.Op Fl r Ar widthxheight
 .Op Fl s Ar driver
 .Op Fl S Ar soundset
 .Op Fl t Ar year
 .Op Fl v Ar driver
 .Sh OPTIONS
-.Bl -tag -width "-n host[:port][#player]"
+.Bl -tag -width ".Fl n Ar host[:port][#player]"
 .It Fl b Ar blitter
-Select the blitter
-.Ar blitter ;
-see
+Set the blitter, see
 .Fl h
-for a full list.
+for a full list
 .It Fl c Ar config_file
-Use
-.Ar config_file
-instead of
-.Pa openttd.cfg .
+Use 'config_file' instead of 'openttd.cfg'
 .It Fl d Ar [level]
 Set debug verbosity for all categories to
-.Ar level ,
-or 1 if omitted.
-.It Fl d Ar cat Ns = Ns Ar lvl Ns Op , Ns Ar ...
-Set debug verbosity to
-.Ar lvl
-for a specific category
-.Ar cat .
-.It Fl D Oo Ar host Oc Ns Op : Ns Ar port
-Start a dedicated server.
-.Pp
-Network debug level will be set to 6.
-If you want to change this, set
+.Ar level
+or 1 if omitted
+.It Fl d Ar cat=level[,...]
+Set debug verbosity for a specific category
+.It Fl D Ar [host][:port]
+Start a dedicated server. Sets network debug level to 6. If you want to change this, use
 .Fl d
-after setting
-.Fl D .
+after
+.Fl D
+.It Fl G Ar seed
+Seed the pseudo random number generator
 .It Fl e
-Start in world editor mode.
+Start in world editor mode
 .It Fl f
 Fork into background (dedicated server only, see
-.Fl D ) .
-.It Fl g Op Ar savegame
+.Fl D )
+.It Fl g Ar [savegame]
 Load
 .Ar savegame
-at start or start a new game if omitted.
+at start or start a new game if omitted. The
 .Ar savegame
-must be either an absolute path or one relative to the current path or one of
-the search paths.
-.It Fl G Ar seed
-Seed the pseudo random number generator with
-.Ar seed .
+must be either absolute or relative to the current path or one of the search paths.
 .It Fl h
-Display a summary of all options and list all the available AIs, blitters,
-sound, music and video drivers, graphics sets and sound sets.
+Display a summary of all options and lists all the available AIs, blitters, sound, music and video drivers, graphics sets and sound sets.
+.It Fl i Ar palette
+Set the palette. '0' for the DOS palette, '1' for the Windows palette and '2' to autodetect (default).
+.sp
+The palette depends where the base graphics set originated from. If it came from the Transport Tycoon Deluxe for DOS it has the DOS palette, if it came from the Windows version of Transport Tycoon Deluxe it has the Windows palette. All others likely have the Windows palette as that is the most used palette.
 .It Fl I Ar graphicsset
-Select the graphics set
-.Ar graphicsset ;
-see
+Set the graphics set, see
 .Fl h
-for a full list.
-.It Fl l Ar host Ns Op : Ns Ar port
-Redirect
-.Fn DEBUG
-output; see
-.Fl D .
+for a full list
+.It Fl l Ar host[:port]
+Redirect DEBUG(), See
+.Fl D
 .It Fl m Ar driver
-Select the music driver
-.Ar driver ;
-see
+Set the music driver, see
 .Fl h
-for a full list.
+for a full list
 .It Fl M Ar musicset
-Select the music set
-.Ar musicset ;
-see
+Set 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 player
-Join a network game, optionally specifying a port to connect to and player to
-play as.
+for a full list
+.It Fl n Ar host[:port][#player]
+Join a network game, optionally specify a port to connect to and player to play as
 .It Fl p Ar password
-Password used to join server.
-Only useful with
-.Fl n .
+Password used to join server. Only useful with
+.Fl n
 .It Fl P Ar password
-Password used to join company.
-Only useful with
-.Fl n .
-.It Fl q Ar savegame
-Write some information about the specified savegame and exit.
-.It Fl r Ar width Ns x Ns Ar height
-Set the resolution to
-.Ar width
-\(mu
-.Ar height
-pixels.
+Password used to join company. Only useful with
+.Fl n
+.It Fl r Ar widthxheight
+Set the resolution
 .It Fl s Ar driver
-Select the sound driver
-.Ar driver ;
-see
+Set the sound driver, see
 .Fl h
-for a full list.
+for a full list
 .It Fl S Ar soundset
-Select the sound set
-.Ar soundset ;
-see
+Set the sound set, see
 .Fl h
-for a full list.
+for a full list
 .It Fl t Ar year
-Set the starting year to
-.Ar year .
+Set the starting year
 .It Fl v Ar driver
-Select the video driver
-.Ar driver ;
-see
+Set the video driver, see
 .Fl h
-for a full list.
+for a full list
 .It Fl x
-Do not automatically save to config file on exit.
+Do not automatically save to config file on exit
 .El
 .Sh SEE ALSO
-.Lk https://wiki.openttd.org "Wiki"
-(includes community maintained manual),
-.Lk https://forum.openttd.org "Forum",
-.Lk https://www.openttd.org "News"
+http://wiki.openttd.org/, http://www.openttd.org
 .Sh HISTORY
 Transport Tycoon Deluxe was written by Chris Sawyer and published by Microprose.
 .Nm