(svn r26981) -Release: 1.4.4-RC1

- Fix: Owner of road depot road types were not properly changed upon bankruptcy [FS#6126] (r26955)

.dorpsgek.yml

@@ -1,15 +0,0 @@
-notifications:
-  global:
-    irc:
-      - openttd
-      - openttd.notice
-
-  push:
-    only:
-    - master
-    only-by:
-    - DorpsGek
-  commit-comment:
-  pull-request:
-  issue:
-  tag-created:

.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/FUNDING.yml

@@ -1 +0,0 @@
-custom: https://www.openttd.org/donate.html

.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.

.github/workflows/commit-checker.yml

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

.gitignore

@@ -7,33 +7,24 @@ bin/ai/*
 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/game
-bin/game/*
-!bin/game/compat*.nut
 !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
@@ -42,8 +33,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,7 +1,6 @@
 syntax: glob
 
 .svn
-*.aps
 bin/baseset/openttd.32.bmp
 bin/lang/*
 bin/openttd*
@@ -14,16 +13,12 @@ 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

COMPILING.md

@@ -1,141 +0,0 @@
-# Compiling OpenTTD
-
-## Required/optional libraries
-
-The following libraries are used by OpenTTD for:
-
-- 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 (Linux only)
-- libSDL2: hardware access (video, sound, mouse) (not required for Windows or macOS)
-
-OpenTTD does not require any of the libraries to be present, but without
-liblzma you cannot open most recent savegames and without zlib you cannot
-open most older savegames or use the content downloading system.
-Without libSDL/liballegro on non-Windows and non-macOS machines you have
-no graphical user interface; you would be building a dedicated server.
-
-## Windows:
-
-You need Microsoft Visual Studio 2015 Update 3 or newer.
-
-You can download the free Visual Studio Community Edition from Microsoft at
-https://visualstudio.microsoft.com/vs/community/.
-
-OpenTTD needs the Platform SDK, if it isn't installed already. This can be
-done during installing Visual Studio, by selecting
-`Visual C++ MFC for x86 and x64` (and possibly
-`Visual C++ ATL for x86 and x64` depending on your version). If not, you
-can get download it as [MS Windows Platform SDK](https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk).
-
-Install the SDK by following the instructions as given.
-
-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` instructions 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:
-
-- liblzma
-- libpng
-- lzo
-- zlib
-
-To install both the x64 (64bit) and x86 (32bit) variants (though only one is necessary), you can use:
-
-```ps
-.\vcpkg install liblzma:x64-windows-static libpng:x64-windows-static lzo:x64-windows-static zlib:x64-windows-static
-.\vcpkg install liblzma:x86-windows-static libpng:x86-windows-static lzo:x86-windows-static zlib:x86-windows-static
-```
-
-Open the relevant project file and it should build automatically.
-- 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`
-
-The OpenTTD wiki may provide additional help with [compiling for Windows](https://wiki.openttd.org/Compiling_on_Windows_using_Microsoft_Visual_C%2B%2B_2015).
-
-You can also build OpenTTD with MSYS2/MinGW-w64 or Cygwin/MinGW using the Makefile.  The OpenTTD wiki may provide additional help with [MSYS2](https://wiki.openttd.org/Compiling_on_Windows_using_MSYS2)
-
-## Linux, Unix, Solaris:
-
-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.
-
-The OpenTTD wiki may provide additional help with:
-
-- [compiling for Linux and *BSD](https://wiki.openttd.org/Compiling_on_%28GNU/%29Linux_and_*BSD)
-- [compiling for Solaris](https://wiki.openttd.org/Compiling_on_Solaris)
-
-
-## 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 --enable-universal`'
-instead of '`./configure`'.
-
-The OpenTTD wiki may provide additional help with [compiling for macOS](https://wiki.openttd.org/Compiling_on_Mac_OS_X).
-
-## Haiku:
-
-Use '`make`', but do a '`./configure`' before the first build.
-
-The OpenTTD wiki may provide additional help with [compiling for Haiku](https://wiki.openttd.org/Compiling_on_Haiku).
-
-## OS/2:
-
-A comprehensive GNU build environment is required to build the OS/2 version.
-
-The OpenTTD wiki may provide additional help with [compiling for OS/2](https://wiki.openttd.org/Compiling_on_OS/2).
-
-## Supported compilers
-
-The following compilers are tested with and known to compile OpenTTD:
-
-- Microsoft Visual C++ (MSVC) 2015, 2017 and 2019.
-- GNU Compiler Collection (GCC) 4.8 - 9.
-- Clang/LLVM 3.9 - 8
-
-The following compilers are known not to compile OpenTTD:
-
-In general, this is because these old versions do not (fully) support modern
-C++11 language features.
-
-- Microsoft Visual C++ (MSVC) 2013 and earlier.
-- GNU Compiler Collection (GCC) 4.7 and earlier.
-- Clang/LLVM 3.8 and earlier.
-
-If any of these, or any other, compilers can compile OpenTTD, let us know.
-Pull requests to support more compilers are welcome.
-
-## 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.

CONTRIBUTING.md

@@ -1,267 +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 goals](./CONTRIBUTING.md#project-goals) 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.
-
-Pull requests should fit with the [goals of the project](./CONTRIBUTING.md#project-goals).
-
-**Please do 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.
-
-Every pull request should have a clear scope, with no unrelated commits.
-
-[Code style](https://wiki.openttd.org/Coding_style) must be complied with for pull requests to be accepted; this also includes [commit message format](https://wiki.openttd.org/Coding_style#Commit_message).
-
-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 pull request or patch, you agree to the [License](#license) and the [Privacy Notice](CONTRIBUTING.md#privacy-notice).
-
-
-### 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.
-
-Tip: [commit message format](https://wiki.openttd.org/Coding_style#Commit_message) is a common reason for pull requests to fail validation.
-
-
-### Are there any development docs?
-
-There is no single source for OpenTTD development docs. It's a complex project with a long history, and multiple APIs.
-
-A good entry point is [Development](https://wiki.openttd.org/Development) on the OpenTTD wiki; this provides links to wiki documentation and other sources.
-
-The GitHub repo also includes some non-comprehensive documentation in [/docs](./docs).
-
-You may also want the guide to [compiling OpenTTD](./COMPILING.md).
-
-
-## Project goals
-
-### What are the goals of the official branch?
-
-The main goals of the official branch are:
-
-- Stay faithful to the original gameplay from Transport Tycoon Deluxe
-- Improve the user interface
-- Allow extending the gameplay with add-ons / mods via supported content APIs
-- Provide a (relatively) stable core for both players of the official branch, and for authors of add-ons and maintainers of patchpacks
-
-In contrast, extending or altering the gameplay of the base game is not encouraged.
-
-The rationale behind these goals is that people have different opinions about what OpenTTD is and what it should be.
-When it comes to gameplay, there are at least these groups of people:
-
-- *Model railway (mostly singleplayer)*: build "realistic" landscapes, roleplay a world, or even replicate historical scenarios
-- *Economical challenge (mostly singleplayer)*: run a business with economical challenges
-- *Transport challenge (singleplayer or cooperative multiplayer)*: build efficient track layouts with high cargo throughput and tons of vehicles
-- *Competitive speed run (competitive multiplayer)*: maximize some goal in some limited amount of time
-
-When it comes to gameplay features there are at least these groups of interests:
-
-- *Control freak:* micromanagement like conditional orders, refitting and loading etc.
-- *Casual:* automatisation like cargodist, path based signalling etc.
-
-To please everyone, the official branch tries to stay close to the original gameplay; after all, that is what everyone brought here.
-The preferred method to alter and extent the gameplay is via add-ons like NewGRF and GameScripts.
-
-For a long time, the official branch was also open to features which could be enabled/disabled, but the corner-cases that came with some configurations have rendered some parts of the code very complicated.
-Today, new features have to work with all the already existing features, which is not only challenging in corner cases, but also requires spending considerable more work than just "making it work in the game mode that I play".
-
-The preferred method to introduce new gameplay features is to extend the content APIs, supporting ever more add-on content / mods.
-
-This moves conflict-solving away from the codebase to content authors / players.
-It is more accepted for add-ons not working together than the base game not working with certain setting combinations.
-
-In general the game should allow anything that doesn't violate basic rules, but it should warn players if they take potentially dangerous or "stupid" actions.
-
-For example, players are not prevented from starting vehicles without orders, but will receive a warning about vehicles having too few orders.
-This lack of limitation has led to players challenging themselves to create networks where all vehicles have no orders, increasing gameplay possibilities.
-
-### I do not agree with the goals of the official branch, what can I do instead?
-
-Fork!  There is a rich history of experimental patches for OpenTTD.
-
-Many of these will never be accepted for core, but are creative and interesting ways to modify OpenTTD.
-
-Sometimes patches are combined into long-running patchpacks, modified OpenTTD versions which can be downloaded by anyone, or modified OpenTTD clients for dedicated multiplayer servers.
-
-One of the reasons to keep core relatively stable is to make life easier for patch authors and patchpack maintainers where possible.
-
-Patchpack discussions and related topics may be found in community sites such as [TT-Forums development section](https://www.tt-forums.net/viewforum.php?f=33).
-
-
-## Legal stuff
-
-### License
-
-By contributing your code, you agree to license your contribution under the [GPL v2](https://github.com/OpenTTD/OpenTTD/blob/master/COPYING.md).
-
-
-### 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.
-
-
-### 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,19 +1,18 @@
 This is the license which applies to OpenTTD with the exception of some
-3rd party modules. See [./README.md](./README.md) for details
+3rd party modules. See readme.txt for details
 
-GNU General Public License
-==========================
 
-_Version 2, June 1991_
-_Copyright © 1989, 1991 Free Software Foundation, Inc.,_
-_51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA_
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-### Preamble
+                            Preamble
 
-The licenses for most software are designed to take away your
+  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
 License is intended to guarantee your freedom to share and change free
 software--to make sure the software is free for all its users.  This
@@ -23,47 +22,48 @@ using it.  (Some other Free Software Foundation software is covered by
 the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
-When we speak of free software, we are referring to freedom, not
+  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 this service if you wish), that you receive source code or can get it
 if you want it, that you can change the software or use pieces of it
 in new free programs; and that you know you can do these things.
 
-To protect your rights, we need to make restrictions that forbid
+  To protect your rights, we need to make restrictions that forbid
 anyone to deny you these rights or to ask you to surrender the rights.
 These restrictions translate to certain responsibilities for you if you
 distribute copies of the software, or if you modify it.
 
-For example, if you distribute copies of such a program, whether
+  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must give the recipients all the rights that
 you have.  You must make sure that they, too, receive or can get the
 source code.  And you must show them these terms so they know their
 rights.
 
-We protect your rights with two steps: **(1)** copyright the software, and
-**(2)** offer you this license which gives you legal permission to copy,
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
 distribute and/or modify the software.
 
-Also, for each author's protection and ours, we want to make certain
+  Also, for each author's protection and ours, we want to make certain
 that everyone understands that there is no warranty for this free
 software.  If the software is modified by someone else and passed on, we
 want its recipients to know that what they have is not the original, so
 that any problems introduced by others will not reflect on the original
 authors' reputations.
 
-Finally, any free program is threatened constantly by software
+  Finally, any free program is threatened constantly by software
 patents.  We wish to avoid the danger that redistributors of a free
 program will individually obtain patent licenses, in effect making the
 program proprietary.  To prevent this, we have made it clear that any
 patent must be licensed for everyone's free use or not licensed at all.
 
-The precise terms and conditions for copying, distribution and
+  The precise terms and conditions for copying, distribution and
 modification follow.
 
-### TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-**0.** This License applies to any program or other work which contains
+  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -80,7 +80,7 @@ is covered only if its contents constitute a work based on the
 Program (independent of having been made by running the Program).
 Whether that is true depends on what the Program does.
 
-**1.** You may copy and distribute verbatim copies of the Program's
+  1. You may copy and distribute verbatim copies of the Program's
 source code as you receive it, in any medium, provided that you
 conspicuously and appropriately publish on each copy an appropriate
 copyright notice and disclaimer of warranty; keep intact all the
@@ -91,27 +91,29 @@ along with the Program.
 You may charge a fee for the physical act of transferring a copy, and
 you may at your option offer warranty protection in exchange for a fee.
 
-**2.** You may modify your copy or copies of the Program or any portion
+  2. You may modify your copy or copies of the Program or any portion
 of it, thus forming a work based on the Program, and copy and
 distribute such modifications or work under the terms of Section 1
 above, provided that you also meet all of these conditions:
 
-* **a)** You must cause the modified files to carry prominent notices
-stating that you changed the files and the date of any change.
-* **b)** You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any
-part thereof, to be licensed as a whole at no charge to all third
-parties under the terms of this License.
-* **c)** If the modified program normally reads commands interactively
-when run, you must cause it, when started running for such
-interactive use in the most ordinary way, to print or display an
-announcement including an appropriate copyright notice and a
-notice that there is no warranty (or else, saying that you provide
-a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this
-License.  (Exception: if the Program itself is interactive but
-does not normally print such an announcement, your work based on
-the Program is not required to print an announcement.)
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
 
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
@@ -133,24 +135,26 @@ with the Program (or with a work based on the Program) on a volume of
 a storage or distribution medium does not bring the other work under
 the scope of this License.
 
-**3.** You may copy and distribute the Program (or a work based on it,
+  3. You may copy and distribute the Program (or a work based on it,
 under Section 2) in object code or executable form under the terms of
 Sections 1 and 2 above provided that you also do one of the following:
 
-* **a)** Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections
-1 and 2 above on a medium customarily used for software interchange; or,
-* **b)** Accompany it with a written offer, valid for at least three
-years, to give any third party, for a charge no more than your
-cost of physically performing source distribution, a complete
-machine-readable copy of the corresponding source code, to be
-distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
-* **c)** Accompany it with the information you received as to the offer
-to distribute corresponding source code.  (This alternative is
-allowed only for noncommercial distribution and only if you
-received the program in object code or executable form with such
-an offer, in accord with Subsection b above.)
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
@@ -169,7 +173,7 @@ access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
 
-**4.** You may not copy, modify, sublicense, or distribute the Program
+  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
 void, and will automatically terminate your rights under this License.
@@ -177,7 +181,7 @@ However, parties who have received copies, or rights, from you under
 this License will not have their licenses terminated so long as such
 parties remain in full compliance.
 
-**5.** You are not required to accept this License, since you have not
+  5. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
 distribute the Program or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
@@ -186,7 +190,7 @@ Program), you indicate your acceptance of this License to do so, and
 all its terms and conditions for copying, distributing or modifying
 the Program or works based on it.
 
-**6.** Each time you redistribute the Program (or any work based on the
+  6. Each time you redistribute the Program (or any work based on the
 Program), the recipient automatically receives a license from the
 original licensor to copy, distribute or modify the Program subject to
 these terms and conditions.  You may not impose any further
@@ -194,7 +198,7 @@ restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties to
 this License.
 
-**7.** If, as a consequence of a court judgment or allegation of patent
+  7. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
@@ -226,7 +230,7 @@ impose that choice.
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
 
-**8.** If the distribution and/or use of the Program is restricted in
+  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
 may add an explicit geographical distribution limitation excluding
@@ -234,7 +238,7 @@ those countries, so that distribution is permitted only in or among
 countries not thus excluded.  In such case, this License incorporates
 the limitation as if written in the body of this License.
 
-**9.** The Free Software Foundation may publish revised and/or new versions
+  9. The Free Software Foundation may publish revised and/or new versions
 of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
@@ -247,7 +251,7 @@ Software Foundation.  If the Program does not specify a version number of
 this License, you may choose any version ever published by the Free Software
 Foundation.
 
-**10.** If you wish to incorporate parts of the Program into other free
+  10. If you wish to incorporate parts of the Program into other free
 programs whose distribution conditions are different, write to the author
 to ask for permission.  For software which is copyrighted by the Free
 Software Foundation, write to the Free Software Foundation; we sometimes
@@ -255,9 +259,9 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-### NO WARRANTY
+                            NO WARRANTY
 
-**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
@@ -267,7 +271,7 @@ TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 REPAIR OR CORRECTION.
 
-**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
@@ -277,15 +281,15 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-### How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
-If you develop a new program, and you want it to be of the greatest
+  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
 
-To do so, attach the following notices to the program.  It is safest
+  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
@@ -317,20 +321,20 @@ when it starts in an interactive mode:
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
-The hypothetical commands `show w` and `show c` should show the appropriate
+The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w` and `show c`; they could even be
+be called something other than `show w' and `show c'; they could even be
 mouse-clicks or menu items--whatever suits your program.
 
 You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the program, if
 necessary.  Here is a sample; alter the names:
 
-    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-    `Gnomovision' (which makes passes at compilers) written by James Hacker.
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-    <signature of Ty Coon>, 1 April 1989
-    Ty Coon, President of Vice
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
 
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may

CREDITS.md

@@ -1,60 +0,0 @@
-### 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)
-- Charles Pigott (LordAro) - General / Correctness police (since 1.9)
-- 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!

Doxyfile

@@ -1,3 +1,5 @@
+# $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.
@@ -6,14 +8,9 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = "OpenTTD Source"
-PROJECT_NUMBER         = $(VERSION)
-PROJECT_BRIEF          =
-PROJECT_LOGO           =
+PROJECT_NAME           = OpenTTD
 OUTPUT_DIRECTORY       = docs/source/
-CREATE_SUBDIRS         = YES
-ALLOW_UNICODE_NAMES    = NO
+CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
@@ -35,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
@@ -78,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
@@ -96,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 \
@@ -127,38 +93,31 @@ FILE_PATTERNS          = *.c \
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = */3rdparty \
-                         */script/api
-EXCLUDE_SYMBOLS        =
+EXCLUDE_PATTERNS       = */3rdparty */.svn */script/api
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = ./docs/
+IMAGE_PATH             =./docs/
 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
@@ -166,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
@@ -227,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
@@ -246,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
@@ -287,66 +195,42 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = WITH_ZLIB \
-                         WITH_LZO \
-                         WITH_LIBLZMA \
-                         WITH_SDL \
-                         WITH_PNG \
-                         WITH_FONTCONFIG \
-                         WITH_FREETYPE \
-                         WITH_ICU_I18N \
-                         WITH_ICU_LX \
-                         UNICODE \
-                         _UNICODE \
-                         _GNU_SOURCE \
-                         FINAL=
+PREDEFINED             = ENABLE_NETWORK WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE _GNU_SOURCE FINAL=
 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
 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

@@ -1,3 +1,5 @@
+# $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.
@@ -10,15 +12,15 @@
 # The revision is needed for the bundle name and creating an OSX application bundle.
 # 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'	')
 
-# 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.
@@ -52,7 +54,7 @@ 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)$(ROOT_DIR)/os/macosx/plistgen.sh                          "$(BUNDLE_DIR)/$(OSXAPP)" "$(REV)"
 	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(BASESET_DIR)"
 endif
 ifeq ($(OS),UNIX)
@@ -67,10 +69,10 @@ endif
 	$(Q)cp "$(BIN_DIR)/baseset/opntitle.dat"  "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/baseset/"*.obm         "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
-	$(Q)cp "$(ROOT_DIR)/README.md"            "$(BUNDLE_DIR)/"
-	$(Q)cp "$(ROOT_DIR)/COPYING.md"           "$(BUNDLE_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/multiplayer.md"  "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/"
 ifdef MAN_DIR
 	$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
@@ -82,11 +84,17 @@ 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) |  $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(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.md" "$(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/"
+ifndef STRIP
+	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.exe"   "$(TTD_DIR)/"
+endif
+endif
 endif
 
 ### Packing the current bundle into several compressed file formats ###
@@ -143,15 +151,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/"* "$(ROOT_DIR)/README.md" "$(ROOT_DIR)/COPYING.md" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt"
+	$(Q)unix2dos "$(ROOT_DIR)/docs/"*.txt "$(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"
 
@@ -164,7 +172,6 @@ install: bundle
 	$(Q)install -d "$(INSTALL_BINARY_DIR)"
 	$(Q)install -d "$(INSTALL_ICON_DIR)"
 	$(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)/lang"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/scripts"
@@ -175,12 +182,11 @@ 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)/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)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/known-bugs.txt" "$(INSTALL_DOC_DIR)"
 endif
 ifndef DO_NOT_INSTALL_CHANGELOG
 	$(Q)install -d "$(INSTALL_DOC_DIR)"
@@ -188,7 +194,7 @@ ifndef DO_NOT_INSTALL_CHANGELOG
 endif
 ifndef DO_NOT_INSTALL_LICENSE
 	$(Q)install -d "$(INSTALL_DOC_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/COPYING.md" "$(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

Makefile.grf.in

@@ -1,15 +1,20 @@
+# $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.
+# Building requires GRFCodec and NFORenum. Older versions of GRFCodec are
+#  known to miscompile the graphics.
 #
-# Recent versions (including sources) can be found at:
+# Recent nightlies (including sources) of both can be found at:
 #  http://www.openttd.org/download-grfcodec
+#  http://www.openttd.org/download-nforenum
 #
-# The mercurial repository can be found at:
+# The mercurial repository of both can be found at:
 #  http://hg.openttdcoop.org/grfcodec
+#  http://hg.openttdcoop.org/nforenum
 #
 
 
@@ -40,31 +45,24 @@ MD5SUM   := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum")
 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
+all: $(BIN_DIR)/openttd.grf $(BIN_DIR)/orig_dos.obg $(BIN_DIR)/orig_dos_de.obg $(BIN_DIR)/orig_win.obg $(BIN_DIR)/orig_dos.obs $(BIN_DIR)/orig_win.obs $(BIN_DIR)/no_sound.obs $(BIN_DIR)/orig_win.obm $(BIN_DIR)/no_music.obm
+else
+all:
 endif
 
+# Make sure the sprites directory exists.
+$(OBJS_DIR)/sprites:
+	$(Q)-mkdir "$@"
+
 $(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
+$(BIN_DIR)/%.obg: $(BASESET_DIR)/%.obg $(BIN_DIR)/openttd.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) sed 's/^OPENTTD.GRF  = *[0-9a-f]*$$/OPENTTD.GRF  = '`$(MD5SUM) $(BIN_DIR)/openttd.grf | sed 's@ .*@@'`'/' $< > $@.tmp
 	$(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $@.tmp >$@
 	$(Q) rm $@.tmp
 
@@ -76,14 +74,9 @@ $(BIN_DIR)/%.obm: $(BASESET_DIR)/%.obm $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/
 	$(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
+$(BIN_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites $(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
@@ -91,23 +84,9 @@ $(BIN_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(GRF_DIR)/assemble_nfo.awk
 	$(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)
+	$(Q)rm -f *.bak *.grf
 
 # Clean up temporary files
 mrproper: clean

Makefile.in

@@ -1,3 +1,5 @@
+# $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.
@@ -48,7 +50,7 @@ RES := $(shell if [ ! -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CA
 
 all: config.pwd config.cache
 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 parameter"; echo; fi
+	@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; \
@@ -150,7 +152,7 @@ mrproper:
 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
+	$(Q)rm -f $(BIN_DIR)/baseset/openttd.grf $(BIN_DIR)/baseset/*.obg $(BIN_DIR)/baseset/*.obs $(BIN_DIR)/baseset/*.obm
 
 depend:
 	@for dir in $(SRC_DIRS); do \

Makefile.lang.in

@@ -1,9 +1,12 @@
+# $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/>.
 
 STRGEN        = !!STRGEN!!
+ENDIAN_CHECK  = !!ENDIAN_CHECK!!
 SRC_DIR       = !!SRC_DIR!!
 LANG_DIR      = !!LANG_DIR!!
 BIN_DIR       = !!BIN_DIR!!
@@ -22,6 +25,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 =
@@ -35,23 +43,23 @@ 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_base.o: $(SRC_DIR)/strgen/strgen_base.cpp $(SRC_DIR)/strgen/strgen.h 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 $@ $<
 
-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
+strgen.o: $(SRC_DIR)/strgen/strgen.cpp $(SRC_DIR)/strgen/strgen.h 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 $@ $<
 
-string.o: $(SRC_DIR)/string.cpp $(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 $@ $<
 
-alloc_func.o: $(SRC_DIR)/core/alloc_func.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 $@ $<
 
-getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/safeguards.h
+getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
@@ -72,11 +80,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) $(CXXFLAGS_BUILD) $(LDFLAGS_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 alloc_func.o getoptdata.o table/strings.h $(STRGEN) $(LANGS) $(LANGS:%=$(BIN_DIR)/lang/%) lang/english.* $(ENDIAN_TARGETS)
 
 mrproper: clean
 	$(Q)rm -rf $(BIN_DIR)/lang

Makefile.msvc

@@ -1,3 +1,5 @@
+# $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.

Makefile.setting.in

@@ -1,9 +1,12 @@
+# $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!!
+ENDIAN_CHECK     = !!ENDIAN_CHECK!!
 SRC_DIR          = !!SRC_DIR!!
 CXX_BUILD        = !!CXX_BUILD!!
 CFLAGS_BUILD     = !!CFLAGS_BUILD!!
@@ -12,6 +15,8 @@ LDFLAGS_BUILD    = !!LDFLAGS_BUILD!!
 STAGE            = !!STAGE!!
 SETTING_OBJS_DIR = !!SETTING_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 =
@@ -23,23 +28,23 @@ 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
+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
 	$(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
+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) -DSETTINGSGEN -c -o $@ $<
 
-getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/safeguards.h
+getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.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
+string.o: $(SRC_DIR)/string.cpp endian_host.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
+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
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
@@ -52,11 +57,21 @@ table/settings.h: $(SETTINGSGEN) $(SRC_DIR)/table/settings.h.preamble $(SRC_DIR)
 	@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
 
+# 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) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
+
 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
+	$(Q)rm -f settingsgen.o alloc_func.o getoptdata.o ini_load.o $(SETTINGSGEN) $(ENDIAN_TARGETS) table/settings.h
 
 mrproper: clean
 

Makefile.src.in

@@ -1,3 +1,5 @@
+# $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.
@@ -27,7 +29,9 @@ 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!!
@@ -36,6 +40,7 @@ SORT           = !!SORT!!
 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!!
 
@@ -47,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))))
 
+# Make sure endian_target.h is reasable as if it was in the src/ dir
 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)
 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 =
@@ -86,29 +94,26 @@ VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
 MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d'	')
 
 # 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'	')
-YEAR     := $(shell echo "$(VERSIONS)" | cut -f 7 -d'	')
+REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
+REV_NR   := $(shell echo "$(VERSIONS)" | cut -f 2 -d'	')
 
-# Make sure we have something in VERSION and ISODATE
-ifeq ($(VERSION),)
-VERSION := norev000
+# Make sure we have something in REV and REV_NR
+ifeq ($(REV),)
+REV := norev000
 endif
-ifeq ($(ISODATE),)
-ISODATE := 00000000
+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_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
@@ -116,7 +121,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
@@ -138,7 +143,7 @@ $(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP)
 
 $(OBJS_MM:%.o=%.d): %.d: $(SRC_DIR)/%.mm $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
+	$(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
 
 $(OBJS_RC:%.o=%.d): %.d: $(SRC_DIR)/%.rc $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.rc=%.rc)'
@@ -150,7 +155,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
 
@@ -161,19 +166,6 @@ $(SRC_OBJS_DIR)/$(DEPEND): $(SRC_DIR)/depend/depend.cpp
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_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)
@@ -185,7 +177,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
@@ -211,7 +210,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
 
@@ -248,11 +247,11 @@ $(filter %sse4.o, $(OBJS_CPP)): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
 
 $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
-	$(Q)$(CXX_HOST) $(CFLAGS) $(CXXFLAGS) -c -o $@ $<
+	$(Q)$(CC_HOST) $(CFLAGS) -c -o $@ $<
 
 $(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)
@@ -265,18 +264,39 @@ endif
 
 $(TTD): $(OBJS) $(CONFIG_CACHE_LINKER)
 	$(E) '$(STAGE) Linking $@'
+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
+
+# 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) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_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;s@!!YEAR!!@$(YEAR)@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;s@!!YEAR!!@$(YEAR)@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:
 
@@ -284,7 +304,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)/%) $(BIN_DIR)/baseset/openttd.32.bmp $(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,213 +0,0 @@
-# OpenTTD
-
-## Table of contents
-
-- 1.0) [About](#10-about)
-    - 1.1) [Downloading OpenTTD](#11-downloading-openttd)
-    - 1.2) [OpenTTD gameplay manual](#12-openttd-gameplay-manual)
-    - 1.3) [Supported platforms](#13-supported-platforms)
-    - 1.4) [Installing and running OpenTTD](#14-installing-and-running-openttd)
-    - 1.5) [Add-on content / mods](#15-add-on-content--mods)
-    - 1.6) [OpenTTD directories](#16-openttd-directories)
-    - 1.7) [Compiling OpenTTD](#17-compiling-openttd)
-- 2.0) [Contact and community](#20-contact-and-community)
-    - 2.1) [Contributing to OpenTTD](#21-contributing-to-openttd)
-    - 2.2) [Reporting bugs](#22-reporting-bugs)
-    - 2.3) [Translating](#23-translating)
-- 3.0) [Licensing](#30-licensing)
-- 4.0) [Credits](#40-credits)
-
-## 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"](#30-licensing) below for details.
-
-## 1.1) Downloading OpenTTD
-
-OpenTTD can be downloaded from the [official OpenTTD website](https://www.openttd.org/).
-
-Both 'stable' and 'nightly' versions are available for download:
-
-- most people should choose the 'stable' version, as this has been more extensively tested
-- the 'nightly' version includes the latest changes and features, but may sometimes be less reliable
-
-On some platforms OpenTTD will also be available via your OS package manager or a similar service.
-
-
-## 1.2) OpenTTD gameplay manual
-
-OpenTTD has a [community-maintained wiki](https://wiki.openttd.org/), including a gameplay manual and tips.
-
-
-## 1.3) Supported platforms
-
-OpenTTD has been ported to several platforms and operating systems.
-
-The currently working platforms are:
-
-- FreeBSD (SDL)
-- Haiku (SDL)
-- Linux (SDL)
-- macOS (universal) (Cocoa video and sound drivers)
-- OpenBSD (SDL)
-- OS/2 (SDL)
-- Windows (Win32 GDI (faster) or SDL)
-
-### 1.3.1) Legacy support
-Platforms, languages and compilers change.
-We'll keep support going on old platforms as long as someone is interested in supporting them, except where it means the project can't move forward to keep up with language and compiler features.
-
-We guarantee that every revision of OpenTTD will be able to load savegames from every older revision (excepting where the savegame is corrupt).
-Please report a bug if you find a save that doesn't load.
-
-## 1.4) Installing and running OpenTTD
-
-OpenTTD is usually straightforward to install, but for more help the wiki [includes an installation guide](https://wiki.openttd.org/Installation).
-
-OpenTTD needs some additional graphics and sound files to run.
-
-For some platforms these will be downloaded during the installation process if required.
-
-For some platforms, you will need to refer to [the installation guide](https://wiki.openttd.org/Installation).
-
-
-### 1.4.1) Free graphics and sound files
-
-The free data files, split into OpenGFX for graphics, OpenSFX for sounds and
-OpenMSX for music can be found at:
-
-- 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.
-
-
-### 1.4.2) Original Transport Tycoon Deluxe graphics and sound files
-
-If you want to play with the original Transport Tycoon Deluxe data files you have to copy the data files from the CD-ROM into the baseset/ directory.
-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
-
-
-### 1.4.3) Original Transport Tycoon Deluxe music
-
-If you want the Transport Tycoon Deluxe music, copy the appropriate files from the original game into the baseset folder.
-- 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
-
-
-## 1.5) Add-on content / mods
-
-OpenTTD features multiple types of add-on content, which modify gameplay in different ways.
-
-Most types of add-on content can be downloaded within OpenTTD via the 'Check Online Content' button in the main menu.
-
-Add-on content can also be installed manually, but that's more complicated; the [OpenTTD wiki](https://wiki.openttd.org/OpenTTD) may offer help with that, or the [OpenTTD directory structure guide](./docs/directory_structure.md).
-
-### 1.5.1) AI opponents
-
-OpenTTD comes without AI opponents, so if you want to play with AIs you have to download them.
-
-The easiest way is via the 'Check Online Content' button in the main menu.
-
-You can select some AIs that you think are compatible with your playing style.
-
-AI help and discussions may also be found in the [AI section of the forum](https://www.tt-forums.net/viewforum.php?f=65).
-
-### 1.5.2) Scenarios and height maps
-
-Scenarios and heightmaps can be added via the 'Check Online Content' button in the main menu.
-
-### 1.5.3) NewGRFs
-
-A wide range of add-content is available as NewGRFs, including vehicles, industries, stations, landscape objects, town names and more.
-
-NewGRFs can be added via the 'Check Online Content' button in the main menu.
-
-See also the wiki [guide to NewGRFs](https://wiki.openttd.org/NewGRF) and [the forum graphics development section](https://www.tt-forums.net/viewforum.php?f=66).
-
-### 1.5.4) Game scripts
-
-Game scripts can provide additional challenges or changes to the standard OpenTTD gameplay, for example setting transport goals, or changing town growth behaviour.
-
-Game scripts can be added via the 'Check Online Content' button in the main menu.
-
-See also the wiki [guide to game scripts](https://wiki.openttd.org/Game_script) and [the forum graphics game script section](https://www.tt-forums.net/viewforum.php?f=65).
-
-### 1.6) OpenTTD directories
-
-OpenTTD uses its own directory structure to store game data, add-on content etc.
-
-For more information, see the [directory structure guide](./docs/directory_structure.md).
-
-### 1.7) Compiling OpenTTD
-
-If you want to compile OpenTTD from source, instructions can be found in [COMPILING.md](./COMPILING.md).
-
-
-## 2.0) Contact and Community
-
-'Official' channels
-
-- [OpenTTD website](https://www.openttd.org)
-- IRC chat using #openttd on irc.oftc.net [more info about our irc channel](https://wiki.openttd.org/Irc)
-- [OpenTTD on Github](https://github.com/openTTD/) for code repositories and for reporting issues
-- [forum.openttd.org](https://forum.openttd.org/) - the primary community forum site for discussing OpenTTD and related games
-- [OpenTTD wiki](https://wiki.openttd.org/) community-maintained wiki, including topics like gameplay guide, detailed explanation of some game mechanics, how to use add-on content (mods) and much more
-
-'Unofficial' channels
-
-- the OpenTTD wiki has a [page listing OpenTTD communities](https://wiki.openttd.org/Community) including some in languages other than English
-
-
-### 2.1) Contributing to OpenTTD
-
-We welcome contributors to OpenTTD.  More information for contributors can be found in [CONTRIBUTING.md](./CONTRIBUTING.md)
-
-
-### 2.2) Reporting bugs
-
-Good bug reports are very helpful.  We have a [guide to reporting bugs](./CONTRIBUTING.md#bug-reports) to help with this.
-
-Desyncs in multiplayer are complex to debug and report (some software development skils are required).
-Instructions can be found in [debugging and reporting desyncs](./docs/debugging_desyncs.md).
-
-
-### 2.3) Translating
-
-OpenTTD is translated into many languages.  Translations are added and updated via the [online translation tool](https://translator.openttd.org).
-
-
-## 3.0) Licensing
-
-OpenTTD is licensed under the GNU General Public License version 2.0.
-For the complete license text, see the file '[COPYING.md](./COPYING.md)'.
-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`.
-
-
-## 4.0 Credits
-
-See [CREDITS.md](./CREDITS.md)

azure-pipelines-ci.yml

@@ -1,72 +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)
-      BuildConfiguration: Debug
-  - 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:
-      linux-amd64-clang-3.9:
-        Tag: 'linux-amd64-clang-3.9'
-      linux-amd64-gcc-6:
-        Tag: 'linux-amd64-gcc-6'
-      linux-i386-gcc-6:
-        Tag: '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: $(Tag)
-
-- job: macos
-  displayName: 'MacOS'
-  pool:
-    vmImage: 'macOS-10.14'
-
-  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 name-rev --name-only --tags --no-undefined HEAD 2>/dev/null | sed 's@\^0$@@')
-
-# If we are a tag, show the part of the changelog till (but excluding) the last stable
-if [ -n "$tag" ]; then
-    grep='^[0-9]\+\.[0-9]\+\.[0-9]\+[^-]'
-    next=$(cat changelog.txt | grep '^[0-9]' | awk 'BEGIN { show="false" } // { if (show=="true") print $0; if ($1=="'$tag'") show="true"} ' | grep "$grep" | head -n1 | sed 's/ .*//')
-    cat changelog.txt | awk 'BEGIN { show="false" } /^[0-9]+.[0-9]+.[0-9]+/ { if ($1=="'$next'") show="false"; if ($1=="'$tag'") show="true";} // { if (show=="true") print $0 }'
-    exit 0
-fi
-
-# In all other cases, show the git log of the last 7 days
-revdate=$(git log -1 --pretty=format:"%ci")
-last_week=$(date -d "$revdate -7days" +"%Y-%m-%d %H:%M")
-git log --after="${last_week}" --pretty=fuller

azure-pipelines/manifest.sh

@@ -1,87 +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
-
-error=""
-
-FILES=
-DEV_FILES=
-for filename in $(ls ${FOLDER} | grep -v ".txt$\|.md$\|sum$" | sort); do
-    case ${filename} in
-        *docs*   |\
-        *source* |\
-        *dbg.deb |\
-        *pdb.xz  )
-            DEV_FILES="${DEV_FILES} ${filename}"
-            ;;
-
-        *)
-            FILES="${FILES} ${filename}"
-            ;;
-    esac
-done
-
-# output_files key filename...
-output_files() {
-    if [ "$#" -lt 2 ]; then return; fi
-    key=$1
-    echo "${key}:" >> manifest.yaml
-    shift
-    while [ "$#" -gt 0 ]; do
-        filename=$1
-        if [ ! -e ${FOLDER}/${filename}.md5sum ] || [ ! -e ${FOLDER}/${filename}.sha1sum ] || [ ! -e ${FOLDER}/${filename}.sha256sum ]; then
-            echo "ERROR: missing checksum file for ${filename}" 1>&2
-            error="y"
-            shift
-            continue
-        fi
-
-        echo "- id: ${filename}" >> manifest.yaml
-        echo "  size: $(stat -c"%s" ${FOLDER}/${filename})" >> manifest.yaml
-        echo "  md5sum: $(cat ${FOLDER}/${filename}.md5sum | cut -d\  -f1)" >> manifest.yaml
-        echo "  sha1sum: $(cat ${FOLDER}/${filename}.sha1sum | cut -d\  -f1)" >> manifest.yaml
-        echo "  sha256sum: $(cat ${FOLDER}/${filename}.sha256sum | cut -d\  -f1)" >> manifest.yaml
-        shift
-    done
-}
-
-output_files files ${FILES}
-output_files dev_files ${DEV_FILES}
-
-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://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip  > opengfx-all.zip
-    unzip opengfx-all.zip
-    rm -f opengfx-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(not(contains(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,186 +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)
-      BuildConfiguration: Release
-  - 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:
-          Tag: 'linux-ubuntu-xenial-i386-gcc'
-        linux-ubuntu-xenial-amd64-gcc:
-          Tag: 'linux-ubuntu-xenial-amd64-gcc'
-        linux-ubuntu-bionic-i386-gcc:
-          Tag: 'linux-ubuntu-bionic-i386-gcc'
-        linux-ubuntu-bionic-amd64-gcc:
-          Tag: 'linux-ubuntu-bionic-amd64-gcc'
-        linux-ubuntu-focal-amd64-gcc:
-          Tag: 'linux-ubuntu-focal-amd64-gcc'
-        linux-debian-stretch-i386-gcc:
-          Tag: 'linux-debian-stretch-i386-gcc'
-        linux-debian-stretch-amd64-gcc:
-          Tag: 'linux-debian-stretch-amd64-gcc'
-        linux-debian-buster-i386-gcc:
-          Tag: 'linux-debian-buster-i386-gcc'
-        linux-debian-buster-amd64-gcc:
-          Tag: 'linux-debian-buster-amd64-gcc'
-
-    steps:
-    - template: release-fetch-source.yml
-    - template: linux-build.yml
-      parameters:
-        Image: compile-farm
-        ContainerCommand: '$(Build.BuildNumber)'
-        Tag: $(Tag)
-    - template: linux-claim-bundles.yml
-    - template: release-bundles.yml
-
-- job: macos
-  displayName: 'MacOS'
-  pool:
-    vmImage: 'macOS-10.14'
-  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: ${{ parameters.BuildConfiguration }}
-    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

@@ -1,3 +1,5 @@
+/* $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.
@@ -5,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.");
@@ -365,17 +367,3 @@ 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

@@ -1,3 +1,5 @@
+/* $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.
@@ -5,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("1.0 API compatibility in effect.");
+AILog.Info("1.0 API compatability in effect.");
 
 AIRoad._BuildRoadStation <- AIRoad.BuildRoadStation;
 AIRoad.BuildRoadStation <- function(tile, front, road_veh_type, station_id)
@@ -117,17 +119,3 @@ 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,3 +1,5 @@
+/* $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.
@@ -5,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("1.1 API compatibility in effect.");
+AILog.Info("1.1 API compatability in effect.");
 
 AICompany.GetCompanyValue <- function(company)
 {
@@ -54,17 +56,3 @@ AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
 AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
 AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
 AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
-
-/* 1.9 adds a vehicle type parameter. */
-AIBridge._GetName <- AIBridge.GetName;
-AIBridge.GetName <- function(bridge_id)
-{
-	return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
-}
-
-/* 1.9 adds parent_group_id to CreateGroup function */
-AIGroup._CreateGroup <- AIGroup.CreateGroup;
-AIGroup.CreateGroup <- function(vehicle_type)
-{
-	return AIGroup._CreateGroup(vehicle_type, AIGroup.GROUP_INVALID);
-}

bin/ai/compat_1.10.nut

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

bin/ai/compat_1.2.nut

@@ -1,3 +1,5 @@
+/* $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.
@@ -5,18 +7,4 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-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);
-}
+AILog.Info("1.2 API compatability in effect.");

bin/ai/compat_1.3.nut

@@ -1,3 +1,5 @@
+/* $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.
@@ -5,18 +7,4 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-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);
-}
+AILog.Info("1.3 API compatability in effect.");

bin/ai/compat_1.4.nut

@@ -1,22 +1,8 @@
+/* $Id: compat_1.3.nut 23969 2012-02-19 19:14:17Z rubidium $ */
+
 /*
  * 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,22 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-AILog.Info("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,22 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-AILog.Info("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,22 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-AILog.Info("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,22 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-AILog.Info("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/compat_1.9.nut

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

bin/ai/regression/completeness.sh

@@ -1,11 +1,13 @@
 #!/bin/sh
 
-if ! [ -f ai/regression/completeness.sh ]; then
+# $Id$
+
+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]
@@ -44,9 +46,9 @@ cat ai/regression/tst_*/main.nut | tr ';' '\n' | awk '
 			}
 		}
 	}
-	# We want to remove everything before the FIRST occurrence of AI.
-	# If we do not remove any other occurrences of AI from the string
-	# we will remove everything before the LAST occurrence of AI, so
+	# We want to remove everything before the FIRST occurence of AI.
+	# If we do not remove any other occurences of AI from the string
+	# we will remove everything before the LAST occurence of AI, so
 	# do some little magic to make it work the way we want.
 	sub("AI", "AXXXXY")
 	gsub("AI", "AXXXXX")
@@ -59,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.nut

@@ -1,3 +1,5 @@
+/* $Id$ */
+
 class Regression extends AIController {
 	function Start();
 };
@@ -251,11 +253,7 @@ function Regression::Bridge()
 		if (AIBridge.IsValidBridge(i)) j++;
 		print("  Bridge " + i);
 		print("    IsValidBridge():    " + AIBridge.IsValidBridge(i));
-		print("    GetName():");
-		print("     VT_RAIL:           " + AIBridge.GetName(i, AIVehicle.VT_RAIL));
-		print("     VT_ROAD:           " + AIBridge.GetName(i, AIVehicle.VT_ROAD));
-		print("     VT_WATER:          " + AIBridge.GetName(i, AIVehicle.VT_WATER));
-		print("     VT_AIR:            " + AIBridge.GetName(i, AIVehicle.VT_AIR));
+		print("    GetName():          " + AIBridge.GetName(i));
 		print("    GetMaxSpeed():      " + AIBridge.GetMaxSpeed(i));
 		print("    GetPrice():         " + AIBridge.GetPrice(i, 5));
 		print("    GetMaxLength():     " + AIBridge.GetMaxLength(i));
@@ -572,7 +570,7 @@ function Regression::Group()
 	local vehicle = AIVehicle.BuildVehicle(10000, 116);
 	print("  AIVehicle.BuildVehicle(): " + vehicle);
 	print("  GetNumEngines():          " + AIGroup.GetNumEngines(AIGroup.GROUP_ALL, 116));
-	local group = AIGroup.CreateGroup(AIVehicle.VT_ROAD, AIGroup.GROUP_INVALID);
+	local group = AIGroup.CreateGroup(AIVehicle.VT_ROAD);
 	print("  CreateGroup():            " + group);
 	print("  MoveVehicle():            " + AIGroup.MoveVehicle(group, vehicle));
 	print("  GetNumEngines():          " + AIGroup.GetNumEngines(group, 116));
@@ -974,7 +972,48 @@ function Regression::Order()
 	print("  SetStopLocation():     " + AIOrder.SetStopLocation(20, 0, AIOrder.STOPLOCATION_MIDDLE));
 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(20, 0));
 
-	local list = AIVehicleList_Station(3);
+	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));
+	}
+
+	list = AIVehicleList_Station(3);
 
 	print("");
 	print("--VehicleList_Station--");
@@ -1020,36 +1059,7 @@ function Regression::Rail()
 	print("    BuildRail():                   " + AIRail.BuildRail(10002, 10003, 10006));
 	print("    HasTransportType():            " + AITile.HasTransportType(10005, AITile.TRANSPORT_RAIL));
 	print("    HasTransportType():            " + AITile.HasTransportType(10006, AITile.TRANSPORT_RAIL));
-	print("    RemoveRail():                  " + AIRail.RemoveRail(10006, 10005, 10002));
-	print("    HasTransportType():            " + AITile.HasTransportType(10004, AITile.TRANSPORT_RAIL));
-	print("    HasTransportType():            " + AITile.HasTransportType(10005, AITile.TRANSPORT_RAIL));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(6200, AIRail.RAILTRACK_NE_SW));
-	print("    RemoveRailTrack():             " + AIRail.RemoveRailTrack(6200, AIRail.RAILTRACK_NW_NE));
-	print("    RemoveRailTrack():             " + AIRail.RemoveRailTrack(6200, AIRail.RAILTRACK_NE_SW));
-	print("    BuildRail():                   " + AIRail.BuildRail(6200, 6200 + 256, 6200 + (256 * 4)));
-	print("    HasTransportType():            " + AITile.HasTransportType(6200 + (256 * 3), AITile.TRANSPORT_RAIL));
-	print("    HasTransportType():            " + AITile.HasTransportType(6200 + (256 * 4), AITile.TRANSPORT_RAIL));
-	print("    RemoveRail():                  " + AIRail.RemoveRail(6200 + (256 * 3), 6200 + (256 * 2), 6200 - 256));
-	print("    HasTransportType():            " + AITile.HasTransportType(6200 + (256 * 3), AITile.TRANSPORT_RAIL));
-	print("    HasTransportType():            " + AITile.HasTransportType(6200 + (256 * 4), AITile.TRANSPORT_RAIL));
-	print("    BuildRailTrack():              " + AIRail.BuildRail(14706, 14705, 12907));
-	print("    HasTransportType():            " + AITile.HasTransportType(13421, AITile.TRANSPORT_RAIL));
-	print("    HasTransportType():            " + AITile.HasTransportType(14191, AITile.TRANSPORT_RAIL));
-	print("    RemoveRail():                  " + AIRail.RemoveRail(12907, 13163, 14706));
-	print("    HasTransportType():            " + AITile.HasTransportType(13421, AITile.TRANSPORT_RAIL));
-	print("    HasTransportType():            " + AITile.HasTransportType(14191, AITile.TRANSPORT_RAIL));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NW_SW));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NE_SE));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NW_NE));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_SW_SE));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NE_SW));
-	print("    DemolishTile():                " + AITile.DemolishTile(61533));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NE_SW));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NW_SE));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NW_NE));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_SW_SE));
-	print("    DemolishTile():                " + AITile.DemolishTile(61533));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NW_SE));
+	print("    RemoveRail():                  " + AIRail.RemoveRail(10005, 10004, 10001));
 
 	print("  Depot");
 	print("    IsRailTile():                  " + AIRail.IsRailTile(33411));
@@ -1084,31 +1094,6 @@ function Regression::Rail()
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7957));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7958));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7959));
-
-	print("  Waypoint");
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(12646, AIRail.RAILTRACK_NW_SE));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(12648, AIRail.RAILTRACK_NE_SW));
-	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(12650, AIRail.RAILTRACK_NW_NE));
-	print("    BuildRailWaypoint():           " + AIRail.BuildRailWaypoint(12644));
-	print("    BuildRailWaypoint():           " + AIRail.BuildRailWaypoint(12646));
-	print("    BuildRailWaypoint():           " + AIRail.BuildRailWaypoint(12648));
-	print("    BuildRailWaypoint():           " + AIRail.BuildRailWaypoint(12650));
-	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12644));
-	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12646));
-	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12648));
-	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12650));
-	print("    RemoveRailWaypointTileRectangle():" + AIRail.RemoveRailWaypointTileRectangle(12644, 12646, false));
-	print("    RemoveRailWaypointTileRectangle():" + AIRail.RemoveRailWaypointTileRectangle(12648, 12650, true));
-	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12644));
-	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12646));
-	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12648));
-	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12650));
-	print("    HasTransportType():            " + AITile.HasTransportType(12644, AITile.TRANSPORT_RAIL));
-	print("    HasTransportType():            " + AITile.HasTransportType(12646, AITile.TRANSPORT_RAIL));
-	print("    HasTransportType():            " + AITile.HasTransportType(12648, AITile.TRANSPORT_RAIL));
-	print("    HasTransportType():            " + AITile.HasTransportType(12650, AITile.TRANSPORT_RAIL));
-	print("    DemolishTile():                " + AITile.DemolishTile(12648));
-	print("    DemolishTile():                " + AITile.DemolishTile(12650));
 }
 
 function Regression::Road()
@@ -1249,6 +1234,10 @@ function Regression::Station()
 	print("  GetLocation(1000):        " + AIStation.GetLocation(1000));
 	print("  GetStationID(33411):      " + AIStation.GetStationID(33411));
 	print("  GetStationID(34411):      " + AIStation.GetStationID(34411));
+	print("  GetCargoWaiting(0, 0):    " + AIStation.GetCargoWaiting(0, 0));
+	print("  GetCargoWaiting(1000, 0): " + AIStation.GetCargoWaiting(1000, 0));
+	print("  GetCargoWaiting(0, 1000): " + AIStation.GetCargoWaiting(0, 1000));
+
 	print("  GetStationID(33411):      " + AIStation.GetStationID(33411));
 	print("  HasRoadType(3, TRAM):     " + AIStation.HasRoadType(3, AIRoad.ROADTYPE_TRAM));
 	print("  HasRoadType(3, ROAD):     " + AIStation.HasRoadType(3, AIRoad.ROADTYPE_ROAD));
@@ -1265,42 +1254,25 @@ function Regression::Station()
 	print("  GetNearestTown():         " + AIStation.GetNearestTown(10000));
 	print("  GetNearestTown():         " + AIStation.GetNearestTown(3));
 
-	print("");
-	print("--CargoWaiting--");
-	for (local cargo = 0; cargo <= 1000; cargo += 1000) {
-		for (local station0 = 0; station0 <= 1000; station0 += 1000) {
-			print("  GetCargoWaiting(" + station0 + ", " + cargo + "): " +
-					AIStation.GetCargoWaiting(station0, cargo));
-			for (local station1 = 0; station1 <= 1000; station1 += 1000) {
-				print("  GetCargoWaitingFrom(" + station0 + ", " + station1 + ", " + cargo + "): " +
-						AIStation.GetCargoWaitingFrom(station0, station1, cargo));
-				print("  GetCargoWaitingVia(" + station0 + ", " + station1 + ", " + cargo + "): " +
-						AIStation.GetCargoWaitingFrom(station0, station1, cargo));
-				for (local station2 = 0; station2 <= 1000; station2 += 1000) {
-					print("  GetCargoWaitingFromVia(" + station0 + ", " + station1 + ", " + station2 + ", " + cargo + "): " +
-							AIStation.GetCargoWaitingFromVia(station0, station1, station2, cargo));
-				}
-			}
-		}
-	}
+	local list = AIStationList(AIStation.STATION_BUS_STOP + AIStation.STATION_TRUCK_STOP);
 
 	print("");
-	print("--CargoPlanned--");
-	for (local cargo = 0; cargo <= 1000; cargo += 1000) {
-		for (local station0 = 0; station0 <= 1000; station0 += 1000) {
-			print("  GetCargoPlanned(" + station0 + ", " + cargo + "): " +
-					AIStation.GetCargoPlanned(station0, cargo));
-			for (local station1 = 0; station1 <= 1000; station1 += 1000) {
-				print("  GetCargoPlannedFrom(" + station0 + ", " + station1 + ", " + cargo + "): " +
-						AIStation.GetCargoPlannedFrom(station0, station1, cargo));
-				print("  GetCargoPlannedVia(" + station0 + ", " + station1 + ", " + cargo + "): " +
-						AIStation.GetCargoPlannedFrom(station0, station1, cargo));
-				for (local station2 = 0; station2 <= 1000; station2 += 1000) {
-					print("  GetCargoPlannedFromVia(" + station0 + ", " + station1 + ", " + station2 + ", " + cargo + "): " +
-							AIStation.GetCargoPlannedFromVia(station0, station1, station2, cargo));
-				}
-			}
-		}
+	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));
 	}
 }
 
@@ -1497,7 +1469,7 @@ function Regression::TileList()
 		print("    " + i + " => " + list.GetValue(i));
 	}
 
-	list = AITileList_StationType(6, AIStation.STATION_BUS_STOP);
+	list = AITileList_StationType(4, AIStation.STATION_BUS_STOP);
 	print("");
 	print("--TileList_StationType--");
 	print("  Count():             " + list.Count());
@@ -1690,9 +1662,6 @@ function Regression::Vehicle()
 	print("  BuildVehicle():       " + AIVehicle.BuildVehicle(10008, 9));
 	print("  BuildVehicle():       " + AIVehicle.BuildVehicle(10008, 27));
 	print("  BuildVehicle():       " + AIVehicle.BuildVehicle(10008, 27));
-	print("  IsValidVehicle(17):   " + AIVehicle.IsValidVehicle(17));
-	print("  IsValidVehicle(18):   " + AIVehicle.IsValidVehicle(18));
-	print("  IsValidVehicle(19):   " + AIVehicle.IsValidVehicle(19)); // 19 is immediately joined to 18
 	print("  MoveWagonChain():     " + AIVehicle.MoveWagonChain(18, 0, 17, 0));
 	print("  GetNumWagons():       " + AIVehicle.GetNumWagons(17));
 	print("  GetLength():          " + AIVehicle.GetLength(17));
@@ -1705,19 +1674,6 @@ function Regression::Vehicle()
 	print("  GetWagonEngineType(): " + AIVehicle.GetWagonEngineType(17 3));
 	print("  GetWagonAge():        " + AIVehicle.GetWagonAge(17, 3));
 
-	print("  --Refit--");
-	print("    GetBuildWithRefitCapacity(): " + AIVehicle.GetBuildWithRefitCapacity(28479, 211, 255));
-	print("    GetBuildWithRefitCapacity(): " + AIVehicle.GetBuildWithRefitCapacity(28479, 211, 0));
-	print("    GetBuildWithRefitCapacity(): " + AIVehicle.GetBuildWithRefitCapacity(28479, 211, 9));
-	print("    BuildVehicleWithRefit():     " + AIVehicle.BuildVehicleWithRefit(28479, 211, 9));
-	print("    GetCapacity():               " + AIVehicle.GetCapacity(20, 9));
-	print("    GetCapacity():               " + AIVehicle.GetCapacity(20, 5));
-	print("    GetRefitCapacity():          " + AIVehicle.GetRefitCapacity(20, 5));
-	print("    RefitVehicle():              " + AIVehicle.RefitVehicle(20, 5));
-	print("    GetCapacity():               " + AIVehicle.GetCapacity(20, 9));
-	print("    GetCapacity():               " + AIVehicle.GetCapacity(20, 5));
-	print("    SellVehicle():               " + AIVehicle.SellVehicle(20));
-
 	print("  --Errors--");
 	print("    RefitVehicle():        " + AIVehicle.RefitVehicle(12, 0));
 	print("    GetLastErrorString():  " + AIError.GetLastErrorString());

bin/ai/regression/regression.txt

@@ -867,165 +867,105 @@ ERROR: IsEnd() is invalid as Begin() is never called
 --Bridge--
   Bridge -1
     IsValidBridge():    false
-    GetName():
-     VT_RAIL:           (null : 0x00000000)
-     VT_ROAD:           (null : 0x00000000)
-     VT_WATER:          (null : 0x00000000)
-     VT_AIR:            (null : 0x00000000)
+    GetName():          (null : 0x00000000)
     GetMaxSpeed():      -1
     GetPrice():         -1
     GetMaxLength():     -1
     GetMinLength():     -1
   Bridge 0
     IsValidBridge():    true
-    GetName():
-     VT_RAIL:           Wooden rail bridge
-     VT_ROAD:           Wooden road bridge
-     VT_WATER:          Aqueduct
-     VT_AIR:            (null : 0x00000000)
+    GetName():          Wooden rail bridge
     GetMaxSpeed():      32
     GetPrice():         450
     GetMaxLength():     66
     GetMinLength():     2
   Bridge 1
     IsValidBridge():    true
-    GetName():
-     VT_RAIL:           Concrete rail bridge
-     VT_ROAD:           Concrete road bridge
-     VT_WATER:          Aqueduct
-     VT_AIR:            (null : 0x00000000)
+    GetName():          Concrete rail bridge
     GetMaxSpeed():      48
     GetPrice():         630
     GetMaxLength():     4
     GetMinLength():     2
   Bridge 2
     IsValidBridge():    true
-    GetName():
-     VT_RAIL:           Steel girder rail bridge
-     VT_ROAD:           Steel girder road bridge
-     VT_WATER:          Aqueduct
-     VT_AIR:            (null : 0x00000000)
+    GetName():          Steel girder rail bridge
     GetMaxSpeed():      64
     GetPrice():         811
     GetMaxLength():     7
     GetMinLength():     2
   Bridge 3
     IsValidBridge():    true
-    GetName():
-     VT_RAIL:           Reinforced concrete suspension rail bridge
-     VT_ROAD:           Reinforced concrete suspension road bridge
-     VT_WATER:          Aqueduct
-     VT_AIR:            (null : 0x00000000)
+    GetName():          Reinforced concrete suspension rail bridge
     GetMaxSpeed():      80
     GetPrice():         946
     GetMaxLength():     12
     GetMinLength():     4
   Bridge 4
     IsValidBridge():    true
-    GetName():
-     VT_RAIL:           Steel suspension rail bridge
-     VT_ROAD:           Steel suspension road bridge
-     VT_WATER:          Aqueduct
-     VT_AIR:            (null : 0x00000000)
+    GetName():          Steel suspension rail bridge
     GetMaxSpeed():      96
     GetPrice():         1042
     GetMaxLength():     66
     GetMinLength():     5
   Bridge 5
     IsValidBridge():    true
-    GetName():
-     VT_RAIL:           Steel suspension rail bridge
-     VT_ROAD:           Steel suspension road bridge
-     VT_WATER:          Aqueduct
-     VT_AIR:            (null : 0x00000000)
+    GetName():          Steel suspension rail bridge
     GetMaxSpeed():      112
     GetPrice():         1081
     GetMaxLength():     66
     GetMinLength():     5
   Bridge 6
     IsValidBridge():    true
-    GetName():
-     VT_RAIL:           Steel cantilever rail bridge
-     VT_ROAD:           Steel cantilever road bridge
-     VT_WATER:          Aqueduct
-     VT_AIR:            (null : 0x00000000)
+    GetName():          Steel cantilever rail bridge
     GetMaxSpeed():      160
     GetPrice():         1261
     GetMaxLength():     9
     GetMinLength():     5
   Bridge 7
     IsValidBridge():    true
-    GetName():
-     VT_RAIL:           Steel cantilever rail bridge
-     VT_ROAD:           Steel cantilever road bridge
-     VT_WATER:          Aqueduct
-     VT_AIR:            (null : 0x00000000)
+    GetName():          Steel cantilever rail bridge
     GetMaxSpeed():      208
     GetPrice():         1306
     GetMaxLength():     10
     GetMinLength():     5
   Bridge 8
     IsValidBridge():    true
-    GetName():
-     VT_RAIL:           Steel cantilever rail bridge
-     VT_ROAD:           Steel cantilever road bridge
-     VT_WATER:          Aqueduct
-     VT_AIR:            (null : 0x00000000)
+    GetName():          Steel cantilever rail bridge
     GetMaxSpeed():      240
     GetPrice():         1396
     GetMaxLength():     11
     GetMinLength():     5
   Bridge 9
     IsValidBridge():    true
-    GetName():
-     VT_RAIL:           Steel girder rail bridge
-     VT_ROAD:           Steel girder road bridge
-     VT_WATER:          Aqueduct
-     VT_AIR:            (null : 0x00000000)
+    GetName():          Steel girder rail bridge
     GetMaxSpeed():      256
     GetPrice():         1351
     GetMaxLength():     4
     GetMinLength():     2
   Bridge 10
     IsValidBridge():    false
-    GetName():
-     VT_RAIL:           (null : 0x00000000)
-     VT_ROAD:           (null : 0x00000000)
-     VT_WATER:          (null : 0x00000000)
-     VT_AIR:            (null : 0x00000000)
+    GetName():          (null : 0x00000000)
     GetMaxSpeed():      -1
     GetPrice():         -1
     GetMaxLength():     -1
     GetMinLength():     -1
   Bridge 11
     IsValidBridge():    false
-    GetName():
-     VT_RAIL:           (null : 0x00000000)
-     VT_ROAD:           (null : 0x00000000)
-     VT_WATER:          (null : 0x00000000)
-     VT_AIR:            (null : 0x00000000)
+    GetName():          (null : 0x00000000)
     GetMaxSpeed():      -1
     GetPrice():         -1
     GetMaxLength():     -1
     GetMinLength():     -1
   Bridge 12
     IsValidBridge():    false
-    GetName():
-     VT_RAIL:           (null : 0x00000000)
-     VT_ROAD:           (null : 0x00000000)
-     VT_WATER:          (null : 0x00000000)
-     VT_AIR:            (null : 0x00000000)
+    GetName():          (null : 0x00000000)
     GetMaxSpeed():      -1
     GetPrice():         -1
     GetMaxLength():     -1
     GetMinLength():     -1
   Bridge 13
     IsValidBridge():    false
-    GetName():
-     VT_RAIL:           (null : 0x00000000)
-     VT_ROAD:           (null : 0x00000000)
-     VT_WATER:          (null : 0x00000000)
-     VT_AIR:            (null : 0x00000000)
+    GetName():          (null : 0x00000000)
     GetMaxSpeed():      -1
     GetPrice():         -1
     GetMaxLength():     -1
@@ -1352,7 +1292,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetRunningCost():   820
     GetPower():         300
     GetWeight():        47
-    GetMaxTractiveEffort(): 136
+    GetMaxTractiveEffort(): 139
     GetVehicleType():   0
     GetRailType():      0
     GetRoadType():      -1
@@ -1496,7 +1436,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetRunningCost():   1968
     GetPower():         1000
     GetWeight():        131
-    GetMaxTractiveEffort(): 381
+    GetMaxTractiveEffort(): 388
     GetVehicleType():   0
     GetRailType():      0
     GetRoadType():      -1
@@ -1514,7 +1454,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
     GetRunningCost():   2296
     GetPower():         1200
     GetWeight():        162
-    GetMaxTractiveEffort(): 471
+    GetMaxTractiveEffort(): 480
     GetVehicleType():   0
     GetRailType():      0
     GetRoadType():      -1
@@ -7313,7 +7253,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
   IsBuoyTile():         false
   IsLockTile():         false
   IsCanalTile():        false
-  GetBankBalance():     479664
+  GetBankBalance():     479851
   BuildWaterDepot():    true
   BuildDock():          true
   BuildBuoy():          true
@@ -7326,7 +7266,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
   IsBuoyTile():         true
   IsLockTile():         true
   IsCanalTile():        true
-  GetBankBalance():     465070
+  GetBankBalance():     465257
 
 --AIWaypointList(BUOY)--
   Count():             1
@@ -7345,7 +7285,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
   IsBuoyTile():         false
   IsLockTile():         false
   IsCanalTile():        false
-  GetBankBalance():     459675
+  GetBankBalance():     459862
   BuildWaterDepot():    true
   BuildDock():          true
 
@@ -7394,35 +7334,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     HasTransportType():            true
     HasTransportType():            false
     RemoveRail():                  true
-    HasTransportType():            false
-    HasTransportType():            false
-    BuildRailTrack():              true
-    RemoveRailTrack():             false
-    RemoveRailTrack():             true
-    BuildRail():                   true
-    HasTransportType():            true
-    HasTransportType():            false
-    RemoveRail():                  true
-    HasTransportType():            true
-    HasTransportType():            false
-    BuildRailTrack():              true
-    HasTransportType():            true
-    HasTransportType():            true
-    RemoveRail():                  true
-    HasTransportType():            false
-    HasTransportType():            false
-    BuildRailTrack():              false
-    BuildRailTrack():              false
-    BuildRailTrack():              true
-    BuildRailTrack():              true
-    BuildRailTrack():              false
-    DemolishTile():                true
-    BuildRailTrack():              true
-    BuildRailTrack():              false
-    BuildRailTrack():              false
-    BuildRailTrack():              false
-    DemolishTile():                true
-    BuildRailTrack():              true
   Depot
     IsRailTile():                  false
     BuildRailDepot():              false
@@ -7451,30 +7362,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
     IsRailStationTile():           false
     IsRailStationTile():           false
     IsRailStationTile():           false
-  Waypoint
-    BuildRailTrack():              true
-    BuildRailTrack():              true
-    BuildRailTrack():              true
-    BuildRailWaypoint():           false
-    BuildRailWaypoint():           true
-    BuildRailWaypoint():           true
-    BuildRailWaypoint():           false
-    IsRailWaypointTile():          false
-    IsRailWaypointTile():          true
-    IsRailWaypointTile():          true
-    IsRailWaypointTile():          false
-    RemoveRailWaypointTileRectangle():true
-    RemoveRailWaypointTileRectangle():true
-    IsRailWaypointTile():          false
-    IsRailWaypointTile():          false
-    IsRailWaypointTile():          false
-    IsRailWaypointTile():          false
-    HasTransportType():            false
-    HasTransportType():            false
-    HasTransportType():            true
-    HasTransportType():            true
-    DemolishTile():                true
-    DemolishTile():                true
 
 --RailTypeList--
   Count():             1
@@ -7598,9 +7485,12 @@ ERROR: IsEnd() is invalid as Begin() is never called
   GetName(0):               Look, a station
   GetLocation(1):           29253
   GetLocation(1000):        -1
-  GetStationID(33411):      6
+  GetStationID(33411):      4
   GetStationID(34411):      65535
-  GetStationID(33411):      6
+  GetCargoWaiting(0, 0):    0
+  GetCargoWaiting(1000, 0): -1
+  GetCargoWaiting(0, 1000): -1
+  GetStationID(33411):      4
   HasRoadType(3, TRAM):     false
   HasRoadType(3, ROAD):     false
   HasRoadType(33411, TRAM): false
@@ -7614,81 +7504,17 @@ ERROR: IsEnd() is invalid as Begin() is never called
   GetNearestTown():         65535
   GetNearestTown():         10
 
---CargoWaiting--
-  GetCargoWaiting(0, 0): 0
-  GetCargoWaitingFrom(0, 0, 0): 0
-  GetCargoWaitingVia(0, 0, 0): 0
-  GetCargoWaitingFromVia(0, 0, 0, 0): 0
-  GetCargoWaitingFromVia(0, 0, 1000, 0): -1
-  GetCargoWaitingFrom(0, 1000, 0): -1
-  GetCargoWaitingVia(0, 1000, 0): -1
-  GetCargoWaitingFromVia(0, 1000, 0, 0): -1
-  GetCargoWaitingFromVia(0, 1000, 1000, 0): -1
-  GetCargoWaiting(1000, 0): -1
-  GetCargoWaitingFrom(1000, 0, 0): -1
-  GetCargoWaitingVia(1000, 0, 0): -1
-  GetCargoWaitingFromVia(1000, 0, 0, 0): -1
-  GetCargoWaitingFromVia(1000, 0, 1000, 0): -1
-  GetCargoWaitingFrom(1000, 1000, 0): -1
-  GetCargoWaitingVia(1000, 1000, 0): -1
-  GetCargoWaitingFromVia(1000, 1000, 0, 0): -1
-  GetCargoWaitingFromVia(1000, 1000, 1000, 0): -1
-  GetCargoWaiting(0, 1000): -1
-  GetCargoWaitingFrom(0, 0, 1000): -1
-  GetCargoWaitingVia(0, 0, 1000): -1
-  GetCargoWaitingFromVia(0, 0, 0, 1000): -1
-  GetCargoWaitingFromVia(0, 0, 1000, 1000): -1
-  GetCargoWaitingFrom(0, 1000, 1000): -1
-  GetCargoWaitingVia(0, 1000, 1000): -1
-  GetCargoWaitingFromVia(0, 1000, 0, 1000): -1
-  GetCargoWaitingFromVia(0, 1000, 1000, 1000): -1
-  GetCargoWaiting(1000, 1000): -1
-  GetCargoWaitingFrom(1000, 0, 1000): -1
-  GetCargoWaitingVia(1000, 0, 1000): -1
-  GetCargoWaitingFromVia(1000, 0, 0, 1000): -1
-  GetCargoWaitingFromVia(1000, 0, 1000, 1000): -1
-  GetCargoWaitingFrom(1000, 1000, 1000): -1
-  GetCargoWaitingVia(1000, 1000, 1000): -1
-  GetCargoWaitingFromVia(1000, 1000, 0, 1000): -1
-  GetCargoWaitingFromVia(1000, 1000, 1000, 1000): -1
-
---CargoPlanned--
-  GetCargoPlanned(0, 0): 0
-  GetCargoPlannedFrom(0, 0, 0): 0
-  GetCargoPlannedVia(0, 0, 0): 0
-  GetCargoPlannedFromVia(0, 0, 0, 0): 0
-  GetCargoPlannedFromVia(0, 0, 1000, 0): -1
-  GetCargoPlannedFrom(0, 1000, 0): -1
-  GetCargoPlannedVia(0, 1000, 0): -1
-  GetCargoPlannedFromVia(0, 1000, 0, 0): -1
-  GetCargoPlannedFromVia(0, 1000, 1000, 0): -1
-  GetCargoPlanned(1000, 0): -1
-  GetCargoPlannedFrom(1000, 0, 0): -1
-  GetCargoPlannedVia(1000, 0, 0): -1
-  GetCargoPlannedFromVia(1000, 0, 0, 0): -1
-  GetCargoPlannedFromVia(1000, 0, 1000, 0): -1
-  GetCargoPlannedFrom(1000, 1000, 0): -1
-  GetCargoPlannedVia(1000, 1000, 0): -1
-  GetCargoPlannedFromVia(1000, 1000, 0, 0): -1
-  GetCargoPlannedFromVia(1000, 1000, 1000, 0): -1
-  GetCargoPlanned(0, 1000): -1
-  GetCargoPlannedFrom(0, 0, 1000): -1
-  GetCargoPlannedVia(0, 0, 1000): -1
-  GetCargoPlannedFromVia(0, 0, 0, 1000): -1
-  GetCargoPlannedFromVia(0, 0, 1000, 1000): -1
-  GetCargoPlannedFrom(0, 1000, 1000): -1
-  GetCargoPlannedVia(0, 1000, 1000): -1
-  GetCargoPlannedFromVia(0, 1000, 0, 1000): -1
-  GetCargoPlannedFromVia(0, 1000, 1000, 1000): -1
-  GetCargoPlanned(1000, 1000): -1
-  GetCargoPlannedFrom(1000, 0, 1000): -1
-  GetCargoPlannedVia(1000, 0, 1000): -1
-  GetCargoPlannedFromVia(1000, 0, 0, 1000): -1
-  GetCargoPlannedFromVia(1000, 0, 1000, 1000): -1
-  GetCargoPlannedFrom(1000, 1000, 1000): -1
-  GetCargoPlannedVia(1000, 1000, 1000): -1
-  GetCargoPlannedFromVia(1000, 1000, 0, 1000): -1
-  GetCargoPlannedFromVia(1000, 1000, 1000, 1000): -1
+--StationList--
+  Count():             2
+  Location ListDump:
+    5 => 33421
+    4 => 33411
+  CargoWaiting(0) ListDump:
+    5 => 0
+    4 => 0
+  CargoWaiting(1) ListDump:
+    5 => 0
+    4 => 0
 
 --Tile--
   HasTreeOnTile():      false
@@ -8534,8 +8360,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
     19693 => 8
 
 --TileList_IndustryProducing--
-  Count():             90
+  Count():             92
   Location ListDump:
+    46920 => 1
     46919 => 1
     46918 => 1
     46917 => 1
@@ -8544,6 +8371,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
     46914 => 1
     46913 => 1
     46912 => 1
+    46911 => 1
     46664 => 1
     46663 => 1
     46662 => 1
@@ -9115,9 +8943,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
   BuildVehicle():       17
   BuildVehicle():       18
   BuildVehicle():       19
-  IsValidVehicle(17):   true
-  IsValidVehicle(18):   true
-  IsValidVehicle(19):   false
   MoveWagonChain():     true
   GetNumWagons():       3
   GetLength():          24
@@ -9129,18 +8954,6 @@ ERROR: IsEnd() is invalid as Begin() is never called
   GetWagonAge():        0
   GetWagonEngineType(): 65535
   GetWagonAge():        -1
-  --Refit--
-    GetBuildWithRefitCapacity(): -1
-    GetBuildWithRefitCapacity(): 0
-    GetBuildWithRefitCapacity(): 160
-    BuildVehicleWithRefit():     20
-    GetCapacity():               160
-    GetCapacity():               0
-    GetRefitCapacity():          160
-    RefitVehicle():              true
-    GetCapacity():               0
-    GetCapacity():               160
-    SellVehicle():               true
   --Errors--
     RefitVehicle():        false
     GetLastErrorString():  ERR_VEHICLE_NOT_IN_DEPOT
@@ -9188,7 +9001,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
     13 => 5489
     12 => 5489
   CurrentSpeed ListDump:
-    12 => 27
+    12 => 21
     17 => 0
     16 => 0
     14 => 0
@@ -9293,6 +9106,30 @@ ERROR: IsEnd() is invalid as Begin() is never called
   SetStopLocation():     true
   GetStopLocation():     1
 
+--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
+
 --VehicleList_Station--
   Count():             1
   Location ListDump:

bin/ai/regression/regression_info.nut

@@ -1,10 +1,12 @@
+/* $Id$ */
+
 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.10"; }
+	function GetAPIVersion()  { return "1.3"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }

bin/ai/regression/require.nut

@@ -1,2 +1,4 @@
+/* $Id$ */
+
 print("  Required this file");
 

bin/ai/regression/run.sh

@@ -1,10 +1,15 @@
 #!/bin/sh
 
-if ! [ -f ai/regression/run.sh ]; then
+# $Id$
+
+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
@@ -17,53 +22,34 @@ 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 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: \[.*\]' > 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"
+		ret=1
 	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
 
+if [ "$1" != "-k" ]; then
+	rm -f tmp.regression
+fi
+
 exit $ret

bin/ai/regression/run.vbs

@@ -1,152 +0,0 @@
-Option Explicit
-
-' 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,214 +0,0 @@
-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/baseset/no_music.obm

@@ -0,0 +1,97 @@
+; $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.be_BY = "Пусты" набор музычнага афармлення, які не зьмяшчае ніякай музыкі.
+description.bg_BG = Празен музикален пакет.
+description.ca_ES = Un joc de música sense cap música.
+description.cs_CZ = Prázná hudební sada.
+description.cy_GB = Pecyn cerddoriaeth heb unrhyw gerddoriaeth ynddo.
+description.da_DK = En musikpakke uden musik.
+description.de_DE = Ein Musikset ohne Musik.
+description.el_GR = Ένα πάκετο μουσικής χωρίς πραγματική μουσική.
+description.en_AU = 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_EE = Muusikakogu ilma muusikata.
+description.fi_FI = Musiikkipaketti, jossa ei ole musiikkia.
+description.fr_FR = Un pack de musiques sans musiques.
+description.gd_GB = Pacaid ciùil anns nach eil fonn sam bith.
+description.gl_ES = Un conxunto de músicas sen ningunha música.
+description.hr_HR = Muzički paket bez ikakve muzike.
+description.hu_HU = Zenei alapcsomag zene nélkül.
+description.id_ID = Paket musik tanpa musik sungguhan.
+description.is_IS = Tónlistarpakki sem er í raun án tónlistar.
+description.it_IT = Un pacchetto musicale non contenente alcuna musica.
+description.ja_JP = 空の音楽パック
+description.ko_KR = 실제 음악이 없는 음악 목록입니다.
+description.lb_LU = E Musikpack ouni aktuell Musik.
+description.lt_LT = Muzikos pakas be muzikos.
+description.lv_LV = Mūzikas kopa bez mūzikas
+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_BR = Um pacote de músicas sem músicas.
+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_SI = Glasbeni paket z vključeno glasbo.
+description.sr_RS = Prazan skup muzičkih numera.
+description.sv_SE = Ett musikpaket utan någon musik.
+description.ta_IN = இசை இல்லாத இசைத்தொகுப்பு.
+description.th_TH = ชุดเพลงประกอบแบบไม่มีเสียงเพลง
+description.tr_TR = Müzik içermeyen boş bir müzik paketi.
+description.uk_UA = Порожній набір музики.
+description.vi_VN = Gói âm nhạc này không có nhạc nào.
+description.zh_CN = 一个没有实际内容的音乐包.
+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/baseset/no_sound.obs

@@ -0,0 +1,65 @@
+; $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.be_BY = "Пусты" набор гукавога афармленьня, які не зьмяшчае ніякіх гукаў.
+description.bg_BG = Празен звуков пакет.
+description.ca_ES = Un joc de sons sense cap so.
+description.cs_CZ = Prázdná sada zvuků.
+description.cy_GB = Pecyn sain heb unrhyw effeithiau sain ynddo.
+description.da_DK = En lydpakke uden lyde.
+description.de_DE = Basissounds ohne Sound.
+description.el_GR = Ένα πάκετο ήχων χώρις ήχους.
+description.en_AU = 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_EE = Helikogu ilma helideta.
+description.eu_ES = Soinurik gabeko soinu pakete bat
+description.fi_FI = Äänipaketti, jossa ei ole ääniä.
+description.fr_FR = Un pack de sons sans sons.
+description.gd_GB = Pacaid fhuaimean anns nach eil fuaim sam bith.
+description.gl_ES = Un conxunto de sons sen ningún son
+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 suara apapun.
+description.is_IS = Hljóðpakki án hljóðs.
+description.it_IT = Un pacchetto sonoro non contenente alcun suono.
+description.ja_JP = 空の効果音パック
+description.ko_KR = 아무런 효과음도 없는 효과음 팩입니다.
+description.lb_LU = En Soundpack mat all den Sounds.
+description.lt_LT = Garsų pakas be jokių garsų.
+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_BR = Um pacote de sons sem sons.
+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_SI = Zvočni paket brez zvoka.
+description.sr_RS = Prazan skup zvukova.
+description.sv_SE = Ett ljudpaket utan några ljud.
+description.ta_IN = ஒலிகள் இல்லாத ஒலி தொகுப்பு.
+description.th_TH = ชุดเสียงแบบไร้เสียง
+description.tr_TR = Ses içermeyen boş bir ses kümesi.
+description.uk_UA = Порожній набір звуків.
+description.vi_VN = Gói âm thanh này không có âm thanh nào.
+description.zh_CN = 一个空的音效包.
+description.zh_TW = 不含任何音效的音效集。
+
+[files]
+samples      =
+
+[md5s]
+
+[origin]
+default      = This file was part of your OpenTTD installation.

bin/baseset/orig_dos.obg

@@ -0,0 +1,77 @@
+; $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.be_BY = Арыґінальная ґрафіка з Transport Tycoon Deluxe для DOS.
+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.cy_GB = Graffeg gwreiddiol fersiwn DOS o Transport Tycoon Deluxe.
+description.da_DK = 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_AU = 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_EE = Algse Transport Tycoon Deluxe DOSi versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxen DOS-version grafiikat.
+description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS).
+description.gd_GB = Grafaigeachd aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe.
+description.gl_ES = Graficos da edición orixinal de Transport Tycoon Deluxe para 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.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe DOS útgáfunni.
+description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione DOS.
+description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (DOS)
+description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에디션의 그래픽입니다.
+description.lb_LU = Original Transport Tycoon Deluxe DOS Editioun Grafik.
+description.lt_LT = Originali Transport Tycoon Deluxe DOS leidimo grafika.
+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_BR = Gráficos Originais do Transport Tycoon Deluxe, Edição 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_SI = 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.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS பதிப்பு அசைவூட்டங்கள்.
+description.th_TH = กราฟฟิกต้นตำหรับของ Transport Tycoon Deluxe DOS edition
+description.tr_TR = Özgün Transport Tycoon Deluxe DOS sürümü grafikleri.
+description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe DOS edition.
+description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên DOS
+description.zh_CN = 运输大亨DOS豪华版原版图形包.
+description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版的圖形。
+
+[files]
+base         = TRG1.GRF
+logos        = TRGI.GRF
+arctic       = TRGC.GRF
+tropical     = TRGH.GRF
+toyland      = TRGT.GRF
+extra        = OPENTTD.GRF
+
+[md5s]
+TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
+OPENTTD.GRF  = 75a93cea2ed455c2fd5dcbda39e53538
+
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTD.GRF  = This file was part of your OpenTTD installation.

bin/baseset/orig_dos.obs

@@ -0,0 +1,65 @@
+; $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.be_BY = Арыґінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для DOS.
+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.cy_GB = Effeithiau sain gwreiddiol fersiwn DOS o Transport Tycoon Deluxe.
+description.da_DK = 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_AU = 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_EE = Algse Transport Tycoon Deluxe DOSi versiooni helid.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxen DOS-version äänet.
+description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version DOS).
+description.gd_GB = Fuaimean aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe.
+description.gl_ES = Sons da edición orixinal de Transport Tycoon Deluxe para DOS.
+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.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi DOS.
+description.is_IS = Upprunalega hljóðið úr Transport Tycoon Deluxe DOS útgáfunni.
+description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione DOS.
+description.ja_JP = Transport Tycoon Deluxe オリジナル版 効果音 (DOS)
+description.ko_KR = 오리지널 트랜스포트 타이쿤 도스 에디션의 효과음입니다.
+description.lb_LU = Original Transport Tycoon Deluxe DOS Editioun Sound.
+description.lt_LT = Originalūs Transport Tycoon Deluxe DOS leidimo garsai.
+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_BR = Sons Originais do Transport Tycoon Deluxe, Edição 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_SI = 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.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS பதிப்பு ஒலிகள்.
+description.th_TH = เสียงต้นตำหรับของ Transport Tycoon Deluxe DOS edition
+description.tr_TR = Özgün Transport Tycoon Deluxe DOS sürümü sesleri.
+description.uk_UA = Оригінальний набір звуків з Transport Tycoon Deluxe DOS edition.
+description.vi_VN = Âm thanh gốc từ phiên bản Transport Tycoon Deluxe trên DOS
+description.zh_CN = 运输大亨DOS豪华版原版音效包.
+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/baseset/orig_dos_de.obg

@@ -0,0 +1,77 @@
+; $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.be_BY = Арыґінальная ґрафіка зь нямецкай версіі Transport Tycoon Deluxe для DOS.
+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.cy_GB = Graffeg gwreiddiol fersiwn DOS (Almaenig) o Transport Tycoon Deluxe.
+description.da_DK = 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_AU = 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_EE = Algse Transport Tycoon Deluxe DOSi (Saksa) versiooni graafika.
+description.fi_FI = Alkuperäiset Saksassa julkaistun Transport Tycoon Deluxen DOS-version grafiikat.
+description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS allemande).
+description.gd_GB = Grafaigeachd aig an deasachadh DOS (Gearmailteach) tùsail aig Transport Tycoon Deluxe.
+description.gl_ES = Graficos da edición orixinal (alemá) de Transport Tycoon Deluxe para DOS.
+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.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe DOS (þýsku) útgáfunni.
+description.it_IT = Grafica originale di Transport Tycoon Deluxe (tedesco), edizione DOS.
+description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (DOS・ドイツ版)
+description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에디션(독일)의 그래픽입니다.
+description.lb_LU = Original Transport Tycoon Deluxe DOS (Däitsch) Editioun Grafik.
+description.lt_LT = Originali Transport Tycoon Deluxe DOS (Vokiečių) leidimo grafika.
+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_BR = Gráficos Originais do Transport Tycoon Deluxe, Edição DOS alemã.
+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_SI = 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.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் DOS (செருமன்) பதிப்பு அசைவூட்டங்கள்.
+description.th_TH = กราฟฟิกต้นตำหรับของ Transport Tycoon Deluxe DOS (German) edition
+description.tr_TR = Özgün Transport Tycoon Deluxe DOS (Almanca) sürümü grafikleri.
+description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe DOS edition (німецького).
+description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên DOS (tiếng Đức)
+description.zh_CN = 运输大亨DOS豪华德语版原版图形包.
+description.zh_TW = 原版 Transport Tycoon Deluxe DOS 版 (德國版) 的圖形。
+
+[files]
+base         = TRG1.GRF
+logos        = TRGI.GRF
+arctic       = TRGC.GRF
+tropical     = TRGH.GRF
+toyland      = TRGT.GRF
+extra        = OPENTTD.GRF
+
+[md5s]
+TRG1.GRF     = 9311676280e5b14077a8ee41c1b42192
+TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
+TRGC.GRF     = ed446637e034104c5559b32c18afe78d
+TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
+TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
+OPENTTD.GRF  = 75a93cea2ed455c2fd5dcbda39e53538
+
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTD.GRF  = This file was part of your OpenTTD installation.

bin/baseset/orig_win.obg

@@ -0,0 +1,77 @@
+; $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.be_BY = Арыґінальная ґрафіка з Transport Tycoon Deluxe для Windows.
+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.cy_GB = Graffeg gwreiddiol fersiwn Windows o Transport Tycoon Deluxe.
+description.da_DK = 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_AU = 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_EE = Algse Transport Tycoon Deluxe Windowsi versiooni graafika.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxen Windows-version grafiikat.
+description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version Windows).
+description.gd_GB = Grafaigeachd aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
+description.gl_ES = Graficos da edición orixinal de Transport Tycoon Deluxe para 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.is_IS = Upprunalega grafíkin úr Transport Tycoon Deluxe Windows útgáfunni.
+description.it_IT = Grafica originale di Transport Tycoon Deluxe, edizione Windows.
+description.ja_JP = Transport Tycoon Deluxe オリジナル版 グラフィック (Windows)
+description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 그래픽입니다.
+description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Grafik.
+description.lt_LT = Originali Transport Tycoon Deluxe Windows leidimo grafika.
+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_BR = Gráficos Originais do Transport Tycoon, Edição 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_SI = 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.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு அசைவூட்டங்கள்.
+description.th_TH = กราฟฟิกต้ำตำหรับของ Transport Tycoon Deluxe Windows edition
+description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü grafikleri.
+description.uk_UA = Оригінальна графіка з Transport Tycoon Deluxe Windows edition.
+description.vi_VN = Đồ họa gốc từ phiên bản Transport Tycoon Deluxe trên Windows
+description.zh_CN = 运输大亨Windows豪华版原版图形包.
+description.zh_TW = 原版 Transport Tycoon Deluxe Windows 版的圖形。
+
+[files]
+base         = TRG1R.GRF
+logos        = TRGIR.GRF
+arctic       = TRGCR.GRF
+tropical     = TRGHR.GRF
+toyland      = TRGTR.GRF
+extra        = OPENTTD.GRF
+
+[md5s]
+TRG1R.GRF    = b04ce593d8c5016e07473a743d7d3358
+TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
+TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
+TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
+TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
+OPENTTD.GRF  = 75a93cea2ed455c2fd5dcbda39e53538
+
+[origin]
+default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
+OPENTTD.GRF  = This file was part of your OpenTTD installation.

bin/baseset/orig_win.obm

@@ -0,0 +1,141 @@
+; $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.be_BY = Арыґінальны набор музычнага афармленьня з гульні Transport Tycoon Deluxe для Windows.
+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.cy_GB = Cerddoriaeth gwreiddiol fersion Windows o Transport Tycoon Deluxe.
+description.da_DK = 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_AU = 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_EE = Algse Transport Tycoon Deluxe Windowsi versiooni muusika.
+description.fi_FI = Alkuperäinen Transport Tycoon Deluxen Windows-version musiikki.
+description.fr_FR = Musiques originales de Transport Tycoon Deluxe (version Windows).
+description.gd_GB = Ceòl aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
+description.gl_ES = Música da edición orixinal de Transport Tycoon Deluxe para 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.is_IS = Upprunalega tónlistin úr Transport Tycoon Deluxe Windows útgáfunni.
+description.it_IT = Musica originale di Transport Tycoon Deluxe, edizione Windows.
+description.ja_JP = Transport Tycoon Deluxe オリジナル版 音楽 (Windows)
+description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 음악입니다.
+description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Music.
+description.lt_LT = Originali Transport Tycoon Deluxe Windows leidimo muzika.
+description.lv_LV = Oriģinālā Transport Tycoon Deluxe Windows izdevuma mūzika.
+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_BR = Música Original do Transport Tycoon Deluxe, Edição 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 для Windows.
+description.sk_SK = Pôvodná hudba z Transport Tycoon Deluxe (Windows).
+description.sl_SI = 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.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு இசை.
+description.th_TH = เพลงต้นตำหรับชอง Transport Tycoon Deluxe Windows edition
+description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü müzikleri.
+description.uk_UA = Оригінальна музика з Transport Tycoon Deluxe Windows edition.
+description.vi_VN = Nhạc gốc từ phiên bản Transport Tycoon Deluxe trên Windows
+description.zh_CN = Transport Tycoon Deluxe（运输大亨Windows豪华版）的原版音乐包
+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.

bin/baseset/orig_win.obs

@@ -0,0 +1,65 @@
+; $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.be_BY = Арыґінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для Windows.
+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.cy_GB = Effeithiau sain gwreiddiol fersiwn Windows o Transport Tycoon Deluxe.
+description.da_DK = 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_AU = 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_EE = Algse Transport Tycoon Deluxe Windowsi versiooni helid.
+description.fi_FI = Alkuperäiset Transport Tycoon Deluxen Windows-version äänet.
+description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version Windows).
+description.gd_GB = Fuaimean aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
+description.gl_ES = Sons da edición orixinal de Transport Tycoon Deluxe para Windows.
+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.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi Windows.
+description.is_IS = Upprunalega hljóðið úr Transport Tycoon Deluxe Windows útgáfunni.
+description.it_IT = Suoni originali di Transport Tycoon Deluxe, edizione Windows.
+description.ja_JP = Transport Tycoon Deluxe オリジナル版 効果音 (Windows)
+description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에디션의 효과음입니다.
+description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Sound.
+description.lt_LT = Originalūs Transport Tycoon Deluxe Windows leidimo garsai.
+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_BR = Sons Originais do Transport Tycoon Deluxe, Edição 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_SI = 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.ta_IN = அசல் டிரான்ஸ்ஃபோர்ட் டைகூன் டீலக்ஸ் விண்டோஸ் பதிப்பு ஒலிகள்.
+description.th_TH = เสียงต้นตำหรับของ Transport Tycoon Deluxe Windows edition
+description.tr_TR = Özgün Transport Tycoon Deluxe Windows sürümü sesleri.
+description.uk_UA = Оригінальний набір звуків з Transport Tycoon Deluxe Windows edition.
+description.vi_VN = Âm thanh gốc từ phiên bản Transport Tycoon Deluxe trên Windows
+description.zh_CN = Transport Tycoon Deluxe Windows (运输大亨Windows豪华版)的原版音效包.
+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.10.nut

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

bin/game/compat_1.2.nut

@@ -1,3 +1,5 @@
+/* $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.
@@ -5,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/>.
  */
 
-GSLog.Info("1.2 API compatibility in effect.");
+GSLog.Info("1.2 API compatability in effect.");
 
 GSTown._SetGrowthRate <- GSTown.SetGrowthRate;
 GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
@@ -14,17 +16,3 @@ GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
 	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,3 +1,5 @@
+/* $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.
@@ -5,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/>.
  */
 
-GSLog.Info("1.3 API compatibility in effect.");
+GSLog.Info("1.3 API compatability in effect.");
 
 GSTown._SetGrowthRate <- GSTown.SetGrowthRate;
 GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
@@ -14,17 +16,3 @@ GSTown.SetGrowthRate <- function(town_id, days_between_town_growth)
 	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,22 +1,8 @@
+/* $Id: compat_1.3.nut 24469 2012-08-13 19:33:17Z yexo $ */
+
 /*
  * 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,15 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-GSLog.Info("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,15 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-GSLog.Info("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,15 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-GSLog.Info("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,15 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-GSLog.Info("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 @@
-/*
- * 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.9 API compatibility in effect.");

changelog.txt

@@ -1,762 +1,3 @@
-1.10.3 (2020-08-09)
-------------------------------------------------------------------------
-Change: Also make roadside trees match the tree transparency option (#8245)
-Fix: Center text and icons in the status bar vertically (#8273)
-Fix: [NRT] Set invalid road and tram types for rail tunnel ends (#8269)
-Fix #7980: Properly invalidate mouse-over station coverage highlight (#8263)
-Fix #8250: [NRT] Company infrastructure window always omits last road/tramtype (#8251)
-Fix #8162: [NRT] Improve error message when converting town owned road (#8247)
-Fix #8216: Don't show floating text on autoreplace if cost is 0 (#8244)
-Fix #8129: Crash if a news message expires while viewing the endgame screen (#8243)
-Fix #8221: Use more specific error message when a bridge is too long (#8240)
-Fix #8230: Resolve ".." when opening files in .tar (#8231)
-Fix: A few race conditions in netcode (#8227, #8228, #8229)
-Fix #7838: Crash relating to group creation and renaming (#8223)
-Fix #8104: [SDL2] Fix window resizability when going from fullscreen to windowed mode (#8211)
-Fix: Display banlist's indexes correctly (#8209)
-Fix: Possible desync with subsidy creation (#8159)
-Fix #8131: Draw small bridges pillars in more places (#8149)
-
-
-1.10.2 (2020-06-01)
-------------------------------------------------------------------------
-Add: Ubuntu 20.04 packages (#8127)
-Fix: [OSX] Possible crash on failure to set colourspace (#8181)
-Fix #8166: Prevent crash from a NewGRF with an invalid RoadType (#8180)
-Fix #8024: Make Online Content GUI more responsive while loading (#8179)
-Fix #7970: Disable event loop when generating crash dump (#8176)
-Fix: [Build] Compatibility with modern Visual Studio (#8170)
-Fix: Trees would disappear completely after a few years if tree spread was disabled (#8160)
-Fix #8155: Roadtype speed limit in scenario editor toolbar dropdown was doubled (#8156)
-Fix: Desync after house replacement (#8151)
-Fix #8137: New clients can't join (desync) after funding an industry (#8140)
-Fix #8132: Corrupted savegame with station with multiple owners caused a crash (#8134, #8142)
-Fix: Stop gamelog when recovering from a savegame load error (#8133)
-Fix: Exceptionally unlikely issue when reading MIDI files (#8125)
-Fix #8119: Docking areas were not properly updated when clearing, causing desyncs (#8124, #8130)
-Fix #8117: Memory leak for incoming admin port packets (#8122)
-Fix: Non-roadbridges potentially had roadtype information set (#8111)
-Fix #8108: Possible crash on loading TTD savegames with phantom oil rigs (#8109, #8110)
-Fix #8093: Build & refit test run changed game state and could cause desyncs (#8103)
-Fix: [Script] AreWaterTilesConnected did not handle aqueducts properly (#8074)
-
-
-1.10.1 (2020-04-13)
-------------------------------------------------------------------------
-Fix #8081: Crash when placing a ship depot next to a dock (#8082)
-Fix: [GS] A Goal's QuestionID was getting truncated (#8072)
-Fix #8064: Refit capacity could be displayed incorrectly in extreme edgecases (#8065)
-Fix #8060: Restore admin network API compatibility (#8061)
-Fix #8055: Crash when roadtype availability changes with the road construction toolbar open (#8058)
-
-
-1.10.0 (2020-04-01)
-------------------------------------------------------------------------
-Change: Open company window when clicking on a company goal (#8033)
-Change: [SDL2] Support pasting from clipboard on Linux (#8004)
-Fix: [Script] Random deviation upper bound range should be inclusive (#8052)
-Fix #8043: Incorrect handling of global road/tram hotkeys caused a crash (#8044)
-Fix #8039: [Script] SetOrderFlags and GetOrderDestination didn't work for oil rigs (#8040)
-Fix: [Script] CanBuildConnectedRoadPartsHere neighbours tiles were incorrect if you started a new game with a different world size (#8036)
-Fix: Ignore clicks on non-applicable global goals (#8035)
-Fix #7613: Limit News Window to 1024 messages to keep it usable and avoid overflowing scrollbars (#8026)
-Fix #7644: [OSX] Hopefully improve performance by manually set colorspace to sRGB (#8023)
-Fix #8020: Add missing docking tiles around industry neutral stations (#8021)
-Fix: GUI tramway icon only contained a single set of tram tracks (#8015)
-Fix: Station with multiple docks had the wrong tile area (#8014)
-Fix #8011: Crash when loading TTD scenario containing a dock (#8012)
-Fix #7998: Crash when scripts tried to access companies with invalid IDs (#8010)
-Fix: Crash when attempting to draw a string containing nonprintable characters (#8005)
-Fix #6399: Directory ~/.local/share not created if it didn't already exist (#8003)
-Fix #7958: Custom catenary missing on road bridges (#7991)
-Fix #7944: Demolishing locks built on rivers didn't always restore the river (#7946)
-
-
-1.10.0-RC1 (2020-02-09)
-------------------------------------------------------------------------
-Feature: Allow server to supply a reason to kicked/banned clients (#7859)
-Feature: [NewGRF] Station variable 6A, querying GRFID of nearby station tiles (#7956)
-Feature: Improved logic of sharing industry production between 3 or more stations (#7922)
-Feature: Highlight the item under mouse cursor in file browser (#7900)
-Feature: [GS] Methods to change town rating of companies (#7898)
-Feature: [NewGRF] Callback profiling command (#7868)
-Feature: Add a setting to show the name of the NewGRF of a vehicle in the build window (#7852)
-Feature: Ability to filter industry directory window by cargo (#7843)
-Feature: Minimap screenshot type (#7817)
-Feature: [GS] Methods to control engine availability of a specific company (#7791)
-Feature: Configurable game ending year (#7747)
-Feature: Separate window for taking screenshots (#7550)
-Change: Move autorenew setting to basic category (#7984)
-Change: Improved algorithm for transfer feeder payments (#7935)
-Change: Show volume sliders with wedges instead of boxy slider (#7902)
-Change: Auto-restart loads the original resources (e.g. save or scenario) again (#7688)
-Change: Improve readability of integer lists saved to config files (#7396)
-Fix #7976: Crash when attempting to kick the host via rcon (#7985)
-Fix #7592: Road vehicles no longer balanced between multiple road stop stations (#7979)
-Fix: Station rating effects affecting too large area (#7977)
-Fix #7974: Crash when Ctrl+click to show a collapsed vehicle group (#7975)
-Fix #7969: Crash when executing a recursive console alias (#7973)
-Fix #6566: Very long loading of the maximum "zoom out" level at high resolutions (#7968)
-Fix #7952: Crash when switching input languages (#7953)
-Fix: [OSX] Don't show a crash/assertion message box for a GUI-less video driver (#7934)
-Fix #7925: Corrupt savegames could lead to corruption of the titlegame (#7932)
-Fix: [Fluidsynth] Music notes from previous song were not properly reset (#7930)
-Fix: Invalid string usage within music window (#7928)
-Fix: Non-deterministic name sorting in industry directory window (#7915)
-Fix #7899: Various issues with town list window sorting (#7906, #7916)
-Fix #7587: Fix possible crashes when loading old save games with invalid waypoint positions (#7894)
-Fix: Avoid a crash by properly resetting timetable duration when loading old savegames (#7894)
-Fix: Possible crash when post road-works cleanup removes all road pieces (#7903)
-Fix #7891: Fix crash when loading save from 1.7.2 (#7892)
-Fix #7887: Missing sound effects for some main toolbar buttons (#7888)
-Fix #6667: Avoid confusion by also recalculating bridge costs for 'spectated' AI companies (#7884)
-Fix: Allow old NewGRF industries to hide in/out cargo slots (#7882)
-Fix: [Windows] Fix bootstrap GUI with Uniscribe but no Freetype (#7878)
-Fix: Missing keycodes for hotkeys.cfg (#7850)
-Fix #7625: Ensure road infrastructure cost is correctly updated when upgrading your own roads (#7628)
-Fix #7088: Avoid crash by closing AI/GS textfile windows when changing their in-game slot (#7094)
-
-
-1.10.0-beta2 (2019-12-25)
-------------------------------------------------------------------------
-- Feature: [Script] More error mappings (#7857)
-- Feature: Ctrl+Click on a vehicle in the vehicle group window selects and scrolls to the vehicle's group (#7800)
-- Feature: Ctrl+Click on the vehicle details button in the vehicle view window opens the vehicle group window focused on the vehicle (#7800)
-- Feature: Add a button to the vehicle advisory news window to open the vehicle's group window (#7800)
-- Feature: Ctrl+Click on a vehicle in the vehicle list window opens the vehicle group window focused on the vehicle's group (#7800)
-- Fix: Custom sea level default value is now equal to minimum value (#7866)
-- Fix: [NewGRF] Various tracktype fixes (#7863)
-- Fix: Infrastructure total update when removing tram road stop (#7856)
-- Fix #7847: Use ViewportSign coordinates for sign Kdtree coordinates (#7849)
-- Fix #7836: Check coherency of NewGRF parameter min/max (#7840)
-- Fix #7673: [Script] Allow removal of custom town text (#7834)
-- Fix: Crash when displaying an error message at map edges (#7833)
-- Fix #7783, #7816: [SDL2] Fix input handling in edit context (#7825)
-- Fix #7697: Tile query on HQs did not display cargo correctly (#7824)
-- Fix #7820: Possible game crash when removing oil rig (#7821)
-- Fix #7606: Rare crash when trying to clean up a crashed script (#7819)
-- Fix #7784: [SDL2] up/down/home/end key behaviour (#7815)
-- Fix #7631: 16 out cargo support for industry directory (#7809)
-- Fix #7646: Crash on random map generation failure (#7805)
-- Fix #7430: Only reset time since pickup when train visits station if it has room to load (#7595)
-- Fix #5405: Aircraft could route to depots outside their range (#7104)
-
-
-1.10.0-beta1 (2019-10-29)
-------------------------------------------------------------------------
-- Feature: Configurable minimum age for companies before allowing share trading (#7780)
-- Feature: Filter on town list window (#7621)
-- Feature: Ability to show Newspaper and Ticker messages in parallel (#7612)
-- Feature: Show coverage area for stations and towns (#7446)
-- Feature: Collapsible vehicle groups (#7417)
-- Feature: More flexible docks - can now have multiple per station, ships can use any part of dock (#7380)
-- Feature: [NewGRF] Railtype flags to allow/disallow 90 degree curves (#7352)
-- Feature/Change: Non-rectangular catchment area for sparse stations (#7235)
-- Feature: Improved performance for road vehicle pathfinding (#7261)
-- Feature: Option to show local authority boundary of towns (#7025)
-- Feature: Experimental method of town cargo generation that scales linearly with population (#6965)
-- Feature: [NewGRF] RoadTypes (NRT) (#6811)
-- Add: [Win32] Select MIDI device by port name (#7666)
-- Add: 'getsysdate' console command (#7658)
-- Add: Currencies NTD, CNY, HKD (#7596)
-- Add: Icons to vehicle construction drop down lists (#7358, #7485)
-- Add: Security warning to players that company passwords are not truly secure (#7351)
-- Add: [Script] Various API functions for managing vehicle groups (#7225, #7336, #7716)
-- Add: SDL2 video driver (#7086)
-- Change: Inactive industries do not make sound effects (#7752)
-- Change: [Win32] Use native GDI engine for rendering fonts (#7572)
-- Change: Scale oil refinery edge distance limit by map size (#7514)
-- Change: Do not display a news message about old vehicles when a replacement for it is activated (#7401)
-- Change: When filtering purchase list by cargo type, buy button now performs a refit if required (#7301)
-- Change: Don't apply forbid 90 deg turn settings to ships, and make penalties for turns configurable (#7289, #7372)
-- Change: Make the chance of an aeroplane crashing at an airport with a short runway independent of plane crash setting (#7302)
-- Change: Keep town growth rate in sync with house count (#6777)
-- Fix #6219: Improve helicopter's ability to takeoff from commuter and international airports (#7710)
-- Fix #6407: Show snowy ground sprites for train depots (#7671)
-- Fix: Power/running cost sorting algorithm was not correct when power was higher than running cost (#7561)
-- Fix: Tweaks to small-map colours to make dark blue company more visible (#7436, #7450)
-- Fix: [SDL] Do not offer video smaller than 640x480 (#7442)
-- Fix: Incorrect display of industry production around tiles (#7426)
-- Fix: Show industry name in Land Area Information window for industries with neutral stations instead of just 'Oil Rig' (#7349)
-- Fix: Remove redundant and broken file lookups when loading base sets (#7348)
-- Fix: Always report error when ordering a road vehicle to wrong type of road stop (#7316)
-- Fix #7043, #7274: Improve performance when creating towns during world creation (#7284)
-- Fix #7062: Remove ship max order distance (#7279)
-- Fix #7189: Fluidsynth volume gain too high (#7253)
-- Fix: Add setting for whether industries with neutral stations (e.g. Oil rigs) accept and supply cargo to/from surrounding stations to fix exploit as old as TTO (#7234)
-- Fix: Properly reset dropdown menu windows after changing AI/GS settings (#7092)
-- Remove: DOS, MorphOS, AmigaOS & BeOS support (#7326, #7388)
-- Remove: Original Path Finder (#7245)
-
-
-1.9.3 (2019-09-16)
-------------------------------------------------------------------------
-- Change: Use natural sort when sorting the file list (#7727)
-- Fix #7479: Don't close construction windows when changing client name (#7728)
-- Fix #7731: Files sorting by modification time on Windows XP (#7731)
-- Fix #7644: [OSX] Better solution for colourspace/performance issues (#7741)
-
-
-1.9.3-RC1 (2019-09-07)
-------------------------------------------------------------------------
-- Add: Can now click industries to make orders to their neutral station (e.g. oil rig) (#7709)
-- Fix #7644: [OSX] Poor framerate on certain systems (#7721)
-- Fix #7702: Highscore screen UI scaling (#7714)
-- Fix #7704: [OSX] Handle malformed UTF8 strings, leading to crashes in server browser (#7705)
-- Fix #7188: [AI] Possible crash when reloading an AI in multiplayer games (#7701, #7725)
-- Fix: RemoveAirport function now returns 'Aircraft in the way' error message when occupied (#7690)
-- Fix: Spelling in running costs setting help text (#7686)
-- Fix #7655: 'Decrease' buttons in cheat window not working properly with UI scaling (#7669)
-- Fix: [GS] Could not create elements on Storybook pages with ID > 255 (#7657)
-- Fix #7626: Allow building road stops over town-owned one-way roads, instead of crashing (#7627)
-
-
-1.9.2 (2019-07-07)
-------------------------------------------------------------------------
-- Change: Set default setting in server browser of "Advertised" to "Yes" (#7568)
-- Change: Allow building road stops over self-owned one-way/blocked road (#7547)
-- Fix #7463: Promote scroll mode setting to basic category (#7586)
-- Fix: Inconsistent GUI scaling (#7539)
-- Fix #7491: Send company update admin message when bankruptcy counter changes (#7492)
-- Fix #7553: Check bounds when loading strings (#7554)
-- Fix: Really increase the maximum number of GameScript texts to 64k (#7555)
-- Fix: Crash when attempting to load old save game with GRFs set (#7546)
-- Fix #6507: Don't try to load invalid depots from older savegames (#7546)
-- Fix: Railtype bits were moved too late, leading to rails under bridges losing their type (#7546)
-- Fix: Bounds check access to railtype_map (#7529)
-- Fix: Spurious errors when using more than 32 railtypes (#7533)
-- Fix #7633: Allow zero-cost track conversion to succeed (#7634)
-- Fix #7577: Check if linkgraph station index is valid before dereferencing (#7583)
-- Fix #7224: Drag and drop vehicle group creation does not work correctly (#7581)
-- Fix #7570: Show Github URL in the crashlog window (#7571)
-- Fix: Clicking on scrollbar 'thumb' moved position up instantly (#7549)
-- Fix #7255: Prevent crashlog corruption by only printing the 32 most recent news messages (#7542)
-- Fix #5685: Check for free wagons in ScriptVehicleList (#7617)
-- Fix: Make GSGoal.QuestionClient work correctly at least for clients with ID < 2**16 (#7560)
-- Fix #6666: Mismatched parentheses in RTL languages (#7480)
-- Fix: [Windows] Various reliability and correctness improvements to MIDI on Windows (#7620)
-
-
-1.9.1 (2019-04-08)
-------------------------------------------------------------------------
-- Fix #6564: Enforce types of arguments for station name strings (#7419)
-- Fix #7433: Don't use AirportSpec substitute if it's not enabled (#7435)
-- Fix #7447, #7466, #7476: Missing NewGRF strings due to Action 4 feature check skipping pseudo-feature 48 (#7449)
-- Fix #6222: Advanced sprite layout sometimes showed incorrect railtype ground tile. (#7460)
-- Fix #7439: CompanyRemoveReason overwritten by ClientID (#7465)
-- Fix: [Windows] Incorrect error handling could lead to cascading error windows (#7482)
-- Fix #7478: Don't remove NewGRF objects on company take-over. (#7483)
-
-
-1.9.0 (2019-04-01)
-------------------------------------------------------------------------
-- Fix #7411: Use industry production callback (if used) on initial industry cargo generation (#7412)
-
-
-1.9.0-RC2 (2019-03-24)
-------------------------------------------------------------------------
-- Fix #7400: WaterClass for tree tiles was not converted for old saves preventing industry creation (#7405)
-- Fix: Filtered file list did not scroll properly (#7402)
-- Fix #7391: Don't invalidate go to depot orders of non-aircraft when invalidating hangar orders that happen to share IDs (#7392)
-- Fix #7386: Measurement tooltip for tunnels, aqueducts & docks did not display or flickered (#7389)
-- Fix: Wrong company performance rating when money exceeds INT_MAX (#7382)
-- Fix: Permit loading of industry production callback with invalid cargo type (#7364)
-- Fix: Spelling for a few real town names (#7338)
-- Fix: Runway too short for large aircraft message should not depend on plane crashes setting (#7325)
-- Fix #7334: Ship lost after crossing bridge due to path cache not being consumed while on final bridge end (#7335)
-
-
-1.9.0-RC1 (2019-03-03)
-------------------------------------------------------------------------
-- Add: Various AI/GS functions for vehicle groups (#7225)
-- Change: Synchronise introduction date and reliability randomness across vehicles with the same base introduction date (#7147)
-- Change: Allow towns to build bridges over rails and one-way roads (#7291)
-- Fix: Detection of coast tiles with trees on them (#7309)
-- Fix: Emergency netsave saved the title game instead of the broken game in question (#7298)
-- Fix: Company livery window showed incorrect groups when opened in multiplayer (#7288)
-- Fix: Unable to select last group in open livery window (#7283)
-- Fix: Goto hangar orders were not invalidated when rebuilding airports (#7100)
-
-
-1.9.0-beta3 (2019-02-24)
-------------------------------------------------------------------------
-- Feature: Option to adjust font size separately from GUI size (#7003)
-- Feature: Increase maximum number of orders from 64000 to ~16.7m (#7220)
-- Add: Show performance of AI and GS in framerate window
-- Add: News menu entry and shortcut for deleting all messages (#7240)
-- Change: [OSX] Improved scrolling behaviour when using touchpads
-- Change: Add scrollbar to cargo legend in cargo payment rates window
-- Change: Owner of vehicle with exclusive transport rights may now load cargo from neutral stations (#7256)
-- Change: Improved UI behaviour when dragging sound volume sliders with the mouse (#7227)
-- Change: Use selected vehicle group as parent when creating a new group (#7224)
-- Change: Use SlErrorCorrupt() on pool index error when loading a savegame, instead of terminating (#7219)
-- Change: Skip reliability decay if servicing is disabled
-- Fix: Remove desert around lakes upon generation
-- Fix: Re-sorting file list did not update filtered rows
-- Fix #7159: Waiting time at red one-way signals was too short
-- Fix #7189: Fluidsynth volume gain too high
-- Fix #7004: Cargo flow legend was not properly refreshed after zooming (#7265)
-- Fix: Possibility to modify wrong AI/GS settings when switching AI/GS scripts around (#7090, #7091)
-- Fix: Use more descriptive "spectator" strings for story book and goal dropdown menus
-- Fix #6599: Disable build and rename button in build vehicle window when no vehicle is selected
-- Fix: Do not mangle tagged revision strings for network revision strings
-- Fix #7151: AI start date deviation was still applied when not set to a random AI (#7223)
-- Fix #7197: Invalidate depot buttons when necessary (#7212)
-- Doc: [AI] UnshareOrders empties the orders list of the vehicle
-
-
-1.9.0-beta2 (2019-02-09)
-------------------------------------------------------------------------
-- Fix: Non-Windows builds did not get correct git hash
-
-
-1.9.0-beta1 (2019-02-09)
-------------------------------------------------------------------------
-Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbers have been replaced with Pull Requests and Issue numbers
-- Feature: Group liveries, and livery window usability enhancements (#7108)
-- Feature: Overhaul of music system, support MPSMIDI music files (TTD DOS/TTO) (#6839)
-- Feature: [Win32] Rewritten DMusic and WinMM music drivers
-- Feature: [Win32] New XAudio2 sound driver
-- Feature: [Linux] New Fluidsynth music driver
-- Feature: Framerate display window (#6822)
-- Feature: [NewGRF] Ability for industries & houses to produce and/or accept up to 16 different cargoes
-- Feature #6610: Allow towns to build houses on road turns (#6758)
-- Feature: Replace independent map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling (#6756)
-- Feature #6459: API for querying network clients from GS (#6736)
-- Feature: New Russian Ruble & Mexican Peso as currencies (#6678, #7035)
-- Feature #4186: Append '(City)' after city names in the town directory
-- Feature #986: Automatic save when losing connection to a network game
-- Add: [NewGRF] Flag to hide rail types from construction (#7118)
-- Add: [NewGRF] Airport animation trigger for plane landing (#6334)
-- Add #4115: Default starting company colour setting (#6998)
-- Add: Mixer feature for streaming sampled music
-- Add #6460: [AI] start_date parameter for Random AIs on new game
-- Add: BACKSPACE can be mapped as a hotkey
-- Add: 32bpp SSE2 blitter palette animator (#6795)
-- Change: Make ships turn slowly when changing direction and stop when going up or down a lock (#7065, #7150)
-- Change: Improve ship pathfinder performance
-- Change: Decouple GUI timing from game ticks (#6780)
-- Change: Desert tiles are now half-desert if a neighboured tile is non-desert or sea/coast (#4754)
-- Change: Gradually slow down aircraft speed on breakdown (#6932)
-- Change: [NewGRF] Increase rail type & cargo type limits to 64
-- Change: [NewGRF] Increase size of persistent storage to 256
-- Change: [NewGRF] Use last OpenTTD SVN revision in NewGRF version number (#6843)
-- Change: Clone tool in depot window now behaves like clone button in vehicle window (#6754)
-- Change #6397: Keep town growth rate in sync with house count
-- Change: Scale default FreeType font size selection by UI zoom level
-- Change: [OSX] Reversed pinch to zoom behaviour
-- Change: Switch town growth rate and counter to actual game ticks (#6763)
-- Change: Non-tag revisions are now named '<commitdate>-<branch>-g<shorthash><modified>'
-- Change: Rewrite several bits of documentation in markdown
-- Fix: Reinitialise graph GUI on game restart (#7191)
-- Fix: Potential crash during shutdown after unpacking downloaded content (#7185)
-- Fix #6584: Text layout in engine preview dialogue
-- Fix #6636: Airplanes could be sent to helicopter station depots
-- Fix: Deadlock when launched with -n switch (#7103)
-- Fix: Various corrections to town names in non-English languages (#7038, 7141)
-- Fix: Only consider airport tiles when placing (for non-rectangular airports) (#6613)
-- Fix: Spelling fixes on some Latin American town names
-- Fix #7001: Pathfinders should see standard road stations as tiles where to reverse
-- Fix #6676: Prevent helicopters from stopping in midair during some kinds of landing
-- Fix: Remove need to use Ctrl+Click when building stations next to competitors (#6906)
-- Fix: [NewGRF] Make VA2 operator 11 (ror) behave well-defined when rotating by 0 bits
-- Fix #4109: Add more water checks to the Oil Rig layout
-- Fix #6938: Incorrect value for "Cost to Clear" was displayed for Company Headquarters in tile inspector (#6939)
-- Fix #6920: Make 9.8m/s^2 a common constant for TE-calculation
-- Fix #6892: [Script] CONFIG_RANDOM did not use the full parameter range (#6902)
-- Fix #6622: News message when GS constructs a town had empty company name
-- Fix: [NewGRF] Action7 variable 0x85 had no bounds checks
-- Fix #6875: Depot building cost did not include foundation build cost (#6883)
-- Fix: Some pixels in ship autoreplace icon (sprite 106) were transparent
-- Fix: Poor contrast in cargo dest flow legend window cargo labels
-- Fix #6553: Make viewport button text unambiguous
-- Fix: [OSX] Setting mouse-wheel to scroll the map does not disable pinch to zoom
-- Fix #6969: Account for BOM when reading script files
-- Fix #6898: Ability to use seeds above INT_MAX (#6936)
-- Fix #6659: Bus stations could be demolished when not in demolish mode (#6815)
-- Fix: One-way roads could be over-built by road stops regardless of road owner
-- Fix: Use name of cargo instead of Passengers/Mail in town statistics (#6801)
-- Fix: Prevent ships moving into docks after finishing (un)loading (#6791)
-- Fix: Tractive effort was slightly too high as per NewGRF spec (#6785)
-- Fix #6465: Add {NORMAL_FONT} and {MONO_FONT} control codes to GS strings (#6726)
-- Fix: Four group action icons were misplaced and cropped
-- Remove: PSP, WinCE support
-
-
-1.8.0 (2018-04-01)
-------------------------------------------------------------------------
-(None)
-
-
-1.8.0-RC1 (2018-03-21)
-------------------------------------------------------------------------
-- Feature: [GFX] Climate-specific Action5 extra airport sprites [FS#6664] (r27976)
-- Feature: Draw vertical separators at tile distance in the train depot GUI (r27938, r27899)
-- Feature: [Build] MSVC 2017 project file generator. Most noticeable, std:c++latest is enabled (r27920, r27919, r27918, r27917)
-- Feature: [Build] Project file generator for kdevelop 4/5 [FS#6577] (r27897)
-- Feature: Add option to close windows with right click [FS#4950] (r27826, r27825)
-- Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (r27822)
-- Feature: Display aircraft type in vehicle preview/purchase/detail windows (r27802, r27799, r27797)
-- Change: [NewGRF] Various performance improvements to resolving VA2 (r27989, r27985, r27984, r27983, r27982)
-- Change: [NewGRF] Increase maximum allowed vehicle sprite size to reduce clipping of ships (r27987)
-- Change: Check companies for bankruptcy before subtracting reoccuring monthly costs [FS#6679] (r27981)
-- Change: [GFX] Replace the office building sprite on various toyland airports with a better fitting sprite [FS#6664] (r27977)
-- Change: [GFX] The switch-toolbar icon contained pixels from the fire cycle. Replace the whole icon with a new version [FS#6654] (r27961)
-- Change: Reword texts in industry view, when stockpiling is used (r27952)
-- Change: Remove the gap between windows when positioning them after opening [FS#6568] (r27934, r27900)
-- Change: [Build] Enable usage of static_assert for MSVC (r27916)
-- Change: [Build] Preserve PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR environment variables in config.cache file [FS#6614] (r27902)
-- Change: Do not cancel headquarter construction and engine-preview-query when shift-clicking (r27889)
-- Change: Parse extmidi command string for parameters to pass on (r27834)
-- Change: Draw images in centre of buttons (r27829, r27821)
-- Fix: Store the map variety setting in the savegame like the other mapgen settings, so restarting maps considers it [FS#6673] (r27978)
-- Fix: Hair selection was missing one option [FS#6642] (r27975)
-- Fix: Avoid tile operations outside map border when building lock [FS#6662] (r27973)
-- Fix: Catenary sprites got mixed up for depots [FS#6670] (r27972)
-- Fix: Make automatic window-positioning RTL-aware (r27934, r27900)
-- Fix: Automatic window-positioning now uses GUI-scale/style dependent sizes/distances instead of fixed pixel values (r27934, r27900)
-- Fix: [NewGRF] While executing random triggers, var 5F should include the new triggers (r27928)
-- Fix: [NewGRF] Reset used random triggers only after all A123 chains have been resolved, so that all RA2 in all chains can test the shared triggers (r27928)
-- Fix: [NewGRF] Industry random triggers are stored per tile, even when randomising the shared random bits of the parent industry (r27928)
-- Fix: [NPF] Reserved track bits were not accounted for when trying to find any safe position (r27912)
-- Fix: Do not modify argv[0] [FS#6575] (r27886)
-- Fix: Do not search directories when opening ini files as we already have their full path [FS#6421] (r27816)
-- Fix: Road tunnel/bridge heads have no trackbits wrt. catenary drawing (r27812)
-
-
-1.7.2 (2017-12-24)
-------------------------------------------------------------------------
-(None)
-
-
-1.7.2-RC1 (2017-12-11)
-------------------------------------------------------------------------
-- Change: When train depots have a horizontal scrollbar, allow scrolling 1 tile beyond the longest train, so you can actually attach a wagon at the end (r27937)
-- Fix: When moving wagons in the depot, the drag highlight did not exactly match the length of the dragged wagon chain (r27936)
-- Fix: [Win32] Right mouse scrolling didn't work properly with the Windows 10 Fall Creators Update [FS#6629] (r27935)
-- Fix: Forest, candyfloss forest and battery farm skipped the first animation frame [FS#6639] (r27932)
-- Fix: Glyphs in range U+0020 to U+00FF may only be defined in orig_extra.grf, not in openttd.grf [FS#6620] (r27915)
-- Fix: 'unban' console command was not handling IPv6 addresses properly (r27914, r27913)
-- Fix: Keep the 'link' between industry chain and smallmap windows whenever possible [FS#6585] (r27905)
-- Fix: When the last vehicle is removed from a shared orders group, hide the 'Stop sharing' button in the vehicle orders window [FS#6593] (r27904)
-- Fix: Tooltip of 'increase service interval' said 'decrease' [FS#6606] (r27895)
-- Fix: Console command parser passed invalid strings to the debug output, if command lines had many parameters [FS#6576] (r27884, r27883)
-
-
-1.7.1 (2017-06-13)
-------------------------------------------------------------------------
-(None)
-
-
-1.7.1-RC1 (2017-05-04)
-------------------------------------------------------------------------
-- Fix: Add missing game script event for ships arriving at a station [FS#6560] (r27859, r27858)
-- Fix: StringID truncation to 16 bits broke string remapping test [FS#6555] (r27851)
-- Fix: Infinite loop in pathfinder when checking safe waiting position from a waypoint [FS#5926] (r27846)
-- Fix: [YAPF] Consider depot as destination before reversing path and applying penalty (r27843)
-- Fix: Don't consider locks or ship depots as clear water when placing industries (r27841)
-- Fix: Small news window's fake caption was not sized to fit its text (r27838)
-- Fix: Black remap did nothing in 8bpp-simple blitter (r27837)
-- Fix: Misaligned resize icon due to widget bounds being inclusive (r27831)
-- Fix: Update viewport sign dimensions when changing GUI zoom level (r27827, r27819)
-- Fix: Vehicle viewport is not user scrollable so flag window as such (r27823)
-- Fix: Allow dropdown to be drawn above origin widget even with scrollbar (r27820)
-- Fix: 32bpp-anim blitters assumed that pitch and width of the screen were equal [FS#6545] (r27796)
-- Fix: Chat text background overflowed due to missing padding [FS#6526] (r27794)
-- Fix: Failed to load lzo compressed savegames sometimes [FS#6450] (r27793)
-- Fix: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input [FS#6366] (r27791, r27790)
-- Fix: [NewGRF] Get vehicle load amount after executing new cargo trigger [FS#6536] (r27788)
-- Fix: AI configuration changed incorrect parameter when some parameters are hidden [FS#6479] (r27787, r27786)
-- Fix: Buoys not always drawn after being placed depending on zoom level [FS#6508] (r27785)
-- Fix: Allow rail conversion even if ship is on tile [FS#6505] (r27784)
-
-
-1.7.0 (2017-04-01)
-------------------------------------------------------------------------
-(None)
-
-
-1.7.0-RC1 (2017-03-11)
-------------------------------------------------------------------------
-- Feature: [NewGRF] Extend the DCxx range to D800-DFFF (r27769)
-- Feature: [NewGRF, script] Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k (r27758)
-- Feature: [NewGRF] CB 37 results 0x0401 and 0x0800-0BFF for improved control of display of input cargos in the industry GUI (r27751)
-- Feature: Sprites missing in outdated basesets are now provided by openttd.grf (r27732, r27731, r27730)
-- Feature: [NewGRF] String command 9A 1E to print the name of a cargo type (r27707, r27706)
-- Feature: [Debug] Assign descriptive names to threads [FS#6471] (r27674, r27673, r27670)
-- Feature: [NewGRF] Allow composing vehicles from multiple sprites (r27668)
-- Change: Enable realistic train and road vehicle acceleration by default (r27760)
-- Change: Hide the drive-in stops from the tram station picker (r27734)
-- Change: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game (r27729)
-- Change: Limit waypoint area by maximum station spread during dragging (r27710)
-- Change: [Build] Re-enable Wnarrowing for gcc 4.9+ [FS#6532] (r27709, r27703)
-- Change: List railtype of rail tiles explicitly in the tile info window (r27686)
-- Change: Re-arrange the autoreplace GUI for trains, and do not filter it by railtype by default (r27683)
-- Change: Various performance improvements to CargoDist and LinkGraphs (r27682, r27681, r27614, r27613, r27612, r27611)
-- Change: Improve randomisation of rough land appearance (r27657)
-- Change: [Build] Enable C++11 for clang 3.3 (r27654)
-- Fix: Insufficient thread synchronisation when switching blitters lead to crashes [FS#6510] (r27775)
-- Fix: Enabling palette animation for 32bpp blitters while paused skipped initialisation of the palette and resulted in black windows [FS#5889] (r27774)
-- Fix: Intro games other than the traditional nightly one would cause townname NewGRFs to not get activated in the game options [FS#5819] (r27772)
-- Fix: Some variables were not reset between loading old savegames, which made loading them fail [FS#6540] (r27770)
-- Fix: Removing secondary roadtypes from bridges was factor 2 too cheap [FS#6538] (r27746)
-- Fix: Extra viewports did not center on the selected tile [FS#6537] (r27743)
-- Fix: [Build] Building on newer OSX versions with newer SDKs [FS#6295, FS#6502] (r27727, r27675)
-- Fix: Improve error message when trying to build rail track over a depot  (r27726)
-- Fix: Rescanning NewGRF in-game could break the loaded NewGRF, if very many NewGRF were in use (r27721)
-- Fix: Text could overflow various GUI elements [FS#6527] (r27713)
-- Fix: Memory leak when reloading NewGRF (r27690, r27688, r27687)
-- Fix: When removing objects of bankrupt companies the tiles may revert to canal. In that case also check the ownership of the canal [FS#6511] (r27656)
-- Fix: Make the console file commands operate independent of the save/load GUI (r27645)
-- Fix: When dragging vehicles in group or depot GUI, draw the complete articulated vehicle (r27632)
-- Fix: When dragging multiple vehicles in the depot, make the destination gap as long as the chain instead of just considering the first vehicle (r27629)
-- Fix: [Build] Change the GCC version detection so that it works with two-digit and truncated versions [FS#6487] (r27623, r27616)
-- Fix: Do not hide filtered and highlighted industries by overlapping tiles in the zoomed-out smallmap (r27622, r27621, r27620)
-- Fix: [Script] Kill scripts, when a non-suspendable valuator call takes way too long [FS#6473] (r27594)
-
-
-1.6.1 (2016-07-01)
-------------------------------------------------------------------------
-- Fix: Compilation and optimisation issues with GCC6 (r27606, r27605, r27595)
-- Fix: Compilation with --disable-network [FS#6481] (r27602)
-- Fix: [NewGRF] shift-and-add-divide/modulo varadjusts use signed division/modulo (r27600)
-- Fix: Company 0 could accept engine previews before they were offered (r27598)
-
-
-1.6.1-RC1 (2016-06-01)
-------------------------------------------------------------------------
-- Feature: Mexican Spanish (r27564, r27553, r27552)
-- Change: Performance improvement for dedicated servers by skipping drawing calls earlier in the process [FS#6402] (r27579)
-- Fix: Automatic servicing of road vehicles compared path finder costs with tile distances, thus vehicles went to depots which were factor 100 too far away [FS#6410] (r27586)
-- Fix: Enforce a non-zero load amount for all vehicles, so that vehicles can process their cargo reservations [FS#6437] (r27585, r27584)
-- Fix: Do not decrease the column width of depot windows when vehicles with high unitnumbers leave [FS#6415] (r27583)
-- Fix: Button size computation in script configuration window [FS#6461] (r27581)
-- Fix: [NewGRF] Set date of last service on construction also for wagons and articulated parts [FS#6395] (r27580)
-- Fix: Vehicles could not be hidden from the purchase list when they were in exclusive preview [FS#6454] (r27578)
-- Fix: Dock and roadstop picker, client list and town authority window did not auto-resize according to their content when they were positioned at the bottom of the screen [FS#6386] (r27577)
-- Fix: Various incorrect but uncritical size computations in the content client [FS#6449] (r27576, r27570)
-- Fix: Memory leak when disabling palette animation [FS#6404] (r27575)
-- Fix: [NewGRF] The house id as returned by house variable 66 was incorrect when querying neighboured tiles [FS#6432] (r27574)
-- Fix: [Build] Compilation failure with gcc 6.1 due to headers included after safeguards.h [FS#6467] (r27573)
-- Fix: Convenience savegame bump to distinguish 1.6 savegames from 1.5 savegames [FS#6442] (r27572)
-- Fix: [Build] Force sorting to be locale independent, so files are always ordered the same and by that token better diff-able (r27562, r27558)
-- Fix: Typos in comments and string (r27561, r27560)
-- Fix: [Build] bashism that caused different CFLAGS with bash vs dash (r27557)
-- Fix: Use a more appropriate sound effect for convert-rail (r27547)
-- Fix: Remove SetFill from vehicle GUI buttons, so that the viewport is resized instead of them in case of long window titles (r27546)
-- Fix: [Script] Generation of API wrappers (r27545, r27544, r27543)
-- Fix: [Windows] ICU got disabled for Windows builds, breaking RTL support [FS#6427] (r27542)
-- Fix: [NewGRF] Station spritelayouts did not accept the var10 flag for the palette [FS#6435] (r27534)
-
-
-1.6.0 (2016-04-01)
-------------------------------------------------------------------------
-(None)
-
-
-1.6.0-RC1 (2016-03-01)
-------------------------------------------------------------------------
-- Feature: [NewGRF] Allow custom sound IDs in RV property 0x12, ship property 0x10 and aircraft property 0x12 (r27507)
-- Feature: When viewing online content of a particular type, hide content of other types unless they have been (auto)selected for download (r27469, r27468, r27444)
-- Feature: [NewGRF] Move sprite 8 positions in sprite aligner with ctrl+click [FS#6241] (r27451)
-- Feature: Lower the sell-vehicle and sell-chain buttons in the train depot GUI while dragging a vehicle over it [FS#6391] (r27450, r27446)
-- Feature: Make the object placement GUI an independent window (r27438, r27397, r27346)
-- Feature: [Build] Project files and compilation with MSVC2015 (r27385, r27382, r27381, r27380, r27379)
-- Feature: [NewGRF] Allow railtype NewGRF to define separate sprites for the fences on either track side [FS#6315] (r27354, r27343)
-- Feature: [NewGRF] Increase the maximum amount of industry types to 128 per NewGRF and 240 in total (r27279)
-- Feature: Make Ctrl+Remove-Roadstop also remove the road, just like for rail stations [FS#6252] (r27251)
-- Change: [NewGRF] Allow static NewGRF to enable the second rocky tile set (r27497)
-- Change: Round loading percentage in loading indicators and conditional orders towards 50%, so that 0% and 100% mean completely empty or full (r27426)
-- Change: [Build] Rework the configure system to make more use of pkg-config (r27377:r27366, r27361, r27360)
-- Change: Enable YAPF cache debugging with desync debug level 2 (r27332)
-- Change: [strgen] Default plural subparameter position for CARGO_xxx string control codes is subparameter 1 (r27295)
-- Change: [NewGRF] Translate industry variable A6 (r27267)
-- Change: Do not consider cargo that is already being loaded as waiting cargo wrt. the station rating [FS#6165] (r27256)
-- Change: Tune down terrain generation to reduce amount of long slopes (r27230)
-- Change: Generate more detailed curves at the coast (r27229)
-- Change: Slightly more water in the non-custom sea levels (r27228)
-- Change: Be more lenient about road stop removal when at least one stop could be removed [FS#6262] (r27225)
-- Fix: [Win32] Stdin/out/err need to be re-assigned differently if the runtime lib of MSVC2015 is used (r27481)
-- Fix: [Haiku] On Haiku use the appropriate system variable to obtain the include dir [FS#6401] (r27472)
-
-
-1.5.3 (2015-12-01)
-------------------------------------------------------------------------
-(None)
-
-
-1.5.3-RC1 (2015-11-01)
-------------------------------------------------------------------------
-- Fix: When selecting a refit cargo for orders, do not check whether the vehicle is in a depot or station, and do not ask whether the vehicle currently allows station-refitting. Also hide the refit cost for orders, it is not predictable (r27428)
-- Fix: Use the NewGRF railtype sorting order in the infrastructure window (r27427)
-- Fix: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows [FS#5842] (r27425)
-- Fix: Towns did not connect roads to existing roads, unless they had only a single roadbit. Otoh, towns also tried to connect to single roadbit tiles such as tunnels and depots, even though they were not connectable in the direction of interest [FS#6374] (r27424)
-- Fix: When towns expanded single-bit roadtiles using a grid-layout, they used the layout position of the neighbouring tile (r27423)
-- Fix: Aircraft picked the wrong airport entry point, if airports were rotated by 180 degree [FS#6341] (r27422)
-- Fix: Consider text and icon sizes when drawing the client list [FS#6265] (r27421)
-- Fix: GrowTownAtRoad sometimes returned false, even when a house was built [FS#6362] (r27420)
-- Fix: CmdSellRailWagon did not revert all actions properly when no orderlist could be allocated [FS#6369] (r27419)
-- Fix: Desync due to incorrect storage of segments with different railtype in the YAPF cache [FS#6329] [FS#6379] (r27418)
-- Fix: When a dedicated server was paused with no clients, the master server advertisement interval was slowed, causing deadvertisement of the server [FS#6368] (r27400)
-- Fix: [Makefile] Game script directory and compat*.nut were never installed on *nix (r27399)
-- Fix: There are two different availability conditions for fdatasync in the manpage. Use them both, since at least on some MinGW versions one is not enough (r27389)
-- Fix: win32 sound driver failed to report errors (r27383)
-- Fix: Clickareas in settings tree were misaligned when the filter warning was displayed, if the setting height was defined by the icons instead of the font [FS#6358] (r27366)
-- Fix: Center settings filter warning also vertically, and also in case of multiple lines (r27365)
-
-
-1.5.2 (2015-09-01)
-------------------------------------------------------------------------
-(None)
-
-
-1.5.2-RC1 (2015-08-01)
-------------------------------------------------------------------------
-- Change: Auto-complete partial roads when building level-crossings [FS#6283] (r27309)
-- Fix: Do not rerandomise the town name when only cost-estimating the founding [FS#6332] (r27341)
-- Fix: Make variety distribution not assume that sea level is at height 0.2 / 3 * TGPGetMaxHeight() [FS#6335] (r27331, r27330, r27329, r27328)
-- Fix: Remove corner-case optimisation for line drawing, which failed for dashed lines  (r27324)
-- Fix: Clipping of inclined lines did not account for the 'horizontal width' being bigger than the 'real width' (r27323, r27322)
-- Fix: Incorrect owner assignment when adding/removing road/tram to/from bridges [FS#6317] (r27313, r27312)
-- Fix: Mark infrastructure window dirty in more cases (r27311)
-- Fix: Prevent breaking of tram-reversal points by adding more road pieces [FS#6283] (r27308)
-- Fix: Error message window with manager face failed with GUI zoom [FS#6259] (r27307)
-- Fix: Account for road-bridges and drive-through-stops in CanFollowRoad [FS#6320] (r27306, r27305)
-- Fix: Password window layout with GUI zoom [FS#6321] (r27304, r27303)
-- Fix: Speed-only timetables got assigned times in stations [FS#6313] (r27302, r27301)
-- Fix: Enforce the company's default service intervals when purchasing another company [FS#6254] (r27282, r27281)
-- Fix: Cloning/autoreplace/autorenew did not copy custom service intervals (r27280)
-
-
-1.5.1 (2015-06-01)
-------------------------------------------------------------------------
-(None)
-
-
-1.5.1-RC1 (2015-05-08)
-------------------------------------------------------------------------
-- Fix: Do not consider road junctions with trivial dead ends as branch points during town growth [FS#6245] (r27260, r27259, r27244)
-- Fix: ScriptList::RemoveList failed to remove a list from itself [FS#6287] (r27258)
-- Fix: Combined button+dropdown widgets in order and autoreplace GUI had incorrect hitbox when using GUI zoom [FS#6270] (r27255)
-- Fix: When building a lock on DC_AUTO-removable water-based objects, the water class was always set to canal [FS#6264] (r27254)
-- Fix: When crossing tram tracks with railroads, cost of extra roads was not being counted [FS#6282] (r27253)
-- Fix: Invalid infrastructure counting when crossing tram tracks with railroads [FS#6281] (r27252)
-- Fix: Broken error message in configure [FS#6286] (r27250)
-- Fix: In some cases town growth failure was considered as success [FS#6240] (r27249, r27247)
-- Fix: Town labels on smallmap and zoomed-out viewports were not centered [FS#6257] (r27248)
-- Fix: Removing a rail waypoint used the remove-rail-station cost [FS#6251] (r27245)
-- Fix: Duplicate frees due to pool item classes not having copy constructors [FS#6285] (r27243)
-- Fix: Crash when no AIs were installed due to improper handling of non-ASCII characters by the string pointer lexer [FS#6272] (r27233)
-- Fix: Compilation on DragonflyBSD [FS#6274] (r27224, r27223)
-- Fix: Use the current maximum speed as limited by bridges, orders etc. for all vehicle types alike when considering increased smoke emissions of vehicles [FS#6278] (r27222)
-- Fix: Multi-value keys in the desktop entry shall end with a trailing separator (r27221)
-- Fix: Draw path reservation on the whole bridge, not only on the bridge heads (r27209)
-- Fix: Draw correct overlay sprites for path reservations on bridges and tunnels (r27208)
-
-
-1.5.0 (2015-04-01)
-------------------------------------------------------------------------
-- Fix: [NewGRF] Add Misc. GRF Feature Flag 6 to enable the second rocky tile set [FS#6260] (r27200)
-
-
-1.5.0-RC1 (2015-03-18)
-------------------------------------------------------------------------
-- Feature: [NewGRF] Display relative offset changes in the sprite aligner [FS#6236] (r27174)
-- Fix: Original road vehicle acceleration crashed for vehicles taking over [FS#6255] (r27190)
-- Fix: GCC 5 compilation (r27185, r27183)
-- Fix: Data race due to lazy initialisation of objects [FS#5969] (r27178)
-- Fix: Compilation with MinGW64 (r27176)
-- Fix: Use the regular clipping functions in the sprite aligner instead of some magic [FS#6237] (r27173)
-- Fix: Windows randomly drops SetCursorPos calls, breaking the RMB-scrolling [FS#6238] (r27172)
-
-
-1.5.0-beta2 (2015-02-24)
-------------------------------------------------------------------------
-- Feature: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news (r27164)
-- Feature: Allow changing max heightlevel in scenario editor (r27151)
-- Feature: Make use of both rocky tile sets from the base graphics (r27117)
-- Change: Scale (non-custom) default window sizes according to GUI zoom (r27147)
-- Change: Make statusbar and chat-entry window use the same width as the toolbar (r27146)
-- Change: The chatbox-width setting now uses percent of screen width instead of pixels (r27144)
-- Change: [NewGRF] Interpret negative positions in industry layouts depending on GRF version (r27138)
-- Fix: [SDL, Windows] Right-mouse-button scrolling scrolled/jumped too far, when OpenTTD lagged during mouse event processing (r27167)
-- Fix: Toolbars were not invalidated when changing max-vehicles settings [FS#6204] (r27163)
-- Fix: Tile selection was drawn outside of map in some cases [FS#6208] (r27162)
-- Fix: Reimplement the viewport drawing algorithm [FS#6156] [FS#6206] (r27161)
-- Fix: Issues with smallmap and viewport coordinates and transformations (r27160, r27159, r27158)
-- Fix: Mark bridge middle tiles dirty when building/removing/changing bridges (r27157)
-- Fix: Rounding and unit-conversion inconsistencies in calls to MarkAllViewportsDirty (r27148)
-- Fix: Oilrig empty-tile checks were incorrect due to wrong TileIndexDiff->TileIndexDiffC conversion (r27137)
-- Fix: Misalignment in generate world window in case of small fonts (r27135)
-- Fix: Dragging of free wagons in depot failed with GUI zoom (r27133)
-- Fix: Reduce memory footprint of map array by shuffling its members [FS#6218] (r27132, r27126)
-- Fix: Dropdown- and tooltip-windows should not steal the focus (r27131)
-- Fix: [NewGRF] Action 7/9 condition 0A failed for present, but disabled, NewGRF (r27119)
-- Fix: Road vehicles could not reverse to be sent to depots when the following tile has the right type to run on, but could not be entered [FS#6183] (r27107)
-- Fix: Use the actual max speed of the vehicle in front when determining if a RV can overtake [FS#6176] (r27106)
-- Fix: grow_counter was not properly bounded by growth_rate, but by some other value used to calculate growth_rate [FS#6195] (r27105)
-- Fix: [Script] Support 64 bits integers in ScriptLists [FS#6194] (r27104)
-- Fix: [Script] Money values would end up wrong in strings when outside the bounds of a 32 bits integer [FS#6194] (r27102)
-
-
-1.5.0-beta1 (2014-12-24)
-------------------------------------------------------------------------
-- Feature: Support .txt.gz and -txt.xz changelog, readme and license files in basesets, NewGRFs, etc (r27035, r27034)
-- Feature: More height levels [FS#4126] (r27010)
-- Feature: Latin translation (r26993)
-- Feature: Add option to choose normal, double or quad-size interface (r26990)
-- Feature: [Script] Swap method for script lists (r26894)
-- Feature: [Script] ScriptStationList_Cargo for sorting cargo by from and via (r26893)
-- Feature: [Script] API for retrieving planned flow (r26892)
-- Feature: [CargoDist] Predict links for station-autorefitting vehicles (r26889)
-- Feature: Setting for limiting the height of bridges (r26882)
-- Feature: Make aircraft ascend/descend when they are too close to the ground or too far away (r26866)
-- Feature: Allow hiding of non-interesting engines in the GUI (r26805, r26804)
-- Feature: Vehicle sorting in autoreplace GUI [FS#1640] (r26800)
-- Feature: [NewGRF] Advanced visual effects with multiple effect sprites independent of spawning model (r26988, r26747)
-- Feature: Warn about missing industries after generating a map (r26729)
-- Feature: Upgrade currently active NewGRFs to newest installed version (r26613)
-- Feature: Save and load grfid and md5sum of NewGRFs in config file (r26611)
-- Feature: Select an editable preset name for saving (r26610)
-- Feature: Cancel cargo delivery from industries/houses to stations after about 21 months of not having picked up any of the cargo (r26582)
-- Feature: Give a warning when a plane's orders tell it to use a runway which is too short for it [FS#6009] (r26566)
-- Feature: [Script] Extended API for CargoDist (r26557)
-- Feature: Show measured order times in timetable GUI also when not timetabled (r26550)
-- Feature: Prompt for confirmation when deleting a vehicle group (r26455)
-- Feature: Hierarchical vehicle subgroups (r26450)
-- Feature: Allow more sound sleep for dedicated servers when there's nothing to do and nobody paying attention (r26449)
-- Feature: [NewGRF] Add vehicle modflag 1 (unloading in progress) (r26430)
-- Change: Improvements to the man page (r27091, r27012)
-- Change: Allow to set the granularity of the tooltip hover time in milliseconds instead of seconds. New default value is 250ms (r26815)
-- Change: Follow SI recommendation about spaces between numbers and units [FS#6086] (r26733)
-- Change: [CargoDist] Save locations instead of distances in link graphs to reduce size (r26646)
-- Change: [Squirrel] Make the internal integer for scripts always 64 bits, so scripts behave the same on 32 and 64 bit architectures and money can be represented properly (r26585, r26584)
-- Change: Reshuffle advanced settings tree (r26614, r26536)
-- Change: Add backend-independent config-file setting to disable 8bpp video modes, and disable 8bpp by default (r26522)
-- Fix: [OS/2] Compile again [FS#6186] (r27092)
-- Fix: Compilation with freetype2 version 2.5.4 and newer [FS#6185] (r27079)
-- Fix: Variable 47 used the carge translation table of the wrong GRF in case of callback 1D [FS#6182] (r27075)
-- Fix: Some lists did not use natural string sorting [FS#6172] (r27063)
-- Fix: Mercurial version detection failed if personal presets were configured (r27059)
-- Fix: [OSX] Don't require double-press from non-dead console hotkeys [FS#5812] (r27046)
-- Fix: Crash when having the vehicle list opened from a buoy or oil rig when the buoy/oil rig is removed (r27030)
-- Fix: Unit number was not always fully shown in depots [FS#6102] (r27014)
-- Fix: [CargoDist] Reserve cargo only after unloading finished or if the vehicle has the desired cargo already [FS#6110] (r26918)
-- Fix: [Squirrel] Loading a value saved as boolean caused it to be of type integer instead of boolean (r26785)
-- Fix: [Squirrel] Harden string handling (r26777)
-- Fix: [OSX] Implement more of the text editing API to prevent crashes and improve IME support [FS#5972] (r26758)
-- Fix: Incorrect saving of order backups [FS#6066] (r26700)
-- Fix: Ordering a vehicle to a competitor's rail waypoint displayed an error message. Ignore the click as is done for the other order types to competitor's stuff [FS#6059] (r26692)
-- Fix: [Script] Loading/parsing of info .nuts was done in the same VM, causing e.g. constants to break the loading of info of other scripts [FS#5973] (r26617)
-- Fix: [CargoDist] Improve estimation of link capacitites (r26549)
-- Remove: A bunch of archaic settings from the GUI (r26528, r26526, r26525)
-
-
-1.4.4 (2014-10-21)
-------------------------------------------------------------------------
-(None)
-
-
 1.4.4-RC1 (2014-10-08)
 ------------------------------------------------------------------------
 - Fix: Image widgets stored 32bit SpriteID in uint16 (r26971)
@@ -3433,7 +2674,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Improve corner case order handling: mark order as done only when actually done, obey non-stop orders, do only stop/refit at the depot in the order (r16240, r16228, r16199, r16198, r16187)
 - Fix: [NoAI] Use the stop/non-stop intermediate orderflags AIs can give for goto-depot orders (r16239)
 - Fix: [NewGRF] ActionB should use the online parameters from GRFFile instead of the initial user-specified values from GRFConfig. Also use the values as they were set when the ActionB was executed, not as they are set when the message is shown (r16223)
-- Fix: Possible crashes when quitting OpenTTD or forcing resizes/redraws of the screen during map generation [FS#2862] (r16220)
+- Fix: Possible crashes when quiting OpenTTD or forcing resizes/redraws of the screen during map generation [FS#2862] (r16220)
 - Fix: Shared orders without orders were not properly converted causing corrupt/invalid orders when loading pre 0.7 savegames [FS#2878] (r16214)
 - Fix: Hardcoded (old sized) MAX_COMPANIES constant (r16182)
 - Fix: [Squirrel] The traps variable was not restored, causing try/catch blocks to be 'forgotten' during a suspend (r16181)
@@ -3441,7 +2682,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Forbid joining AI companies via the 'move' and 'join' console commands/multiplayer lobby (r16176, r16175)
 - Fix: [NoAI] AIOrder::GetOrderDestination and AIOrder::GetOrderFlags did not work on ORDER_CURRENT when the vehicle was loading/leaving in a station (r16165)
 - Fix: [NoAI] Change WAYPOINT_INVALID to 0xFFFF from -1 as that is the value the AIs got (due to casting) (r16150)
-- Fix: The overflowsafe type did not like dividing by int64 larger than MAX_INT32 causing division by negative numbers and small anomalies when drawing graphs [FS#2855] (r16130)
+- Fix: The overflowsafe type did not like dividing by int64 larger than MAX_INT32 causing division by negative numbers and small anomolies when drawing graphs [FS#2855] (r16130)
 - Fix: Road was removed when both the Remove button was active and Ctrl was pressed [FS#2582] (r16119)
 - Fix: [NoAI] Make sure AIOrder::GetDestination always returns a tile belonging to the station (16109)
 - Fix: [NoAI] When giving an aircraft a goto-hangar order do not let it be a normal goto-station order (r16108)
@@ -3897,7 +3138,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Inconsistent use of 8/15-bitness of NewGRF callback results with respect to TTDP's implementation of the specification (r12819, r12818, r12759)
 - Fix: Possible out of bounds array access (r12809)
 - Fix: Enforce autorenew values range in command (r12808)
-- Fix: Vehicles could break down during loading and keep loading. The intention of the break down code is not to break down when having zero speed, therefore break downs now do not happen when loading [FS#1938] (r12795)
+- Fix: Vehicles could break down during loading and keep loading. The intention of the break down code is not to break down when having zero speed, therefor break downs now do not happen when loading [FS#1938] (r12795)
 - Fix: [OSX] In some rare cases when using an uncalibrated monitor the system colour space could not be retrieved. Show an error when this happens instead of just trying an assertion (r12776)
 - Fix: Slope checking for NewGRFs failed (r12759)
 - Fix: Check the TILE_NOT_SLOPED flag of the _north_ tile of multi-tile houses to decide if autoslope is allowed (r12717)
@@ -4005,7 +3246,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Feature: Separate catenary transparency settings from building transparency settings (r12103)
 - Feature: Allow locking individual transparency settings so they will not be changed by pressing 'x' (r12102)
 - Feature: Add some missing VarAction2 variables (r12124)
-- Feature: Make snow appear on rail tiles dependent on track height, not on height of the lowest part of the tile (r12098)
+- Feature: Make snow appear on rail tiles dependant on track height, not on height of the lowest part of the tile (r12098)
 - Feature: [NewGRF] Specify the purchase, rail and road description of a bridge (r12069)
 - Feature: [NewGRF] Add support for var 12, Variational Action 2 (r12045)
 - Feature: Allow trees on shore (r12029)
@@ -4286,7 +3527,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Feature: Add support for variable snow lines in the arctic climate, supplied by NewGRF files (r9371)
 - Feature: [NewGRF] Add support for newhouses (r9315)
 - Feature: [NewGRF] Add support for Action 13, which allows you to translate GRF-specific texts. The translations will only be shown if you are using a language with a GRF language id and if a string has not already been set specifically for the language you are using (r9037)
-- Feature: Translation dependent formatting of dates (r8906)
+- Feature: Translation dependant formatting of dates (r8906)
 - Feature: If an action 7/9 leads to skipping the rest of the file, disable the NewGRF if an action 8 has not been encountered yet (r8831)
 - Feature: Stop loading and disable the current NewGRF if a fatal error message in Action B is encountered. Also be more strict on the values accepted (r8830)
 - Feature: Build aircraft windows will no longer show aircraft that cannot use the airport in question (r8771)
@@ -4407,7 +3648,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Do not display income/expenses when they do not belong to a 'valid' tile, like the money cheat and giving money [FS#1175] (r11021)
 - Fix: One could not give money when (s)he had too much money [FS#1174] (r11020)
 - Fix: Disallow buying/selling shares in your own company or a bankrupt company [FS#1169] (r11018)
-- Fix: Crash when quitting the game in one of the end score windows [FS#1218] (r11071)
+- Fix: Crash when quiting the game in one of the end score windows [FS#1218] (r11071)
 
 
 0.5.3-RC3 (2007-08-30)
@@ -4539,7 +3780,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 
 0.5.1-RC1 (2007-03-20)
 ------------------------------------------------------------------------
-- Feature: Translation dependent formatting of dates (r8906)
+- Feature: Translation dependant formatting of dates (r8906)
 - Feature: Kick inactive initial network connections after some time [FS#115] (r9038, r9061)
 - Feature: Add an extra news group for opening and closing of industries (r9097)
 - Codechange: Disable shares by default and increase the default maximum distance from edge for oil refineries (r9339)
@@ -5502,7 +4743,7 @@ Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbe
 - Fix: Wrong pathfinding when northern station tile is missing
 - Fix: You cannot take ownership of an oilrig by building right next to it
 - Fix: [Makefile] Fixed issue where sdl-config was needed even on systems without SDL
-- Fix: [SDL] Performance fix for palette animation and mouse jumping
+- Fix: [SDL] Performance fix fo palette animation and mouse jumping
 - Fix: [SDL] Same resolution was displayed more than once in game options
 - Fix: [SDL] Smoother mouse and performance fix, like in the Windows video driver
 - Fix: Wrong trains you can buy with scenarios [SF#963056]

configure

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $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.
@@ -73,12 +75,13 @@ save_params
 make_cflags_and_ldflags
 
 EXE=""
-if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ]; 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"
 
@@ -108,22 +111,25 @@ AWKCOMMAND='
 
 		if ($0 == "ALLEGRO"     && "'$allegro_config'" == "")      { next; }
 		if ($0 == "SDL"         && "'$sdl_config'" == "")          { next; }
-		if ($0 == "SDL2"        && "'$sdl2_config'" == "")         { next; }
 		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; }
-		if ($0 == "HAIKU"       && "'$os'" != "HAIKU")             { next; }
+		if ($0 == "DOS"         && "'$os'" != "DOS")               { next; }
+		if ($0 == "BEOS"        && "'$os'" != "BEOS" &&
+		                                       "'$os'" != "HAIKU") { next; }
 		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 == "FLUIDSYNTH"  && "'$fluidsynth'" == "" )         { next; }
-		if ($0 == "USE_XAUDIO2" && "'$with_xaudio2'" == "0")       { next; }
-		if ($0 == "USE_THREADS" && "'$with_threads'" == "0")       { next; }
-		if ($0 == "USE_SSE"     && "'$with_sse'" != "1")           { next; }
+		if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
+		if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0")       { next; }
+		if ($0 == "SSE"         && "'$with_sse'" != "1")           { next; }
 
 		skip += 1;
 
@@ -143,7 +149,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; }'`"

docs/HOWTO_compile_lang_files.txt

@@ -0,0 +1,72 @@
+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
+---- ------------
+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
+you have downloaded english.txt, the master language file, for. While this is
+not always true, namely when changes in the code have not touched language
+files, your safest bet is to assume this 'limitation'.
+As a first step you need to compile strgen. This is as easy as typing
+'make strgen'. You can download the precompile strgen from:
+http://www.openttd.org/download-strgen
+
+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
+---- --------
+Example 1:
+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
+
+Example 2:
+you only have the strgen executable (no working copy) and you want to compile
+a txt file in the same directory. You should type
+./strgen english.txt
+and you will get and english.lng in the same dir
+
+Example 3:
+you have strgen somewhere, english.txt in /usr/openttd/lang and you want the
+resulting language file to go to /tmp. Use
+./strgen -s /usr/openttd/lang -d /tmp english.txt
+
+You can interchange english.txt to whichever language you want to generate a
+.lng file for.
+
+1.2) strgen command switches
+---- -----------------------
+-v | --version
+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
+strings while compiling the language file
+
+-w | --warning
+strgen will print any missing strings or wrongly translated (bad format)
+to standard error output(stderr)
+
+-h | --help | -?
+Print out a summarized help message explaining these switches
+
+-s | --source_dir
+strgen will search for the master file english.txt in the directory specified
+by this switch instead of the current directory
+
+-d | --dest_dir
+strgen will put <language>.lng in the directory specified by this switch; if
+no dest_dir is given, output is the same as source_dir

docs/Readme_OS2.txt

@@ -0,0 +1,139 @@
+OpenTTD: OS/2 version
+=====================
+
+OpenTTD has been ported to work on OS/2 4.x or later (including
+eComStation). The game should work as well as it does on Windows
+or other platforms: the main issues you may encounter are graphics
+card problems, but that is really the fault of SDL.
+
+=========================
+USING OPENTTD FOR OS/2
+=========================
+
+LIBRARIES REQUIRED FOR END USERS
+--------------------------------
+
+SDL.DLL (SDL 1.2.7) and FSLib.dll are required to use this program:
+these can be downloaded from the Files section at
+http://sourceforge.net/projects/openttd/ - see "os2-useful-v1.1.zip".
+Version 20051222 of SDL or later is required. This can be found at
+http://sdl.netlabs.org/.
+
+Please note that earlier SDL releases will probably NOT work with
+OpenTTD. If you experience problems with OpenTTD, please check
+your SDL and FSLib.dll versions (both must match).
+
+Note that to actually play the game, I have found in my own
+experience that a version of the Scitech Display Drivers or its later
+incarnation (see www.scitech.com) are necessary for it to work. If
+you have trouble with your native drivers, try the Scitech drivers
+and see if they help the problem.
+
+KNOWN ISSUES
+------------
+
+- If an error occurs during loading, the OS/2 error message window
+  is not always displayed.
+
+A NOTE ABOUT MUSIC
+------------------
+
+OpenTTD includes a music driver which uses the MCI MIDI system. Unfortunately,
+due to the lack of proper MIDI hardware myself, I have been unable to test it,
+but during testing, I found that when MIDI was enabled, I got no sound
+effects. I therefore decided to DISABLE music by default.
+
+To enable music, start OpenTTD with the command line:
+
+   openttd -m os2
+
+If I hear enough responses that both music and sound work together (it might
+just be my system), I'll have the defaults changed.
+
+Please note also that the GCC version does not currently support the MCI MIDI
+system.
+
+
+A NOTE ABOUT DEDICATED MULTIPLAYER SERVERS
+------------------------------------------
+
+To start a dedicated multiplayer server, you should run the dedicated.cmd
+file. This enables OpenTTD to open up a VIO console window to display
+its output and gather any necessary input. Running "openttd -D"
+directly will result in the console not being displayed. You may
+still pass any other parameters ('-D' is already passed) to
+dedicated.cmd.
+
+You can find the dedicated.cmd file in the os/os2 directory.
+
+=========================
+BUILDING THE OS/2 VERSION
+=========================
+
+Compiler
+--------
+
+Innotek GCC, an OS/2 port of the popular GCC compiler, was used to build OpenTTD.
+See www.innotek.de for more information. You WILL need a reasonably UNIX-like
+build environment in order to build OpenTTD successfully - the following link
+may help to set one up (although some of the links from that page are broken):
+
+   http://www.mozilla.org/ports/os2/gccsetup.html
+
+Alternatively, Paul Smedley's ready-to-go GCC build environment has been known to
+successfully build the game:
+
+   http://www.smedley.info/os2ports/index.php?page=build-environment
+
+To build, you should, if your environment is set up well enough, be able to just
+type `./configure' (or `sh configure' if you're using the OS/2 shell) and `make'.
+
+You may have to manually specify `--os OS2' on the configure command line, as
+configure cannot always detect OS/2 correctly.
+
+A note on Open Watcom
+---------------------
+
+Open Watcom C/C++ was previously used to build OpenTTD (version 0.4.x and earlier).
+However, due to advanced C++ features used in the YAPF portion of OpenTTD 0.5
+in particular, the compiler is no longer able to build the game at the moment.
+Hopefully one day Open Watcom will be able to catch up and we will be able to build
+the game once again (it's easier than getting an OS/2 UNIX-like environment set up
+in my opinion!), but until then, OpenTTD 0.5 and later can only be built with GCC.
+
+Libraries Required
+------------------
+
+The following libraries are required. To build zlib and libpng, I
+simply added the required files (watch out for sample programs, etc)
+to an IDE project file and built a library. Do not use the makefiles
+provided, they are not designed for Watcom (apart from SDL):
+
+- zlib
+  http://www.zlib.org/
+
+- libpng
+  http://www.libpng.org/
+
+- SDL for OS/2
+  ftp://ftp.netlabs.org/pub/sdl/sdl-1.2.7-src-20051222.zip used for
+  0.4.7
+
+- Freetype
+  http://freetype.sourceforge.net/
+
+Currently, there are no pre-built libraries available for GCC. If you manage to get
+OpenTTD working on Watcom though (do let us know if this is the case!), pre-built
+versions can be downloaded from the Files section at
+http://sourceforge.net/projects/openttd/ - see "os2-useful-v1.1.zip".
+
+Contact Information
+-------------------
+
+If you have any questions regarding OS/2 issues, please contact me
+(owen@owenrudge.net) and I'll try to help you out. For general OpenTTD
+issues, see the Contacting section of readme.txt.
+
+Thanks to Paul Smedley for his help with getting OpenTTD to compile under GCC on OS/2.
+
+- Owen Rudge, 24th June 2007

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,23 +1,23 @@
-# OpenTTD's admin network
-
+OpenTTD's admin network
 Last updated:    2011-01-20
+------------------------------------------------------------------------
 
 
-## Table of contents
-
-- 1.0) [Preface](#10-preface)
-- 2.0) [Joining the network](#20-joining-the-network)
-- 3.0) [Asking for updates](#30-asking-for-updates)
-    - 3.1) [Polling manually](#31-polling-manually)
-- 4.0) [Sending rcon commands](#40-sending-rcon-commands)
-- 5.0) [Sending chat](#50-sending-chat)
-    - 5.1) [Receiving chat](#51-receiving-chat)
-- 6.0) [Disconnecting](#60-disconnecting)
-- 7.0) [Certain packet information](#70-certain-packet-information)
+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
-
+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.
@@ -28,7 +28,7 @@ Last updated:    2011-01-20
 
   This document describes the admin network and its protocol.
 
-  Please refer to the mentioned enums in `src/network/core/tcp_admin.h`
+  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
@@ -36,106 +36,94 @@ Last updated:    2011-01-20
   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).
+  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](http://dev.openttdcoop.org/projects/joan)
+  can be found at: http://dev.openttdcoop.org/projects/joan
 
 
-## 2.0) Joining the network
-
+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.
+  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`.
+  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.
+  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).
+  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,
+  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
+  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`
+  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`.
+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`.
+  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`.
+  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:
+  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_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_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_UPDATE_COMPANY_ECONOMY results in the server sending:
     - ADMIN_PACKET_SERVER_COMPANY_ECONOMY
 
-  `ADMIN_UPDATE_COMPANY_STATS` results in the server sending:
-
+  ADMIN_UPDATE_COMPANY_STATS results in the server sending:
     - ADMIN_PACKET_SERVER_COMPANY_STATS
 
-  `ADMIN_UPDATE_CHAT` results in the server sending:
-
+  ADMIN_UPDATE_CHAT results in the server sending:
     - ADMIN_PACKET_SERVER_CHAT
 
-  `ADMIN_UPDATE_CONSOLE` results in the server sending:
-
+  ADMIN_UPDATE_CONSOLE results in the server sending:
     - ADMIN_PACKET_SERVER_CONSOLE
 
 
-  `ADMIN_UPDATE_CMD_LOGGING` results in the server sending:
-
+  ADMIN_UPDATE_CMD_LOGGING results in the server sending:
     - ADMIN_PACKET_SERVER_CMD_LOGGING
 
-## 3.1) Polling manually
-
-  Certain `AdminUpdateTypes` can also be polled:
-
+3.1) Polling manually
+---- ----------------
+  Certain AdminUpdateTypes can also be polled:
     - ADMIN_UPDATE_DATE
     - ADMIN_UPDATE_CLIENT_INFO
     - ADMIN_UPDATE_COMPANY_INFO
@@ -143,92 +131,88 @@ Last updated:    2011-01-20
     - ADMIN_UPDATE_COMPANY_STATS
     - ADMIN_UPDATE_CMD_NAMES
 
-  `ADMIN_UPDATE_CLIENT_INFO` and `ADMIN_UPDATE_COMPANY_INFO` accept an additional
+  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
+  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`.
+  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`.
+  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
+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`.
+  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
+  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
+  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
+  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.
+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`
+  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.
+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
+  The configuration option network.server_admin_chat specifies whether
   private chat for to the server is distributed into the admin network.
 
 
-## 6.0) Disconnecting
-
+6.0) Disconnecting
+---- -------------
   It is a kind thing to say good bye before leaving. Do this by sending the
-  `ADMIN_PACKET_ADMIN_QUIT` packet.
+  ADMIN_PACKET_ADMIN_QUIT packet.
 
 
-## 7.0) Certain packet information
+7.0) Certain packet information
+---- --------------------------
+  All ADMIN_PACKET_SERVER_* packets have an enum value greater 100.
 
-  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
+  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`
-
+  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`
-
+  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.

docs/compiling_lang_files.md

@@ -1,69 +0,0 @@
-# How to compile lang files (OpenTTD and strgen)
-
-Last updated:    2009-06-30
-
-## strgen usage
-
-This guide is only interesting for people who want to alter something
-themselves without access to [translator.openttd.org](https://translator.openttd.org/).
-
-Please note that your compiled language file will only be compatible with the OpenTTD version
-you have downloaded `english.txt`, the master language file, for. While this is
-not always true, namely when changes in the code have not touched language
-files, your safest bet is to assume this 'limitation'.
-
-As a first step you need to compile strgen. This is as easy as typing
-`'make strgen'`. You can download the precompile strgen from:
-[http://www.openttd.org/download-strgen](http://www.openttd.org/download-strgen)
-
-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.
-
-## Examples
-
-### Example 1
-
-If you are in the root of your working copy (git repository), you should type
-`./strgen/strgen -s lang lang/english.txt`
-to compile `english.txt` into `english.lng`. It will be placed in the lang dir.
-
-### Example 2
-
-You only have the strgen executable (no working copy) and you want to compile
-a txt file in the same directory. You should type
-`./strgen english.txt`
-and you will get and `english.lng` in the same dir.
-
-### Example 3
-
-You have strgen somewhere, `english.txt` in `/usr/openttd/lang` and you want the
-resulting language file to go to /tmp. Use
-`./strgen -s /usr/openttd/lang -d /tmp english.txt`
-
-You can interchange `english.txt` to whichever language you want to generate a
-.lng file for.
-
-## strgen command switches
-
-`-v | --version`
-strgen will tell what git revision it was last modified
-
-`-t | --todo`
-strgen will add <TODO> to any untranslated/missing strings and use the english
-strings while compiling the language file
-
-`-w | --warning`
-strgen will print any missing strings or wrongly translated (bad format)
-to standard error output(stderr)
-
-`-h | --help | -?`
-Print out a summarized help message explaining these switches
-
-`-s | --source_dir`
-strgen will search for the master file english.txt in the directory specified
-by this switch instead of the current directory
-
-`-d | --dest_dir`
-strgen will put <language>.lng in the directory specified by this switch; if
-no dest_dir is given, output is the same as source_dir

docs/debugging_desyncs.md

@@ -1,56 +0,0 @@
-# Debugging / 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.
-
-

docs/desync.txt

@@ -1,24 +1,25 @@
-# Some explanations about Desyncs
-
+Some explanations about Desyncs
 Last updated: 2014-02-23
-
-## Table of contents
-
-- 1.0) Desync theory
-    - 1.1) [OpenTTD multiplayer architecture](#11-openttd-multiplayer-architecture)
-    - 1.2) [What is a Desync and how is it detected](#12-what-is-a-desync-and-how-is-it-detected)
-    - 1.3) [Typical causes of Desyncs](#13-typical-causes-of-desyncs)
-- 2.0) What to do in case of a Desync
-    - 2.1) [Cache debugging](#21-cache-debugging)
-    - 2.2) [Desync recording](#22-desync-recording)
-- 3.0) Evaluating the Desync records
-    - 3.1) [Replaying](#31-replaying)
-    - 3.2) [Evaluation of the replay](#32-evaluation-of-the-replay)
-    - 3.3) [Comparing savegames](#33-comparing-savegames)
+------------------------------------------------------------------------
 
 
-## 1.1) OpenTTD multiplayer architecture
+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
@@ -29,7 +30,7 @@ Last updated: 2014-02-23
   in the same way, and trees always grow the same.
 
   In OpenTTD multiplayer synchronisation works by creating a savegame
-  when clients join, and then transferring that savegame to the client,
+  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
@@ -68,8 +69,8 @@ Last updated: 2014-02-23
      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
-
+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
@@ -80,7 +81,7 @@ Last updated: 2014-02-23
   that a vehicle picks the left line instead of the right line at
   a junction on one client.
 
-  The important thing here is, that no one notices when a Desync
+  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
@@ -105,14 +106,14 @@ Last updated: 2014-02-23
   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
+  all have occured long ago, and just did not affect the checksum
   up to now. The checksum may have matched 10 times or more
-  since the Desync happened, and only now the Desync has spiraled
+  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
-
+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
@@ -137,9 +138,9 @@ Last updated: 2014-02-23
         using commands.
 
 
-## 2.1) Cache debugging
-
-  Desyncs which are caused by improper cache validation can
+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.
@@ -150,8 +151,8 @@ Last updated: 2014-02-23
 
   Mind that this type of debugging can also be done in singleplayer.
 
-## 2.2) Desync recording
-
+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
@@ -179,8 +180,8 @@ Last updated: 2014-02-23
   However, they also take a lot of disk space.
 
 
-## 3.1) Replaying
-
+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
@@ -193,15 +194,14 @@ Last updated: 2014-02-23
    - 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 of the replay
-
+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'.
@@ -217,11 +217,6 @@ Last updated: 2014-02-23
      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
@@ -241,8 +236,8 @@ Last updated: 2014-02-23
   dates, and the original log will contain the chat, but otherwise they
   should match.
 
-## 3.3) Comparing savegames
-
+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.

docs/directory_structure.md

@@ -1,130 +0,0 @@
-# OpenTTD directory structure
-
-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).
-
-## 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).
-
-## 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.
-
-## 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 this document. If you do not have an openttd.cfg OpenTTD will
-create one after closing.
-

docs/landscape.html

@@ -15,60 +15,20 @@
   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 information about a tile.<BR>
+ <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
-  &quot;<span style="font-weight: bold;">type</span>",
-  &quot;<span style="font-weight: bold;">height</span>",
+  &quot;<span style="font-weight: bold;">type_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.
+  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>
 
  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 meaningful 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>
@@ -98,29 +58,29 @@
     </li>
    </ul>
   </li>
-  <li><span style="font-weight: bold;">m4:</span><br>
-   <a name="RoadType"></a>
-   Road roadtype. Used for all tiles with road (road, station, tunnelbridge).
+  <li><span style="font-weight: bold;">m6</span>
    <ul>
     <li>
-     Bits 5..0: Road roadtype, 0x3F for no road.
+     <a name="bridge_direction"></a>
+     Bits 7..6:
+     <table border="1" style="width: 30em;">
+      <tr bgcolor="#CCCCCC"><td colspan="2">Presence and direction of bridge above, for tiles that support this.</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>
+     Some tiles, such as houses do not support bridges over them and use these bits for other purposes.
     </li>
-   </ul>
-  </li>
-  <li><span style="font-weight: bold;">m8:</span><br>
-   <a name="TramType"></a>
-   Tram roadtype. Used for all tiles with road (road, station, tunnelbridge).
-   <ul>
     <li>
-     Bits 11..6: Tram roadtype, 0x3F for no tram.
-    </li>
-   </ul>
-  </li>
-  <li><span style="font-weight: bold;">m8:</span><br>
-   <ul>
-    <li>
-     <a name="RailType"></a>
-     Bits 5..0: Railtype. Used for all tiles with rail (road, rail, station, tunnelbridge).
+     <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>
@@ -134,7 +94,7 @@
  <table border=1 cellpadding=3>
   <tr bgcolor="#0099FF">
    <th align=left><font color="#FFFFFF">Class</font></th>
-   <th align=left><font color="#FFFFFF">Meaning &amp; details of encoding</font></th>
+   <th align=left><font color="#FFFFFF">Meaning & details of encoding</font></th>
   </tr>
   <tr bgcolor="#CCCCCC">
    <td align=left><strong><a name="Class0"><tt> 0 </tt></a></strong></td>
@@ -236,7 +196,9 @@
        </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 4..2: type of hedge on NW border of the tile</li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     </ul>
    </td>
   </tr>
@@ -249,11 +211,10 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bit 7: Ship docking tile status (for half-tile with water)</li>
      <li>m1 bits 4..0: <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>
@@ -549,6 +510,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>
@@ -562,10 +525,21 @@
    <td>
     <ul>
      <li>m2: Index into the array of towns (owning town for town roads; closest town otherwise, INVALID_TOWN if there is no town or we are creating a town)</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>m4 bits 5..0: <a href="#RoadType">Roadtype</a></li>
      <li>m7 bit 5 set = on snow or desert</li>
-     <li>m8 bits 11..6: <a href="#TramType">Tramtype</a></li>
+     <li>m7 bits 7..6: present road types
+      <table>
+       <tr>
+        <td>bit 0&nbsp; </td>
+        <td>normal road</td>
+       </tr>
+
+       <tr>
+        <td>bit 1&nbsp; </td>
+        <td>tram</td>
+       </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:
@@ -642,8 +616,7 @@
        <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>m3 bits 3..0: <a href="#TrackType">railway track type</a></li>
          <li>m5 bit 0: direction
           <table>
            <tr>
@@ -656,8 +629,9 @@
            </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>
@@ -692,6 +666,8 @@
        <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>
@@ -738,6 +714,7 @@
          <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 :
@@ -760,7 +737,7 @@
       </ul>
      </li>
     </ul>
-    <small><a name="newhouses"></a>Newhouses is the name englobing a newGRF feature developed by TTDPatch devs (mainly Csaboka).<br>
+    <small><a name="newhouses"></a>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>
@@ -775,7 +752,6 @@
    <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>m2 bits 8..6: ground
       <table>
@@ -860,6 +836,7 @@
        </tr>
       </table>
      </li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
     </ul>
    </td>
   </tr>
@@ -872,14 +849,13 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bit 7: Ship docking tile status (for buoys)</li>
      <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>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: <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>m4: custom station id; 0 means standard graphics</li>
-     <li>m4: <a href="#RoadType">Roadtype</a> for road stops</li>
      <li>m5: graphics index (range from 0..255 for each station type):
       <table>
        <tr>
@@ -994,10 +970,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 11..6: <a href="#TramType">Tramtype</a></li>
-     <li>m8 bits 5..0: <a href="#TrackType">track type</a> for railway stations/waypoints</li>
     </ul>
    </td>
   </tr>
@@ -1010,7 +986,6 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bit 7: Ship docking tile status</li>
      <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>m2: Depot index (for depots only)</li>
@@ -1108,6 +1083,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>
@@ -1125,7 +1102,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>
@@ -1449,6 +1426,7 @@
      </li>
      <li>m6 bits 5..3: random triggers (NewGRF)</li>
      <li>m6 bit 2: bit 8 of type (see m5)</li>
+     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
      <li>m7: animation frame</li>
     </ul>
    </td>
@@ -1462,10 +1440,9 @@
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
-     <li>m1 bit 7: Ship docking tile status (for aqueducts)</li>
      <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a></li>
      <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram</li>
-     <li>m4: <a href="#RoadType">Roadtype</a></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
@@ -1600,10 +1577,11 @@
        </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>m8 bits 11..6: <a href="#TramType">Tramtype</a></li>
-     <li>m8 bits 5..0: <a href="#TrackType">track type</a> for railway</li>
+     <li>m7 bits 7..6: present road types for road</li>
     </ul>
    </td>
   </tr>
@@ -1621,6 +1599,8 @@
      <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>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: animation counter</li>
     </ul>
    </td>

docs/landscape_grid.html

@@ -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="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits">XXXX <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">O</span>X XXXX</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">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX 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">O</span>X XXXX</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">X<span class="free">OO</span>X XXXX</td>
+      <td class="bits"><span class="free">OOO</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"><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">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">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OO</span>XX 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"><span class="free">OO</span>X<span class="free">O</span> XXXX</td>
-      <td class="bits"><span class="free">OOOO</span> XXXX XX<span class="free">OO OOOO</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>
     </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">XXXX XXXX</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"><span class="free">OO</span>XX XXXX</td>
-      <td class="bits"><span class="free">OOOO</span> XXXX XXXX XXXX</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">-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">OO</span>X<span class="free">O</span> XXXX</td>
-      <td class="bits">-inherit-</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits">XXX<span class="free">O</span> XXXX</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">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="free">OOO</span><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">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">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 <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,142 @@ 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">OO</span>XX XXXX</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">OOO</span>X XXXX</td>
-      <td class="bits"><span class="free">OOOO</span> XXXX XX<span class="free">OO OOOO</span></td>
+      <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
+      <td class="bits">XX<span class="free">O</span>X XXXX</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 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">XXXX XXXX</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">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO 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 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">XXXX XXXX</td>
+      <td class="bits"><span class="free">O</span>XXX 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 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">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 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">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">X<span class="free">OO</span>X XXXX</td>
+      <td class="bits"><span class="free">OOO</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"><span class="free">OO</span>XX XXXX</td>
-      <td class="bits">X<span class="free">OO</span>X XXXX</td>
+      <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OO</span>XX XXXX</td>
-      <td class="bits"><span class="free">OOOO</span> XXXX XXXX XXXX</td>
+      <td class="bits">X<span class="free">OO</span>X XXXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits">XXXX XXXX</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">-inherit-</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="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
     </tr>
   </tbody>
 </table>

docs/linkgraph.txt

@@ -1,13 +1,13 @@
-# Some clarifications about the link graph
+Some clarifications about the link graph
+----------------------------------------
 
-`InitializeLinkGraphs` joins all threads, so if the game is abandoned
+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`.
+(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

docs/logging_and_performance_metrics.md

@@ -1,141 +0,0 @@
-# Logging, frame rate and performance metrics
-
-## 1.0) 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.
-
-## 2.0) 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.
-
-## 3.0) NewGRF callback profiling
-
-NewGRF developers can profile callback chains via the `newgrf_profile`
-console command. The command controls a profiling mode where every sprite
-request is measured and logged, and written to a CSV file in the end.
-
-The NewGRF developer tools need to be enabled for the command to function.
-
-View the syntax for the command in-game with the console command
-`help newgrf_profile`.
-
-Profiling only works during game or in the editor, it's not possible to
-profile across the main menu, world generation, or loading savegames.
-
-The CSV files contain one line per sprite request during the profiling.
-They can get very large, especially on large games with many objects from
-the GRF. Start profiling short periods such as 3 or 7 days, and watch the
-file sizes.
-
-The produced CSV file contains the following fields:
-
-- *Tick* - Game tick counter, this may wrap to zero during recording.
-  Mainly useful to distinguish events from separate ticks.
-- *Sprite* - Index of the root Action 2 sprite in the GRF file. This is
-  the sprite group being resolved.
-- *Feature* - NewGRF feature number the sprite group is being resolved for.
-  This will be 0xFF for AI purchase selection and ambient sound callbacks.
-- *Item* - The id of the item within the GRF. For cargotypes, railtypes,
-  roadtypes, and tramtypes, this is the integer representation of the label.
-- *CallbackID* - The type of callback being resolved. ID 0 is regular graphics
-  lookup. See the `newgrf_callbacks.h` file in the OpenTTD source code for the
-  full list of callback IDs.
-- *Microseconds* - Total time spent to resolve the Action 2, in microseconds.
-- *Depth* - Number of recursive Action 2 lookups were made during resolution.
-  Value zero means the sprite group resolved directly.
-- *Result* - Result of the callback resolution. For lookups that result in
-  a sprite, this is the index of the base action 2 in the GRF file. For
-  callbacks that give a numeric result, this is the callback result value.
-  For lookups that result in an industry production or tilelayout, this
-  is the sprite index of the action 2 defining the production/tilelayout.

docs/multiplayer.txt

@@ -1,28 +1,28 @@
-# Multiplayer manual for OpenTTD
-
+Multiplayer manual for OpenTTD
 Last updated:    2011-02-16
+------------------------------------------------------------------------
 
 
-## Table of contents
-
-- 1.0) [Starting a server](#10-starting-a-server)
-- 2.0) [Connecting to a server](#20-connecting-to-a-server)
-    - 2.1) [Connecting to a server over the console](#21-connecting-to-a-server-over-the-console)
-- 3.0) [Playing internet games](#30-playing-internet-games)
-- 4.0) [Tips for servers](#40-tips-for-servers)
-    - 4.1)[Imposing landscaping limits](#41-imposing-landscaping-limits)
-- 5.0) [Some useful things](#50-some-useful-things)
-- 6.0) [Troubleshooting](#60-troubleshooting)
+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
-
+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
+   * 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)
+   * 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
@@ -33,36 +33,42 @@ Last updated:    2011-02-16
  - Start playing
 
 
-## 2.0) Connecting to a server
-
+2.0) 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 there were more than one server
-    - select one in the list below the buttons
-    - click on 'join game'
+   - select one in the list below the buttons
+   - click on 'join game'
+
  - If you want to play and you have the ip or hostname of the game server you
    want connect to.
-    - click add server
-    - type in the ip address or hostname
-    - if you want to add a port use :<port>
+   - 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
+ - Or you can press "Spectate game", to spectate the game
+ - Or you can press "New company", and start your own company (if there are
    slots free)
+
  - You see a progressbar how far you are with joining the server.
+
  - Happy playing
 
-## 2.1) Connecting to a server over the console
-
+2.1) 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>#<company-no>
 
 
-## 3.0) Playing internet games
-
+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.
 
@@ -84,7 +90,7 @@ Last updated:    2011-02-16
    - [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
+     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.
@@ -92,13 +98,13 @@ Last updated:    2011-02-16
    NB: changing frame_freq has more effect on the bandwidth then sync_freq.
 
 
-## 4.0) Tips for servers
-
+4.0) Tips for servers
+---- ----------------
  - You can launch a dedicated server by adding -D as parameter.
  - In UNIX like systems, you can fork your dedicated server by adding -f as
    parameter.
 
- - You can automatically clean companies that do not have a client connected to
+ - 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
@@ -107,7 +113,7 @@ Last updated:    2011-02-16
 
  - You can also do this manually via the console: 'reset_company'.
 
- - You can let your server automatically restart a map when, let's say, year 2030
+ - 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
@@ -149,8 +155,8 @@ Last updated:    2011-02-16
    maximum memory usage for packets is:
        #max_clients * #max_clients * bytes_per_frame * 10 KiB.
 
-### 4.1) Imposing landscaping limits
-
+4.1) Imposing landscaping limits
+---- ---------------------------
  - You can impose limits on companies by the following 4 settings:
    - terraform_per_64k_frames
    - terraform_frame_burst
@@ -190,8 +196,8 @@ Last updated:    2011-02-16
    affected by the above settings.
 
 
-## 5.0) Some useful things
-
+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
 
@@ -203,8 +209,8 @@ Last updated:    2011-02-16
  - Servers can now kick players, so don't make them use it!
 
 
-## 6.0) Troubleshooting
-
+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