dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,214 Commits 1 Branch 0 Tags
955126efac6feaf3ed386dfb0d065e4c8fc2d3e2
Commit Graph

61 Commits

Author SHA1 Message Date
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
keldorkatarn
5cc56d6ad9 Make 32 instead of 16 rail types possible. by using one free bit of m1 in the map array. 
(cherry picked from commit b44843800880cdc186f5183301ee0f42afbb5f84)

Also set non-rail type M3 bits to 0 where applicable.
Change savegame versioning to SLXI format.
 2016-04-08 20:38:31 +01: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
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
3dd51e96b8 Bulk documentation update, and a few style fixes. 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
f3b79480ed (svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable 2014-09-21 11:23:33 +00:00
michi_cc
bcac892dd7 (svn r24367) -Feature: [NewGRF] Customisable signals for rail types. 2012-07-01 23:12:50 +00:00
rubidium
0cf2ef83f0 (svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s]. 2011-01-18 23:09:43 +00:00
alberth
9f3845227e (svn r21273) -Codechange: Return values should start at the same line. 2010-11-20 15:44:24 +00:00
frosch
5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
rubidium
970842e4a2 (svn r19089) -Codechange: some minor coding style 2010-02-10 20:53:23 +00:00
rubidium
9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 2010-01-15 16:41:15 +00:00
rubidium
2e5596025c (svn r17579) -Fix: remove doxygen docs for removed parameters, or change @param to @tparam if necessary 2009-09-19 15:17:47 +00:00
rubidium
310465da07 (svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos 2009-09-19 09:51:14 +00:00
rubidium
10c3af4642 (svn r17493) -Codechange: store the depot index on the map 2009-09-10 14:33:07 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
edf7b21e18 (svn r16976) -Codechange: remove WaypointID and MAX_LENGTH constants in favour of their Station variants 2009-07-28 21:06:38 +00:00
rubidium
100cb17fa8 (svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types. 
-Change: make (rail) waypoints sub classes of 'base stations', make buoys waypoints and unify code between them where possible.
 2009-07-22 08:59:57 +00:00
rubidium
9eaee690bc (svn r16908) -Codechange: s/DepotWaypointReservation/DepotReservation/ 2009-07-22 08:52:41 +00:00
rubidium
f1d6561cc4 (svn r16907) -Codechange: make a more clear distinction between reservation functions that return a bool and that return TrackBits; GetRailStationReservation vs GetRailwayStationReservation, which one returns the bool and which one the TrackBits? 2009-07-21 22:37:10 +00:00
smatz
05db91dc65 (svn r16349) -Codechange: rename IsPlainRailTile() to IsPlainRail(), introduce shiny new IsPlainRailTile() 2009-05-18 01:26:23 +00:00
frosch
1205f02b43 (svn r16311) -Fix: (Get|Set)TrackBits() is only valid for RAIL_TILE_NORMAL and _SIGNALS. 2009-05-15 16:07:36 +00:00
smatz
e57699d8c0 (svn r15643) -Fix [FS#2711]: be more strict with zeroing unused map array bits 2009-03-08 16:10:39 +00:00
rubidium
27187e5a69 (svn r14567) -Revert (part of 14566): don't commit testing stuff... 2008-11-07 18:02:46 +00:00
rubidium
0b3706a8d3 (svn r14566) -Fix [FS#2397]: RV's go via order would reserve a slot at the 'via' station which it never uses, which makes it unlikely that it reserves a slot for the next station and that makes queueing fail (Aali) 2008-11-07 17:59:51 +00:00
smatz
ff7e0b2586 (svn r14280) -Codechange: use IsRailWaypointTile() instead of IsTileType() and IsRailWaypoint() checks at several places 2008-09-09 12:26:25 +00:00
rubidium
74b770a96a (svn r13940) -Add [YAPP]: YAPF is now able to reserve the found path. (michi_cc) 2008-08-02 22:50:52 +00:00
rubidium
64a576b854 (svn r13937) -Codechange [YAPP]: Don't cycle through two-sided PBS signals during build. (michi_cc) 2008-08-02 22:50:04 +00:00
rubidium
c34a1db15e (svn r13933) -Codechange [YAPP]: Handle through and PBS signals correctly in the signal code. (michi_cc) 2008-08-02 22:48:57 +00:00
rubidium
fc47ae96c4 (svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc) 2008-08-02 22:48:43 +00:00
rubidium
8ffc05a02c (svn r13929) -Codechange [YAPP]: Reserving and unreserving of single tracks is now possible. (michi_cc) 2008-08-02 22:48:01 +00:00
rubidium
11bf3902c4 (svn r13926) -Add [YAPP]: Add map accessors for path reservations. (michi_cc) 2008-08-02 22:47:20 +00:00
smatz
2be223fc03 (svn r13090) -Codechange: add functions for direct conversion from DiagDirection to Track and Trackbits 2008-05-14 18:31:21 +00:00
smatz
966e476df8 (svn r12745) -Codechange: a bit of naming conventions, introduce Is*DepotTile() 2008-04-17 00:44:20 +00:00
rubidium
1f870e2bc9 (svn r12474) -Codechange: split type related stuff from waypoints from waypoint.h (and openttd.h) to waypoint_type.h. 2008-03-28 16:41:12 +00:00
belugas
55676e3b6c (svn r12457) -Codechange: Move signal enums on their own header. 2008-03-28 03:23:49 +00:00
glx
c78b1b388e (svn r12239) -Fix [FS#1800] (r9729): inverted comments for SetRailType() and GetTrackBits() (michi_cc) 2008-02-24 22:20:31 +00:00
smatz
c82d1e3e46 (svn r12098) -Fix: make snow appear on rail tiles dependant on track height, not on height of the lowest part of the tile 2008-02-10 11:35:05 +00:00
frosch
9d63fd232e (svn r11984) -Fix: Also draw corner shores under rail tracks. 2008-01-25 16:51:35 +00:00
smatz
bc4ed3eafd (svn r11802) -Fix [FS#716]: do not crash trains when leaving depot to a very long track 
-Codechange: use dedicated pathfinder for signal updating, resulting in better performance and possible future improvements
 2008-01-09 23:00:59 +00:00
rubidium
7058b2cce2 (svn r11700) -Codechange: reduce the amount of unnecessary includes. 2007-12-25 23:42:52 +00:00
rubidium
be923601bf (svn r11669) -Codechange: refactor tile.h -> tile_type.h and tile_map.h 2007-12-19 23:26:02 +00:00
rubidium
2e2d76f445 (svn r11662) -Codechange: move some rail types/related functions around. 2007-12-18 20:10:21 +00:00
rubidium
0995194162 (svn r11661) -Codechange: some header reworks in order to try to reduce the compile time of OpenTTD by reduce the amount of circular-ish dependencies. 2007-12-18 19:52:14 +00:00
skidd13
c0a2c0c23e (svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style 2007-11-19 21:02:30 +00:00
rubidium
d1a51ebb36 (svn r11320) -Codechange: make lower halftiles at coast floodable. Patch by frosch. 2007-10-20 21:05:18 +00:00