Commit Graph

42 Commits

Author SHA1 Message Date
Jonathan G Rennison
56be293107 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse2.cpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/ground_vehicle.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/town_cmd.cpp
#	src/vehicle_base.h
#	src/viewport_gui.cppp
2018-05-25 18:29:17 +01:00
PeterN
4cebebcf68 Change: Add CargoTypes type for cargo masks. (#6790) 2018-05-21 22:08:39 +01:00
keldorkatarn
1d3cf59d8a Allow building multiple docks per station.
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)

# Conflicts:
#	src/station_cmd.cpp
2017-09-20 19:11:48 +01:00
Jonathan G Rennison
a70b1e5e9e Avoid downcasting station/vehicle subtypes before checking the type field.
This is because it generates a lot of spam warnings when running with
UndefinedBehaviourSantizer et al.
2016-03-21 20:22:01 +00:00
frosch
6c63c98d7f (svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL. 2013-11-24 14:41:19 +00:00
frosch
db894b0b3f (svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL. 2013-11-24 14:41:19 +00:00
peter1138
1e10e91fde (svn r24905) -Feature(ish): Implement station randomisation triggers. 2013-01-11 07:39:25 +00:00
peter1138
c00a400cc7 (svn r24905) -Feature(ish): Implement station randomisation triggers. 2013-01-11 07:39:25 +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
truebrain
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) 2011-12-20 17:57:56 +00:00
alberth
0b0127b13d (svn r21593) -Codechange: endif comment correcttions. 2010-12-22 10:50:32 +00:00
alberth
f65a9a5515 (svn r21593) -Codechange: endif comment correcttions. 2010-12-22 10:50:32 +00:00
yexo
fadc8a3fee (svn r19351) -Codechange: use TileArea for AfterRemoveRect 2010-03-06 13:38:46 +00:00
yexo
bf6167710f (svn r19351) -Codechange: use TileArea for AfterRemoveRect 2010-03-06 13:38:46 +00:00
alberth
beb46d1a7f (svn r19350) -Codechange: StationRect::BeforeAddRect() returns a CommandCost. 2010-03-06 13:23:33 +00:00
alberth
6a3dbaf99a (svn r19350) -Codechange: StationRect::BeforeAddRect() returns a CommandCost. 2010-03-06 13:23:33 +00:00
alberth
1f2a0c3a77 (svn r19335) -Codechange: StationRect::BeforeAddTile() returns a CommandCost. 2010-03-06 12:15:03 +00:00
alberth
d4b748e27e (svn r19335) -Codechange: StationRect::BeforeAddTile() returns a CommandCost. 2010-03-06 12:15:03 +00:00
alberth
26d53fbb5f (svn r19334) -Codechange: method-call codestyle fixes, and introduction of const reference formal parameter. 2010-03-06 11:54:59 +00:00
alberth
993c9e6f62 (svn r19334) -Codechange: method-call codestyle fixes, and introduction of const reference formal parameter. 2010-03-06 11:54:59 +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
8c11679381 (svn r18342) -Fix: erroneous spaces before ; 2009-11-29 19:20:39 +00:00
rubidium
2e2f72b971 (svn r18342) -Fix: erroneous spaces before ; 2009-11-29 19:20:39 +00:00
rubidium
27ad14ee99 (svn r17508) -Fix [FS#3195] (r16859): join station window didn't get updated when stations were removed from the pool 2009-09-12 12:56:49 +00:00
rubidium
c60cebd4bb (svn r17508) -Fix [FS#3195] (r16859): join station window didn't get updated when stations were removed from the pool 2009-09-12 12:56:49 +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
3321f45246 (svn r16965) -Codechange: use tile area instead of sets of variables for the station joiner code. 2009-07-26 21:07:03 +00:00
rubidium
47a37b6093 (svn r16965) -Codechange: use tile area instead of sets of variables for the station joiner code. 2009-07-26 21:07:03 +00:00
rubidium
66bca52949 (svn r16962) -Codechange: more work towards multi tile waypoints 2009-07-26 16:17:49 +00:00
rubidium
2dd998ab06 (svn r16962) -Codechange: more work towards multi tile waypoints 2009-07-26 16:17:49 +00:00
rubidium
58563eafa7 (svn r16947) -Codechange: use TileArea instead of train_tile, trainst_w and trainst_h. 2009-07-25 08:54:19 +00:00
rubidium
7440ec7a73 (svn r16947) -Codechange: use TileArea instead of train_tile, trainst_w and trainst_h. 2009-07-25 08:54:19 +00:00
rubidium
f6f8d4b000 (svn r16945) -Fix (r16940): comments got swapped 2009-07-24 19:17:45 +00:00
rubidium
63f2da7492 (svn r16945) -Fix (r16940): comments got swapped 2009-07-24 19:17:45 +00:00
rubidium
eacc809fa4 (svn r16940) -Codechange: make the pathfinders behave the same when finding waypoints or stations, i.e. don't force exactly one destination tile for a waypoint 2009-07-24 15:18:25 +00:00
rubidium
c3d2c47faa (svn r16940) -Codechange: make the pathfinders behave the same when finding waypoints or stations, i.e. don't force exactly one destination tile for a waypoint 2009-07-24 15:18:25 +00:00
rubidium
7b07e93b89 (svn r16934) -Codechange: introduce a simple helper function to check whether a station is pending deletion or not 2009-07-24 07:38:10 +00:00
rubidium
803cf87885 (svn r16934) -Codechange: introduce a simple helper function to check whether a station is pending deletion or not 2009-07-24 07:38:10 +00:00
rubidium
d361ecd8f0 (svn r16914) -Codechange: split Station and BaseStation into different files 2009-07-22 11:35:35 +00:00
rubidium
6e3d999dce (svn r16914) -Codechange: split Station and BaseStation into different files 2009-07-22 11:35:35 +00:00