Jonathan G Rennison
c751bba17c
Bump SLXI tracerestrict version due to reserve through new feature.
2015-09-02 21:07:08 +01:00
Jonathan G Rennison
8f4c216b3f
Merge branch 'tracerestrict' into tracerestrict-sx
2015-09-02 21:03:14 +01:00
Jonathan G Rennison
73b69c5594
Validate type of all instructions, log validation failures at load.
...
The validator now checks that the type of conditional instructions
is known.
On a validation failure, the load code now outputs a corrupt savegame
message, with the validation error message and a program dump,
instead of using an assertion.
2015-09-02 20:51:30 +01:00
Jonathan G Rennison
d9acfc4599
Fix validation of dual item instructions.
2015-09-02 19:13:30 +01:00
Jonathan G Rennison
e2435c7169
Only run trace restrict programs if they contain relevant actions.
...
Only run in pathfinder case if deny or penalty are present.
Only run in is safe waiting tile case is reserve through is present.
Presence is determined at program validation time and cached in the
program structure.
Validator now checks for unknown non-conditional instructions.
2015-09-02 18:35:56 +01:00
Jonathan G Rennison
06a1d7c5c9
Add reserve through action to trace restrict programs.
...
This only changes the behaviour of PBS reservations which
would otherwise terminate at a PBS signal.
If the signal restriction sets the reserve through state,
the reservation continues through the signal, and the signal
is set to green.
2015-09-02 02:12:02 +01:00
Jonathan G Rennison
06cc930e47
Improve insertion and removal of 'or if' conditionals.
...
Allow inserting an 'or if' immediately after 'if', 'else if', 'or if'.
Removing an 'or if' no longer removes the associated block.
2015-09-02 02:12:02 +01:00
Jonathan G Rennison
6c32cca5b9
Merge branch 'tracerestrict' into tracerestrict-sx
2015-08-25 18:26:37 +01:00
Jonathan G Rennison
38aaf8a921
Fix compilation on legacy compilers.
2015-08-25 18:22:18 +01:00
Jonathan G Rennison
6643d0a661
Merge branch 'tracerestrict' into tracerestrict-sx
2015-08-20 00:38:06 +01:00
Jonathan G Rennison
46817994bf
Include GRFs in bundle output.
2015-08-20 00:36:54 +01:00
Jonathan G Rennison
8faead7e7a
Graphically indicate restricted signals by recolouring the signal post.
...
Recolour signal posts from grey to blue for restricted signals which
are not semaphores and are not custom sprites.
2015-08-19 21:56:22 +01:00
Jonathan G Rennison
614b3d8ab5
Trace restrict: Handle removing mapping from refcount 2 empty program.
...
Instead of leaving the other mapping pointing to an empty unshared
program, find and delete it.
2015-08-19 18:52:49 +01:00
Jonathan G Rennison
6088c7fc24
Merge branch 'tracerestrict' into tracerestrict-sx
2015-08-15 00:32:15 +01:00
Jonathan G Rennison
29c4f244f3
Merge branch 'master' into tracerestrict
...
Conflicts:
src/pathfinder/yapf/yapf_costrail.hpp
2015-08-15 00:28:14 +01:00
translators
8cfc1e9d23
(svn r27386) -Update from WebTranslator v3.0:
...
dutch - 3 changes by TheTycoonist
2015-08-14 17:45:16 +00:00
rubidium
3b8aabdd9e
(svn r27385) -Fix: compilation failure due #define-ing enum name of a system library before including the system library
2015-08-13 18:13:24 +00:00
translators
70322bce59
(svn r27384) -Update from WebTranslator v3.0:
...
catalan - 35 changes by juanjo
2015-08-13 17:45:15 +00:00
rubidium
8f711aca53
(svn r27383) -Fix: win32 sound driver would not catch the exception due to constness difference
2015-08-12 20:50:10 +00:00
michi_cc
f4cd0198f4
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
michi_cc
44918010df
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
2015-08-10 20:24:13 +00:00
michi_cc
0cd198c798
(svn r27380) -Fix: [Win32] Compilation with MSVC2015.
2015-08-10 20:21:29 +00:00
frosch
63aa9f4ea8
(svn r27379) -Codechange: Do not throw in the destructors of ScriptTest/ExecMode.
2015-08-10 20:04:31 +00:00
alberth
438d7a26cc
(svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum.
2015-08-10 10:04:14 +00:00
rubidium
eb4b6a08d0
(svn r27377) -Codechange: use the pkg-config files of ICU as well. Since they are split into separate libraries it becomes possible to split RTL support for natural sorting, although the effect will be minimal
2015-08-09 13:54:17 +00:00
rubidium
cc5b8ea6cb
(svn r27376) -Codechange: let libtimidity detection and configuration make use of pkg-config
2015-08-09 12:43:52 +00:00
rubidium
2011c24502
(svn r27375) -Fix-ish: update help parameter for png configuration (it has used pkg-config for a long time)
2015-08-09 12:42:52 +00:00
rubidium
36f77b1aa7
(svn r27374) -Codechange: make zlib detection and configuration make use of pkg-config
2015-08-09 12:42:21 +00:00
rubidium
c3715a025d
(svn r27373) -Codechange: make sdl detection and configuration use pkg-config
2015-08-09 12:41:54 +00:00
rubidium
f05d71a9a6
(svn r27372) -Codechange: make allegro detection and configuration use pkg-config
2015-08-09 12:41:35 +00:00
rubidium
f179a92007
(svn r27371) -Codechange: make freetype detection and configuration use pkg-config
2015-08-09 12:41:12 +00:00
rubidium
2aee2899e8
(svn r27370) -Codechange: move the "dedicated server" check into the pkg-config check routine
2015-08-09 12:40:17 +00:00
rubidium
a08d1a044f
(svn r27369) -Cleanup: there's no need to do dependency checking of libraries in OpenTTD; zlib should always be installed if libpng is because it links to zlib
2015-08-09 12:39:26 +00:00
rubidium
625bc2e0e7
(svn r27368) -Cleanup: undo the special case of OSX; it works fine without it
2015-08-09 12:37:20 +00:00
rubidium
ee700fd3b1
(svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n)
2015-08-09 12:33:27 +00:00
Jonathan G Rennison
a48652ac6f
Merge branch 'save_ext' into tracerestrict-sx
...
Conflicts:
src/pathfinder/yapf/yapf_costrail.hpp
2015-08-09 11:57:09 +01:00
Jonathan G Rennison
316b3a4acc
Merge branch 'master' into save_ext
2015-08-09 11:24:06 +01:00
frosch
9f72662ecc
(svn r27366) -Fix [FS#6358]: 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.
2015-08-09 10:22:51 +00:00
frosch
c9120cd714
(svn r27365) -Fix: Center settings filter warning also vertically, and also in case of multiple lines.
2015-08-09 10:21:06 +00:00
translators
a9200aa69a
(svn r27364) -Update from WebTranslator v3.0:
...
czech - 1 changes by Eskymak
dutch - 12 changes by TheTycoonist
2015-08-08 17:45:27 +00:00
alberth
894f69e1fd
(svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs.
2015-08-08 13:19:38 +00:00
alberth
48485a6a5a
(svn r27362) -Codechange: Codestyle fixes for reference var declarations, static cast type, operator methods.
2015-08-08 10:06:24 +00:00
rubidium
bc199a4fe1
(svn r27361) -Fix-ish: when attempting to find a host, try gcc/g++ but also CC/CXX appended to the host triple. This to make cross compilation with clang alone easier
2015-08-08 08:54:49 +00:00
rubidium
501ee2105a
(svn r27360) -Feature: allow configuring pkg-config in one go for all libraries
2015-08-08 08:52:21 +00:00
Jonathan G Rennison
e30d7c2164
Save/load ext: Fix SlXvSetCurrentState being called before AfterLoadGame().
2015-08-07 20:12:25 +01:00
translators
f95759139b
(svn r27359) -Update from WebTranslator v3.0:
...
swedish - 1 changes by planetmaker
2015-08-07 17:45:12 +00:00
Jonathan G Rennison
03b6c41c67
Add shorthand flag in SlxiSubChunkFlags for XSCF_IGNORABLE_UNKNOWN | XSCF_IGNORABLE_VERSION.
2015-08-05 21:31:17 +01:00
Jonathan G Rennison
a38c98d10a
Bump SLXI tracerestrict version due to PBS entry and PF penalty new features.
2015-08-04 19:15:54 +01:00
Jonathan G Rennison
c4565f6bb0
Merge branch 'tracerestrict' into tracerestrict-sx
2015-08-04 19:14:57 +01:00
Jonathan G Rennison
76707fb72a
Change pf penalty restriction value button to preset values and a custom option.
...
Preset values are 'small', 'medium' and 'large'.
Change default to 'small' preset.
2015-08-04 19:09:40 +01:00
