Commit Graph

111 Commits

Author SHA1 Message Date
Jonathan G Rennison
ae15c96c1a Merge branch 'master' into jgrpp
# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_gui.cpp
#	src/bridge_map.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/rail_map.h
#	src/rail_type.h
#	src/road_map.h
#	src/saveload/afterload.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_rail.cpp
#	src/station_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
2018-07-26 20:54:13 +01:00
Jonathan G Rennison
9e1e074c2b Update existing assertions to log tile information where suitable 2018-07-26 19:13:35 +01:00
Peter Nelson
5db883fbe9 Change: Move rail type bits from m3 to m8. 2018-07-26 13:27:40 +01:00
Jonathan G Rennison
0acb4fdd2f Safer level crossings: add setting to improve RV level crossing safety. 2017-05-07 19:33:59 +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
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
rubidium
982f5a6aa2 (svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable 2014-09-21 11:23:33 +00:00
rubidium
3d605f6488 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 2011-12-19 17:48:04 +00:00
rubidium
df16ebd730 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 2011-12-19 17:48:04 +00:00
rubidium
6e9122828e (svn r22406) -Document: some more "random-ish" tidbits 2011-05-01 19:51:52 +00:00
rubidium
5a620d1c65 (svn r22406) -Document: some more "random-ish" tidbits 2011-05-01 19:51:52 +00:00
terkhen
c4bddd1b0c (svn r22049) -Codechange: Add assert condition to GetRoadOwner. 2011-02-10 18:27:50 +00:00
terkhen
096c2857ee (svn r22049) -Codechange: Add assert condition to GetRoadOwner. 2011-02-10 18:27: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
rubidium
9ca4b629cd (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
michi_cc
ea41f5f5f2 (svn r20314) -Fix (r20312): Too many parameters, missed one. 2010-08-02 18:40:25 +00:00
michi_cc
e34faa8e15 (svn r20314) -Fix (r20312): Too many parameters, missed one. 2010-08-02 18:40:25 +00:00
michi_cc
cfdf92d290 (svn r20312) -Doc: Add missing doxygen comments to road map accessors. 2010-08-02 18:34:46 +00:00
michi_cc
3c7b220d59 (svn r20312) -Doc: Add missing doxygen comments to road map accessors. 2010-08-02 18:34:46 +00:00
frosch
5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
frosch
ed4f806f1d (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
frosch
ed80045221 (svn r19654) -Codechange: Use Extract<> in more places. 2010-04-17 13:31:41 +00:00
frosch
75d4bc947d (svn r19654) -Codechange: Use Extract<> in more places. 2010-04-17 13:31:41 +00:00
smatz
d2e99657fa (svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET 2010-03-23 22:25:43 +00:00
smatz
53aaabe6e9 (svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET 2010-03-23 22:25:43 +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
82fc28f77f (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
224f4e0197 (svn r18028) -Codechange: unglobalise some functions 2009-11-09 10:40:33 +00:00
rubidium
860b9b1cea (svn r18028) -Codechange: unglobalise some functions 2009-11-09 10:40:33 +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
e8ddf001c8 (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
55ddce8da2 (svn r17493) -Codechange: store the depot index on the map 2009-09-10 14:33:07 +00:00
rubidium
4fef835e52 (svn r17492) -Codechange: don't store the town index for road depots. 2009-09-10 14:27:43 +00:00
rubidium
bb94724a09 (svn r17492) -Codechange: don't store the town index for road depots. 2009-09-10 14:27:43 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +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
rubidium
8405d7d7e7 (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
rubidium
8cad64558f (svn r16795) -Fix [FS#3025]: houses wouldn't get build on the map edge. 2009-07-12 09:39:30 +00:00
rubidium
b5b743bcba (svn r16795) -Fix [FS#3025]: houses wouldn't get build on the map edge. 2009-07-12 09:39:30 +00:00
rubidium
f3e0fd7416 (svn r15711) -Codechange: lots of whitespace cleanup/fixes 2009-03-14 18:16:29 +00:00
rubidium
9d018723b7 (svn r15711) -Codechange: lots of whitespace cleanup/fixes 2009-03-14 18:16:29 +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
smatz
e124aa8fd6 (svn r15643) -Fix [FS#2711]: be more strict with zeroing unused map array bits 2009-03-08 16:10:39 +00:00
rubidium
9f2a906bc1 (svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
-Feature: allow building road stops on road/tram tracks of competitors.
2009-03-02 22:57:47 +00:00
rubidium
7831346ef8 (svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
-Feature: allow building road stops on road/tram tracks of competitors.
2009-03-02 22:57:47 +00:00
smatz
698f05e756 (svn r14591) -Fix [FS#2388](r14528): cached nearest town could be invalid after importing older savegame and during town generation
-Codechange: rewrite parts of code responsible for caching index of nearest town
2008-11-18 22:43:59 +00:00
smatz
07e3c096b3 (svn r14591) -Fix [FS#2388](r14528): cached nearest town could be invalid after importing older savegame and during town generation
-Codechange: rewrite parts of code responsible for caching index of nearest town
2008-11-18 22:43:59 +00:00
rubidium
52ac592422 (svn r14528) -Codechange: cache the closest town for all road tiles instead of only roads owned by tiles. This replaces a O(n) search over all towns from the road's tileloop with a O(1) lookup (PhilSophus) 2008-10-25 13:51:47 +00:00