| 0 | @@ -1593,41 +1593,14 @@
|
XXXX XXXX XXXX XXXX | OOOO XXXX | OOOO XXXX | -XXOX OXXX | +XXOX OOXX | XXOO OOXX | OOOO OOOO | @@ -208,7 +208,7 @@XXXX OOOO | OOOO OOOO | ~~~~ ~XXX | -OOXX XXXX | +OOXX XOXX | XXOX XXXX |
| OOOO OOOO | XOOX XXXX | XXOO OOXX | -XXXX XOXX | +XXXX XXXX | ||||||||
| bridge ramp | diff --git a/docs/linkgraph.txt b/docs/linkgraph.txt new file mode 100644 index 000000000..2515185a4 --- /dev/null +++ b/docs/linkgraph.txt @@ -0,0 +1,30 @@ +Some clarifications about the link graph +---------------------------------------- + +InitializeLinkGraphs joins all threads, so if the game is abandoned +with some threads still running, they're joined as soon as the next game +(possibly the title game) is started. See also InitializeGame. + +The MCF (multi-commodity flow) algorithm can be quite CPU-hungry as it's +NP-hard and takes exponential time (though with a very small constant +factor) in the number of nodes. +This is why it is run in a separate thread where possible. However after +some time the thread is joined and if it hasn't finished by then the game +will hang. This problem gets worse if we are running on a platform without +threads. However, as those are usually the ones with less CPU power I +assume the contention for the CPU would make the game hard to play even +with threads or even without cargodist (autosave ...). I might be wrong, +but I won't put any work into this before someone shows me some problem. + +You can configure the link graph recalculation time. A link graph +recalculation time of X days means that each link graph job has X days +to run before it is joined. The downside is that the flow stats won't be +updated before the job is finished and thus a high value means less +updates and longer times until changes in capacities are accounted for. +If you play a very large map with a complicated link graph you may want to +raise the time setting to avoid lags. The same holds for systems with slow +CPUs. + +Another option to avoid excessive lags is to reduce the accuracy of link +graph calculations. Generally the accuracy is inversely correlated to the +CPU requirements of the MCF algorithm. diff --git a/findversion.sh b/findversion.sh index 35568de0c..c0d500a8f 100755 --- a/findversion.sh +++ b/findversion.sh @@ -70,7 +70,7 @@ ROOT_DIR=`pwd` # Determine if we are using a modified version # Assume the dir is not modified MODIFIED="0" -if [ -d "$ROOT_DIR/.svn" ]; then +if [ -d "$ROOT_DIR/.svn" ] || [ -d "$ROOT_DIR/../.svn" ]; then # We are an svn checkout if [ -n "`svnversion | grep 'M'`" ]; then MODIFIED="2" diff --git a/known-bugs.txt b/known-bugs.txt index ea76ecb95..d26ef9ff8 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -1,14 +1,13 @@ OpenTTD's known bugs -Last updated: 2012-06-01 -Release version: 1.2.1 +Last updated: 2014-02-25 +Release version: 1.4.0-beta5 ------------------------------------------------------------------------ Table of contents ----------------- 1.0) About -2.0) Known bugs in this release - * 2.1) Known bugs that will not be solved +2.0) Known bugs 1.0) About @@ -17,36 +16,13 @@ All bugs listed below are marked as known. Please do not submit any bugs that are the same as these. If you do, do not act surprised, because we WILL flame you!! -Of course if you have more knowledge about any of these bugs, have more -specifics, we welcome you to report them. React to the given bug indicated -by the number below on http://bugs.openttd.org. +The current list of known bugs that we intend to fix can be found in our +bug tracking system at: http://bugs.openttd.org +Also check the closed bugs when searching for your bug in this system as +we might have fixed the bug in the mean time. -2.0) Known bugs in this release ----- -------------------------- -The following bugs are known to exist in this release and we intend to -fix them. Some bugs are known but are not fixable or fixing them would -cause further problems. Those bugs can be found in the "Known bugs that -will not be solved" section. - -The bugs in this section all refer to a ticket in our bug tracking system -that you can find at: http://bugs.openttd.org -If the bugs are closed but still listed here it means that the bug is fixed -and that the nightlies and next major release will not have that bug. - -Issues prefixed with [OSX] are required to be fixed before we consider -officially supporting Mac OS X again. For now it remains unsupported and -we only apply bug fixes provided by the community but we are unable to fix -these bugs ourselves. - -- 4857 [OSX] No support for detecting mono space font -- 4847 [OSX] No support for bootstrap downloading of base graphics -- 4744 [OSX] Crash when switching to full screen with OS X Lion -- 4689 [OSX] Crash when hiding window after coming from full screen -- 4420 [OSX] OS' mouse pointer still shows -- 2484 [OSX] Cannot enter CJK characters - -2.1) Known bugs that will not be solved +2.0) Known bugs ---- ---------------------------------- This section lists all known bugs that we do not intend to fix and the reasons why we think that fixing them is infeasible. We might make some @@ -57,12 +33,13 @@ No suitable AI can be found If you have no AIs and an AI is started the so-called 'dummy' AI will be loaded. This AI does nothing but writing a message on the AI debug window and showing a red warning. There are basically two solutions - for this problem: you must change the settings so no AI is started, - this is done in the difficulty settings window. The other solution is - acquiring (downloading) some AI. The easiest way to do this is via - the "Check Online Content" button in the main (intro) menu or via - "AI Settings" -> "Select AI" -> "Check Online Content" which is also - accessed via the main menu. + for this problem: Either you set the number of AI players to 0 so that + no AI is started. You find that setting at the top of the window in the + "AI / Game Scripts Settings" window. + The other solution is acquiring (downloading) some AI. The easiest way + to do this is via the "Check Online Content" button in the main (intro) + menu or directly in the "AI / Game Scripts Settings" dialogue via the + "Check Online Content" button. After a while of playing, colours get corrupted In Windows 7 the background slideshow corrupts the colour mapping of @@ -427,3 +404,52 @@ Mouse cursor going missing with SDL [FS#4997]: We cannot fix this problem as SDL simply does not provide the required information in these corner cases. This is a bug in SDL and as such there is little that we can do about it. + +Inconsistent catchment areas [FS#5661]: + Due to performance decisions the catchment area for cargo accepted + by a station for delivery to houses or industries differs from the + catchment area for cargo that is delivered to stations from houses + or industries. + + Conceptually they work the same, but the effect in game differs. + They work by finding the closest destination "around" the source + which is within a certain distance. This distance depends on the + type of station, e.g. road stops have a smaller catchment area than + large airports. In both cases the bounding box, the smallest + rectangle that contains all tiles of something, is searched for the + target of the cargo, and then spiraling outwards finding the closest + tile of the target. + + In the case of a station with two tiles spread far apart with a house + that is within the station's bounding box, it would be possible that + the spiraling search from the house does not reach one of the station + tiles before the search ends, i.e. all tiles within that distance + are searched. So the house does not deliver cargo to the station. On + the other hand, the station will deliver cargo because the house + falls within the bounding box, and thus search area. + + It is possible to make these consistent, but then cargo from a house + to a station needs to search up to 32 tiles around itself, i.e. 64 + by 64 tiles, to find all possible stations it could deliver to + instead of 10 by 10 tiles (40 times more tiles). Alternatively the + search from a station could be changed to use the actual tiles, but + that would require considering checking 10 by 10 tiles for each of + the tiles of a station, instead of just once. + +Trains might not stop at platforms that are currently being changed [FS#5553]: + If you add tiles to or remove tiles from a platform while a train is + approaching to stop at the same platform, that train can miss the place + where it's supposed to stop and pass the station without stopping. This + is caused by the fact that the train is considered to already have stopped + if it's beyond its assigned stopping location. We can't let the train stop + just anywhere in the station because then it would never leave the station + if you have the same station in the order list multiple times in a row or + if there is only one station in the order list (see FS#5684). + +Some houses and industries are not affected by transparency [FS#5817]: + Some of the default houses and industries (f.e. the iron ore mine) are + not affected by the transparency options. This is because the graphics do + not (completely) separate the ground from the building. + This is a bug of the original graphics, and unfortunately cannot be + fixed with OpenGFX for the sake of maintaining compatibility with the + original graphics. diff --git a/media/baseset/no_music.obm b/media/baseset/no_music.obm new file mode 100644 index 000000000..fd75cfef3 --- /dev/null +++ b/media/baseset/no_music.obm @@ -0,0 +1,50 @@ +; $Id$ +; +; This represents more or less nothingness +; +[metadata] +name = NoMusic +shortname = NULL +version = 0 +fallback = true +!! description STR_BASEMUSIC_NONE_DESCRIPTION + +[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. diff --git a/media/baseset/no_sound.obs b/media/baseset/no_sound.obs new file mode 100644 index 000000000..e9d5741a0 --- /dev/null +++ b/media/baseset/no_sound.obs @@ -0,0 +1,18 @@ +; $Id$ +; +; This represents more or less nothingness +; +[metadata] +name = NoSound +shortname = NULL +version = 2 +fallback = true +!! description STR_BASESOUNDS_NONE_DESCRIPTION + +[files] +samples = + +[md5s] + +[origin] +default = This file was part of your OpenTTD installation. diff --git a/media/baseset/orig_dos.obg b/media/baseset/orig_dos.obg new file mode 100644 index 000000000..b4cde6400 --- /dev/null +++ b/media/baseset/orig_dos.obg @@ -0,0 +1,31 @@ +; $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 STR_BASEGRAPHICS_DOS_DESCRIPTION + +[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 = + +[origin] +default = You can find it on your Transport Tycoon Deluxe CD-ROM. +OPENTTD.GRF = This file was part of your OpenTTD installation. diff --git a/media/baseset/orig_dos.obs b/media/baseset/orig_dos.obs new file mode 100644 index 000000000..e095b6221 --- /dev/null +++ b/media/baseset/orig_dos.obs @@ -0,0 +1,19 @@ +; $Id$ +; +; This represents the original sounds as on the Transport +; Tycoon Deluxe DOS CD. +; +[metadata] +name = original_dos +shortname = TTDO +version = 0 +!! description STR_BASESOUNDS_DOS_DESCRIPTION + +[files] +samples = SAMPLE.CAT + +[md5s] +SAMPLE.CAT = 422ea3dd074d2859bb51639a6e0e85da + +[origin] +default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/media/baseset/orig_dos_de.obg b/media/baseset/orig_dos_de.obg new file mode 100644 index 000000000..8cfcc2707 --- /dev/null +++ b/media/baseset/orig_dos_de.obg @@ -0,0 +1,31 @@ +; $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 STR_BASEGRAPHICS_DOS_DE_DESCRIPTION + +[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 = + +[origin] +default = You can find it on your Transport Tycoon Deluxe CD-ROM. +OPENTTD.GRF = This file was part of your OpenTTD installation. diff --git a/media/baseset/orig_win.obg b/media/baseset/orig_win.obg new file mode 100644 index 000000000..82a5c2a61 --- /dev/null +++ b/media/baseset/orig_win.obg @@ -0,0 +1,31 @@ +; $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 STR_BASEGRAPHICS_WIN_DESCRIPTION + +[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 = + +[origin] +default = You can find it on your Transport Tycoon Deluxe CD-ROM. +OPENTTD.GRF = This file was part of your OpenTTD installation. diff --git a/media/baseset/orig_win.obm b/media/baseset/orig_win.obm new file mode 100644 index 000000000..8b35b6de9 --- /dev/null +++ b/media/baseset/orig_win.obm @@ -0,0 +1,94 @@ +; $Id$ +; +; This represents the original music as on the Transport +; Tycoon Deluxe for Windows CD. +; +[metadata] +name = original_windows +shortname = TTDW +version = 1 +!! description STR_BASEMUSIC_WIN_DESCRIPTION + +[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. diff --git a/media/baseset/orig_win.obs b/media/baseset/orig_win.obs new file mode 100644 index 000000000..e1c2c4e11 --- /dev/null +++ b/media/baseset/orig_win.obs @@ -0,0 +1,19 @@ +; $Id$ +; +; This represents the original sounds as on the Transport +; Tycoon Deluxe for Windows CD. +; +[metadata] +name = original_windows +shortname = TTDO +version = 0 +!! description STR_BASESOUNDS_WIN_DESCRIPTION + +[files] +samples = SAMPLE.CAT + +[md5s] +SAMPLE.CAT = 9212e81e72badd4bbe1eaeae66458e10 + +[origin] +default = You can find it on your Transport Tycoon Deluxe CD-ROM. diff --git a/media/baseset/translations.awk b/media/baseset/translations.awk new file mode 100644 index 000000000..f15cb43ff --- /dev/null +++ b/media/baseset/translations.awk @@ -0,0 +1,69 @@ +# $Id: openttd.desktop.translation.awk 24100 2012-04-08 14:29:31Z 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