a2e53d5ab4
(svn r27733) -Codechange: Pass NPF user data as void* instead of as array of integers.
8 years ago
a23f707f92
(svn r27733) -Codechange: Pass NPF user data as void* instead of as array of integers.
8 years ago
f82feb160f
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# source.list
# src/misc.cpp
# src/openttd.cpp
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnelbridge_map.h
8 years ago
0d2e9f91bf
Adjust signal on bridge/tunnel map bits, rename accessors, add docs.
...
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
8 years ago
888cd1be07
Merge branch 'cpp-11' into signal_tunnels_bridges
...
# Conflicts:
# src/saveload/saveload.cpp
8 years ago
c20cf31514
Merge branch 'cpp-11' into enhanced_viewport_overlay
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/smallmap_gui.cpp
8 years ago
3ea652c4b9
Merge branch 'tracerestrict-sx' into jgrpp
8 years ago
8482fc6aef
Merge branch 'tracerestrict' into tracerestrict-sx
8 years ago
3d6cbb76b4
Allow value of "PBS entry signal" conditional to be a rail depot.
8 years ago
cd0211095b
Merge branch 'tracerestrict-sx' into jgrpp
8 years ago
7a18f9eeeb
Merge branch 'tracerestrict' into tracerestrict-sx
8 years ago
58817c26e0
Fix reservation through multiple reserve-through signals after a junction.
8 years ago
655b329142
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
8 years ago
05a91106b8
(svn r27586) -Fix [FS#6410]: Automatic servicing of road vehicles compared path finder costs with tile distances, thus vehicles went to depots which were factor 100 too far away. (juanjo)
8 years ago
d90686f021
(svn r27586) -Fix [FS#6410]: Automatic servicing of road vehicles compared path finder costs with tile distances, thus vehicles went to depots which were factor 100 too far away. (juanjo)
8 years ago
330a7327d6
Minor changes to avoid undefined behaviour warnings.
...
Avoid creating a reference from a nullptr.
Avoid trying a malloc and memcpy into a 0 length buffer.
Virtual trains should never be drawn.
9 years ago
5d42d07988
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
df2a1b1bcd
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
1bb3024534
Fix unreserving through a green PBS signal not setting the state to red.
...
This also had the side effect of failed reservation attempts through
a reserve-through signal leaving the signal erroneously set to green.
9 years ago
d08b162119
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/signal.cpp
# src/train_cmd.cpp
9 years ago
a25ac7a161
Enable signals on bridges/tunnels to work with PBS.
9 years ago
a671f40fc8
Merge branch 'save_ext' into tracerestrict-sx
9 years ago
ea3198cc25
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
9 years ago
e07e4fdb8e
Merge branch 'master' into signal_tunnels_bridges
9 years ago
8d19727c93
Merge branch 'save_ext' into jgrpp
...
Conflicts:
src/pathfinder/follow_track.hpp
9 years ago
147b53fbff
(svn r27418) -Fix [FS#6329] [FS#6379]: Desync due to incorrect storage of segments with different railtype in the YAPF cache. (JGR)
9 years ago
22e6a2590d
(svn r27418) -Fix [FS#6329] [FS#6379]: Desync due to incorrect storage of segments with different railtype in the YAPF cache. (JGR)
9 years ago
ffe17bc986
Fix false positive in FindNearestSafeTile desync check when path not reservable.
9 years ago
6eebd31e5d
Save YAPF state dumps to new files on Unix platforms.
9 years ago
defd5dcc50
Add debug category "yapfdesync" to enable desync checks for YAPF only.
9 years ago
09227ef450
Fix CFollowTrackT::Follow returning EC_NO_WAY instead of EC_RAIL_TYPE.
...
This can result in YAPF desyncs as this then ends up in the cache as a
ESRB_DEAD_END instead of a ESRB_RAIL_TYPE, which is problematic
when some vehicles can use the rail type but some cannot.
9 years ago
26d0eb041d
Increase thoroughness of vehicle and YAPF cache desync debug checks.
9 years ago
f312301276
Merge branch 'extra_large_maps-sx' into jgrpp
9 years ago
736bfcf7eb
Fix RV pathfinder performance regression caused by map size increase.
...
The YAPF road vehicle pathfinder previously limited the path length
to the map size (previously 2048).
The extra large maps path increases this to 1M, nearly 3 orders of
magnitude, and this can result in a major performance penalty due
to excessively long pathfinder paths.
Instead limit the RV pathfinder length to a hard-coded 2048.
9 years ago
3dec3242cc
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
9 years ago
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.
9 years ago
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.
9 years ago
29c4f244f3
Merge branch 'master' into tracerestrict
...
Conflicts:
src/pathfinder/yapf/yapf_costrail.hpp
9 years ago
388dab7390
Merge branch 'master' into enhanced_viewport_overlay
...
Conflicts:
src/road_gui.cpp
src/widgets/dropdown.cpp
9 years ago
e0bc6e0cf6
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
a48652ac6f
Merge branch 'save_ext' into tracerestrict-sx
...
Conflicts:
src/pathfinder/yapf/yapf_costrail.hpp
9 years ago
894f69e1fd
(svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs.
9 years ago
1105b4d2c9
(svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs.
9 years ago
48485a6a5a
(svn r27362) -Codechange: Codestyle fixes for reference var declarations, static cast type, operator methods.
9 years ago
b885d79f50
(svn r27362) -Codechange: Codestyle fixes for reference var declarations, static cast type, operator methods.
9 years ago
4c6dc11c16
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/signal.cpp
src/table/settings.ini
src/vehicle.cpp
9 years ago
a4ad4130a6
Merge branch 'master' into infrastructure_sharing
...
Conflicts:
src/aircraft_cmd.cpp
src/economy.cpp
src/lang/english.txt
src/order_gui.cpp
src/roadveh_cmd.cpp
src/saveload/saveload.cpp
src/settings.cpp
src/settings_gui.cpp
src/train_cmd.cpp
9 years ago
ee791055f9
Import infrastructure sharing patch
...
Strip trailing whitespace
Remove a leftover line form settings.ini
http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
9 years ago
e24839ed65
Merge branch 'master' into enhanced_viewport_overlay
...
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
src/clear_cmd.cpp
src/pbs.cpp
src/rail_cmd.cpp
src/toolbar_gui.cpp
src/train_cmd.cpp
src/vehicle.cpp
src/viewport.cpp
src/viewport_func.h
9 years ago
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
675993805b
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
a0520b8937
Initial implementation of PBS entry signal condition variable.
...
TODO: see how the efficiency of this can be improved.
9 years ago
27c70542da
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_type.h
src/signal.cpp
9 years ago
2bcbeea011
Merge branch 'progsig-sx' into jgrpp
...
Conflicts:
src/command.cpp
src/command_type.h
src/lang/english.txt
src/rail_cmd.cpp
src/rail_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/widgets/rail_widget.h
src/window_type.h
9 years ago
9f79c555da
Merge branch 'save_ext' into signal_tunnels_bridges-sx
9 years ago
59b0b18aa2
Import signals on tunnels and bridges patch
...
http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215
9 years ago
fc0efe599e
Port of the programmable signals patch to recent trunk
...
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
9 years ago
5474ee3e40
Add entry direction condition variable.
9 years ago
5f1b148cf9
Initial minimal working tracerestrict implementation.
...
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
9 years ago
86825a745c
(svn r27332) -Change: Enable YAPF cache debugging with desync debug level 2.
9 years ago
59a94f8ccf
(svn r27332) -Change: Enable YAPF cache debugging with desync debug level 2.
9 years ago
cd9d6f85e5
(svn r27107) -Fix [FS#6183]: 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; e.g. facing toward a depot with the entry facing the wrong way failed to reverse whereas facing towards an empty tile allowed the vehicle to reverse (estys)
10 years ago
193f653c56
(svn r27107) -Fix [FS#6183]: 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; e.g. facing toward a depot with the entry facing the wrong way failed to reverse whereas facing towards an empty tile allowed the vehicle to reverse (estys)
10 years ago
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
11 years ago
0463dbdc9e
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
11 years ago
fff7216d04
(svn r26117) -Cleanup: unneeded NULL check
11 years ago
f669101560
(svn r26117) -Cleanup: unneeded NULL check
11 years ago
8394abb2f5
(svn r26109) -Fix: missing initialisation
11 years ago
00264cc708
(svn r26109) -Fix: missing initialisation
11 years ago
f018a1adc2
(svn r26102) -Fix: m_veh is not NULL by definition when IsRoadTT is true
11 years ago
e106e54f9f
(svn r26102) -Fix: m_veh is not NULL by definition when IsRoadTT is true
11 years ago
a6fae2c608
(svn r26058) -Fix: handle the return value of a number of functions better
11 years ago
0e9c992104
(svn r26058) -Fix: handle the return value of a number of functions better
11 years ago
d89e93ff9a
(svn r25609) -Fix [FS#5216]: under certain circumstances a track type change would make the end-of-line-is-red setting ineffective
11 years ago
f178899609
(svn r25609) -Fix [FS#5216]: under certain circumstances a track type change would make the end-of-line-is-red setting ineffective
11 years ago
f84b92a95d
(svn r25608) -Codechange: make EndSegmentReasonBits available in yapf_base.hpp
11 years ago
740643f2b2
(svn r25608) -Codechange: make EndSegmentReasonBits available in yapf_base.hpp
11 years ago
ddfddffce9
(svn r24964) -Fix [FS#5416]: With YAPF the docking behaviour differed per direction; now favour docking in the direction you approached
12 years ago
eb538da228
(svn r24964) -Fix [FS#5416]: With YAPF the docking behaviour differed per direction; now favour docking in the direction you approached
12 years ago
1e10e91fde
(svn r24905) -Feature(ish): Implement station randomisation triggers.
12 years ago
c00a400cc7
(svn r24905) -Feature(ish): Implement station randomisation triggers.
12 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
03278cd503
(svn r24588) -Codechange: No need to intermingle reservation-checks with railroad checks. (Juanjo)
12 years ago
9d877e888a
(svn r24588) -Codechange: No need to intermingle reservation-checks with railroad checks. (Juanjo)
12 years ago
ddf597e618
(svn r24587) -Codechange: Improve coding style (Juanjo)
12 years ago
962a7c3630
(svn r24587) -Codechange: Improve coding style (Juanjo)
12 years ago
5386558459
(svn r24481) -Feature [FS#5127]: Make the pathfinder decide whether ships shall leave depots towards north or south.
12 years ago
d17ec934f5
(svn r24481) -Feature [FS#5127]: Make the pathfinder decide whether ships shall leave depots towards north or south.
12 years ago
c7ad5b9ac0
(svn r24479) -Fix: Trains were unable to reverse in stations when using NPF.
12 years ago
9215192d34
(svn r24479) -Fix: Trains were unable to reverse in stations when using NPF.
12 years ago
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
aa1a0053b0
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
13 years ago
1c9bec1999
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
13 years ago
0e96bd02c8
(svn r23564) -Fix [FS#4888]: Extending a path reservation starting at a partially reserved rail station could fail.
13 years ago
24b7be856b
(svn r23564) -Fix [FS#4888]: Extending a path reservation starting at a partially reserved rail station could fail.
13 years ago
d6e042c735
(svn r23376) -Remove: on popular demand, remove my (revoked) name from comments in the code. It was silly to name me like that to begin with ;) (based on patch by HackaLittleBit)
13 years ago
160bfd8851
(svn r23376) -Remove: on popular demand, remove my (revoked) name from comments in the code. It was silly to name me like that to begin with ;) (based on patch by HackaLittleBit)
13 years ago
frosch
Jonathan G Rennison
alberth
patch-import
rubidium
peter1138
planetmaker
truebrain
michi_cc