dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,656 Commits 1 Branch 0 Tags
8cf0f354d9b4db19a12a49334b7a96a262b9d21a
Commit Graph

42 Commits

Author SHA1 Message Date
Jonathan G Rennison
8cf0f354d9 Merge branch 'tracerestrict-sx' into jgrpp 2017-02-27 18:51:37 +00:00
Jonathan G Rennison
b6e001f20e Fix evaluation of PBS entry signal conditional after reserve through. 2017-02-27 15:02:52 +00:00
Jonathan G Rennison
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
 2016-09-18 20:07:48 +01:00
Jonathan G Rennison
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.
 2016-09-18 20:06:39 +01:00
Jonathan G Rennison
3ea652c4b9 Merge branch 'tracerestrict-sx' into jgrpp 2016-07-18 00:48:12 +01:00
Jonathan G Rennison
3d6cbb76b4 Allow value of "PBS entry signal" conditional to be a rail depot. 2016-07-18 00:47:52 +01:00
Jonathan G Rennison
cd0211095b Merge branch 'tracerestrict-sx' into jgrpp 2016-07-11 22:13:07 +01:00
Jonathan G Rennison
58817c26e0 Fix reservation through multiple reserve-through signals after a junction. 2016-07-11 22:02:33 +01:00
Jonathan G Rennison
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.
 2016-03-21 20:22:01 +00:00
Jonathan G Rennison
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
 2016-02-21 12:16:11 +00:00
Jonathan G Rennison
a25ac7a161 Enable signals on bridges/tunnels to work with PBS. 2016-02-20 23:34:06 +00:00
Jonathan G Rennison
3dec3242cc Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
 2015-09-02 21:09:25 +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
29c4f244f3 Merge branch 'master' into tracerestrict 
Conflicts:
	src/pathfinder/yapf/yapf_costrail.hpp
 2015-08-15 00:28:14 +01:00
Jonathan G Rennison
e0bc6e0cf6 Merge branch 'tracerestrict-sx' into jgrpp 2015-08-09 11:57:32 +01: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
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
Jonathan G Rennison
675993805b Merge branch 'tracerestrict-sx' into jgrpp 2015-08-03 20:41:00 +01:00
Jonathan G Rennison
a0520b8937 Initial implementation of PBS entry signal condition variable. 
TODO: see how the efficiency of this can be improved.
 2015-08-03 20:28:42 +01:00
Jonathan G Rennison
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
 2015-08-02 18:15:18 +01:00
patch-import
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.
 2015-08-01 17:06:43 +01:00
Jonathan G Rennison
5474ee3e40 Add entry direction condition variable. 2015-07-28 01:36:52 +01:00
Jonathan G Rennison
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.
 2015-07-28 01:36:52 +01:00
rubidium
d89e93ff9a (svn r25609) -Fix [FS#5216]: under certain circumstances a track type change would make the end-of-line-is-red setting ineffective 2013-07-14 09:21:46 +00:00
truebrain
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) 2011-12-20 17:57:56 +00:00
rubidium
eb2197f4c8 (svn r22410) -Document: some more bits ;) 2011-05-02 16:14:23 +00:00
rubidium
9759d57087 (svn r21815) -Fix [FS#3908]: [YAPF] Apply a pathfinder penalty for back of one-way path signals so those aren't preferred over other possibilities 2011-01-15 22:40:54 +00:00
alberth
84c9201e0c (svn r21594) -Codechange: Whitespace fixes in ifndef/define lines. 2010-12-22 11:24:38 +00:00
michi_cc
789dd1470f (svn r21524) -Fix [FS#4302]: Do not apply the last signal red pathfinder penalty when the signal is a path signal. 2010-12-15 14:33:24 +00:00
terkhen
f69d280f14 (svn r21521) -Codechange: Unify some cached values that were present in both road vehicles and trains. 2010-12-14 21:33:53 +00:00
rubidium
5a0865b294 (svn r21271) -Change: use the last red instead of last red exit penalty for making sure other waypoint entries are evaluated as well when they are occupied, e.g. when there are no signals before the waypoint but a train just beyond the waypoint is stopped (like for stations) 2010-11-20 14:34:57 +00:00
michi_cc
be4dfdd709 (svn r21107) -Fix: Don't use the maximum track speed where the maximum vehicle speed is meant. 2010-11-07 13:35:12 +00:00
frosch
c18839704b (svn r20286) -Codechange: Unify end of doxygen comments. 2010-08-01 19:44:49 +00:00
frosch
5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
michi_cc
1a85f15b0b (svn r19896) -Fix [FS#3803] (r18648): [YAPP] Inform the pathfinder as well about the fact that the backside of an one-way path signal can be a safe waiting point. 2010-05-26 05:24:58 +00:00
frosch
a4413f4cf6 (svn r19670) -Codechange: Add CeilDiv() and RoundDiv() to simplify integer divisions with rounding. 2010-04-18 14:56:05 +00:00
rubidium
5750163213 (svn r19141) -Fix [FS#3619] (r18421): look-ahead for multitile waypoints 'made up' data that shouldn't go into the cache, causing desyncs in MP 2010-02-15 23:55:04 +00:00
rubidium
43a5dd8f86 (svn r18535) -Fix [FS#2722]: don't account for path reservation costs when entering a signal block via a 'block' signal. This way you won't get double penalties, both red signals and reservation costs, for the block signalled tracks 2009-12-19 15:30:24 +00:00
rubidium
c616b8cc0c (svn r18421) -Fix [FS#3244]: pathfinders wouldn't consider the 'other' reachable waypoint tile if the closest one is free but there is no safe waiting point directly after it. Now check for a free safe waiting point beyond the waypoint unless there are junctions before the first safe waiting point. 2009-12-07 08:47:10 +00:00
rubidium
be2c6f2167 (svn r18372) -Codechange: push some extra type safety into YAPF 2009-12-02 10:13:49 +00:00
rubidium
2f3053508d (svn r18364) -Codechange: move the pathfinders and their related files into a separate directory 2009-12-01 22:45:39 +00:00