1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
86012e10ea
Fix: Remove need to instantiate SmallStack's pool object by making it a singleton method
6 years ago
955126efac
Improve pathfinder support for multiple docks
...
The pathfinder can now find docks other than the Manhattan closest one.
Based on Cirdan commits:
afc7969c13d7ca59afe4dae4bf88122ba8d27df2
4067190dedcd3e5f668ea4f49b1dd8dfed10b2a7
d9be6b712d2ae4fb1b5ae844dde4919dd24c4fb2
6 years ago
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
7 years ago
37a58fd11d
Add setting to increase station catchment radius.
...
Update acceptance and refresh screen when catchment settings change.
8 years ago
c6cbe7f1a9
Merge branch 'departure-boards-sx' into jgrpp
9 years ago
0529250e50
Fix crash when a station is deleted with the departure boards window open.
9 years ago
196b78af30
Merge branch 'zoning' into jgrpp
9 years ago
c120b810d1
Mark dirty the catchment of a station on change as necessary for zoning.
...
If the zoning mode is station catchment, or unserved industry/building,
mark dirty the station catchment rectangle before removing, or after
adding, (a) station tile(s).
In the case of unserved industry mode, increase the refreshed catchment
radius by 10 tiles, to wholly include industries partially inside
the catchment area.
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
ffed0c194a
Add current order (station, waypoint or depot) condition variable.
...
Adjust item bit allocations:
* Increase cond flags from 2 bits to 3 bits, for future expansion.
* Use 2 bits remaining in adjacent gap for an auxiliary type field.
This is used for the type (station, waypoint, etc.) of order tests.
Perform a linear scan of the program pool when deleting a station,
waypoint or depot.
9 years ago
a14b836bf2
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
9 years ago
780e595933
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
9 years ago
09f6c46d0b
(svn r27030) -Fix: crash when having the vehicle list opened from a buoy or oil rig while the buoy/oil rig gets its final removal (i.e. the sign gets removed)
10 years ago
e811fa1718
(svn r27030) -Fix: crash when having the vehicle list opened from a buoy or oil rig while the buoy/oil rig gets its final removal (i.e. the sign gets removed)
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
10 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
10 years ago
4b726930f1
(svn r26343) -Fix: Rewrite SmallStack so that it doesn't use a pool and is reentrant.
10 years ago
46590e112e
(svn r26343) -Fix: Rewrite SmallStack so that it doesn't use a pool and is reentrant.
10 years ago
b31a1119fb
(svn r26286) -Fix: Thoroughly erase dead flows.
11 years ago
91407b924e
(svn r26286) -Fix: Thoroughly erase dead flows.
11 years ago
b908128ffb
(svn r25890) -Codechange: define a smallstack for station IDs
11 years ago
dffc4d411e
(svn r25890) -Codechange: define a smallstack for station IDs
11 years ago
5733569153
(svn r25435) -Fix: reroute cargo in vehicles if station is deleted
11 years ago
930c19dae2
(svn r25435) -Fix: reroute cargo in vehicles if station is deleted
11 years ago
f022550df9
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
11 years ago
04e3eb6fab
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
11 years ago
9f49617eed
(svn r25359) -Codechange: schedule jobs when tracking capacities of links
11 years ago
5c8ff0a251
(svn r25359) -Codechange: schedule jobs when tracking capacities of links
11 years ago
c45cfa22a6
(svn r25346) -Codechange: Glue between stations and flow stats
11 years ago
db671ffb86
(svn r25346) -Codechange: Glue between stations and flow stats
11 years ago
6b746167e4
(svn r25259) -Codechange: track capacities and usage of links
11 years ago
3947453277
(svn r25259) -Codechange: track capacities and usage of links
11 years ago
84ca041564
(svn r25008) -Codechange: Make CargoList::Truncate behave similarly to CargoList::MoveTo, i.e. pass the amount to truncate (fonsinchen)
11 years ago
2795ed5b09
(svn r25008) -Codechange: Make CargoList::Truncate behave similarly to CargoList::MoveTo, i.e. pass the amount to truncate (fonsinchen)
11 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
19adc87262
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
12 years ago
732e073261
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
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
fc8633e1ac
(svn r23415) -Feature: Infrastructure maintenance costs.
13 years ago
d3b7b89493
(svn r23415) -Feature: Infrastructure maintenance costs.
13 years ago
bec64ece5a
(svn r23199) -Fix [FS#4822]: oil rigs that "expired" did not get removed from the station list
13 years ago
fb63543e2a
(svn r23199) -Fix [FS#4822]: oil rigs that "expired" did not get removed from the station list
13 years ago
7e0daae1ec
(svn r22567) -Codechange: Store persistent storages inside a pool.
13 years ago
00e5c1df18
(svn r22567) -Codechange: Store persistent storages inside a pool.
13 years ago
6e9122828e
(svn r22406) -Document: some more "random-ish" tidbits
13 years ago
5a620d1c65
(svn r22406) -Document: some more "random-ish" tidbits
13 years ago
c85e1c3089
(svn r22116) -Codechange: use PoolBase::Clean() at more places
13 years ago
756cc6cf65
(svn r22116) -Codechange: use PoolBase::Clean() at more places
13 years ago
7e4ff17e35
(svn r22111) -Codechange/fix-ish: upon cleaning a pool a destructor should not delete items from other pools
13 years ago
68bc93f950
(svn r22111) -Codechange/fix-ish: upon cleaning a pool a destructor should not delete items from other pools
13 years ago
701bd8848a
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
14 years ago
faf5d899f7
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
14 years ago
0cf2ef83f0
(svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s].
14 years ago
9ca4b629cd
(svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s].
14 years ago
508f7816dc
(svn r21483) -Codechange: make StationRect::ScanForStationTiles make use of TILE_AREA_LOOP. Making use of make makes me making use of my brain to determine whether I make use of tautology, or make use of pleonasm, or make use of both, or even make use of neither
14 years ago
15b4941401
(svn r21483) -Codechange: make StationRect::ScanForStationTiles make use of TILE_AREA_LOOP. Making use of make makes me making use of my brain to determine whether I make use of tautology, or make use of pleonasm, or make use of both, or even make use of neither
14 years ago
9f3845227e
(svn r21273) -Codechange: Return values should start at the same line.
14 years ago
ab50f74d7f
(svn r21273) -Codechange: Return values should start at the same line.
14 years ago
86a3fbb287
(svn r20774) -Fix [FS#4116]: assertion triggered when removing a station owned by nobody when the local company is "spectator" as well
14 years ago
64d9a36dc0
(svn r20774) -Fix [FS#4116]: assertion triggered when removing a station owned by nobody when the local company is "spectator" as well
14 years ago
1664ac1eb5
(svn r20772) -Codechange: use packed VehicleListIdentifiers as window numbers
14 years ago
f5128695c5
(svn r20772) -Codechange: use packed VehicleListIdentifiers as window numbers
14 years ago
c18839704b
(svn r20286) -Codechange: Unify end of doxygen comments.
14 years ago
4bd32799f1
(svn r20286) -Codechange: Unify end of doxygen comments.
14 years ago
5b86c79fce
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
ed4f806f1d
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
ba43c0f5dd
(svn r19958) -Codechange: move common code from Waypoint and Station destructors to BaseStation destructor
14 years ago
e71fd4bb57
(svn r19958) -Codechange: move common code from Waypoint and Station destructors to BaseStation destructor
14 years ago
a6232ad532
(svn r19957) -Codechange: remove VLW_WAYPOINT_LIST
14 years ago
c4175b752a
(svn r19957) -Codechange: remove VLW_WAYPOINT_LIST
14 years ago
24e4010f93
(svn r19956) -Fix: close list of vehicles with given oil rig in orders when the oil rig is deleted
...
-Fix (r19952): close the list when it is not sticky
14 years ago
8bf4a7d1ae
(svn r19956) -Fix: close list of vehicles with given oil rig in orders when the oil rig is deleted
...
-Fix (r19952): close the list when it is not sticky
14 years ago
22a27d3b62
(svn r19455) -Codechange: split all airport information in Station to a seperate class
14 years ago
c4a88ce022
(svn r19455) -Codechange: split all airport information in Station to a seperate class
14 years ago
fadc8a3fee
(svn r19351) -Codechange: use TileArea for AfterRemoveRect
14 years ago
bf6167710f
(svn r19351) -Codechange: use TileArea for AfterRemoveRect
14 years ago
beb46d1a7f
(svn r19350) -Codechange: StationRect::BeforeAddRect() returns a CommandCost.
14 years ago
6a3dbaf99a
(svn r19350) -Codechange: StationRect::BeforeAddRect() returns a CommandCost.
14 years ago
1f2a0c3a77
(svn r19335) -Codechange: StationRect::BeforeAddTile() returns a CommandCost.
14 years ago
d4b748e27e
(svn r19335) -Codechange: StationRect::BeforeAddTile() returns a CommandCost.
14 years ago
26d53fbb5f
(svn r19334) -Codechange: method-call codestyle fixes, and introduction of const reference formal parameter.
14 years ago
993c9e6f62
(svn r19334) -Codechange: method-call codestyle fixes, and introduction of const reference formal parameter.
14 years ago
80982cc91b
(svn r19198) -Codechange: store the size of stations in savegames
14 years ago
698737f485
(svn r19198) -Codechange: store the size of stations in savegames
14 years ago
830c42c3b5
(svn r19038) -Codechange: Move TileArea methods to their own file.
15 years ago
05388c953a
(svn r19038) -Codechange: Move TileArea methods to their own file.
15 years ago
9467b7c6d6
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
82fc28f77f
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
84cd40a483
(svn r18807) -Codechange: introduce AirportSpec and move several non-statemachine-related variables to there
15 years ago
d669801f1d
(svn r18807) -Codechange: introduce AirportSpec and move several non-statemachine-related variables to there
15 years ago
21b4eb70c3
(svn r18726) -Fix [FS#3463]: with non-uniform industries the 'supplies' text when building a station could be incorrect (missing a cargo)
...
-Change [NoAI]: AITile::GetCargoProduction now returns the number of producers and not the number of tiles of producers.
-Fix [NoAI]: AITileList_IndustryProducing would omit some tiles for at which a station would get cargo.
15 years ago
28fc7b47bd
(svn r18726) -Fix [FS#3463]: with non-uniform industries the 'supplies' text when building a station could be incorrect (missing a cargo)
...
-Change [NoAI]: AITile::GetCargoProduction now returns the number of producers and not the number of tiles of producers.
-Fix [NoAI]: AITileList_IndustryProducing would omit some tiles for at which a station would get cargo.
15 years ago
992bc6c345
(svn r18381) -Codechange: Add RoadVehicle::IsBus() to simplify some stuff.
15 years ago
59f9163e37
(svn r18381) -Codechange: Add RoadVehicle::IsBus() to simplify some stuff.
15 years ago
0f7cee89d8
(svn r18377) -Codechange: add 'cache' of the tile area of truck and bus stops.
15 years ago
81062163a2
(svn r18377) -Codechange: add 'cache' of the tile area of truck and bus stops.
15 years ago
da30e736ca
(svn r18330) -Cleanup: remove some unneeded includes
15 years ago
b00a5f1069
(svn r18330) -Cleanup: remove some unneeded includes
15 years ago
8234230f9e
(svn r17804) -Codechange: move the CargoPacket 'invalidation' when stations get removed to CargoPacket.
15 years ago
62a6e9509b
(svn r17804) -Codechange: move the CargoPacket 'invalidation' when stations get removed to CargoPacket.
15 years ago
982b8ee5fc
(svn r17693) -Cleanup: remove some unneeded includes
15 years ago
d6cded5380
(svn r17693) -Cleanup: remove some unneeded includes
15 years ago
ed8788d581
(svn r17682) -Codechange: remove erroneous space before some commas
15 years ago
e9624fe0cc
(svn r17682) -Codechange: remove erroneous space before some commas
15 years ago
27ad14ee99
(svn r17508) -Fix [FS#3195] (r16859): join station window didn't get updated when stations were removed from the pool
15 years ago
c60cebd4bb
(svn r17508) -Fix [FS#3195] (r16859): join station window didn't get updated when stations were removed from the pool
15 years ago
09e1ecc8ac
(svn r17316) -Codechange: use Industry::GetByTile() instead of GetIndustryByTile()
15 years ago
ee685c8287
(svn r17316) -Codechange: use Industry::GetByTile() instead of GetIndustryByTile()
15 years ago
99d46e0ad7
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
0502a6df42
(svn r17113) -Change [FS#265][FS#2094][FS#2589]: apply the subsidy when subsidy's destination is in station's catchment area and cargo packets originate from subsidy's source
...
-Change [FS#1134]: subsidies aren't bound to stations after awarding anymore, they still apply to town or industry, no matter what station is used for loading and unloading. Awarded subsidies from older savegames are lost
-Change [NoAI]: due to these changes, AISubsidy::GetSource and AISubsidy::GetDestination now return STATION_INVALID for awarded subsidies
15 years ago
2a430d981f
(svn r17113) -Change [FS#265][FS#2094][FS#2589]: apply the subsidy when subsidy's destination is in station's catchment area and cargo packets originate from subsidy's source
...
-Change [FS#1134]: subsidies aren't bound to stations after awarding anymore, they still apply to town or industry, no matter what station is used for loading and unloading. Awarded subsidies from older savegames are lost
-Change [NoAI]: due to these changes, AISubsidy::GetSource and AISubsidy::GetDestination now return STATION_INVALID for awarded subsidies
15 years ago
738d7fde53
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
15 years ago
74d3382b94
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
15 years ago
876d09d751
(svn r17106) -Codechange: move computation of station's catchment rectagle to separate function
15 years ago
39e145e586
(svn r17106) -Codechange: move computation of station's catchment rectagle to separate function
15 years ago
3bcc0dacf8
(svn r17105) -Codechange: no need to reset list of industries nearby that often, clearing is enough
15 years ago
33288c9d50
(svn r17105) -Codechange: no need to reset list of industries nearby that often, clearing is enough
15 years ago
30d9e54279
(svn r16966) -Codechange: BEGIN_TILE_LOOP and END_TILE_LOOP reworked into TILE_LOOP, which means no more duplication of parameters between BEGIN_TILE_LOOP and END_TILE_LOOP
15 years ago
2ec12a3f58
(svn r16966) -Codechange: BEGIN_TILE_LOOP and END_TILE_LOOP reworked into TILE_LOOP, which means no more duplication of parameters between BEGIN_TILE_LOOP and END_TILE_LOOP
15 years ago
3321f45246
(svn r16965) -Codechange: use tile area instead of sets of variables for the station joiner code.
15 years ago
47a37b6093
(svn r16965) -Codechange: use tile area instead of sets of variables for the station joiner code.
15 years ago
66bca52949
(svn r16962) -Codechange: more work towards multi tile waypoints
15 years ago
2dd998ab06
(svn r16962) -Codechange: more work towards multi tile waypoints
15 years ago
58563eafa7
(svn r16947) -Codechange: use TileArea instead of train_tile, trainst_w and trainst_h.
15 years ago
7440ec7a73
(svn r16947) -Codechange: use TileArea instead of train_tile, trainst_w and trainst_h.
15 years ago
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
15 years ago
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
15 years ago
196856f54e
(svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written.
15 years ago
cf38a5bee6
(svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written.
15 years ago
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.
15 years ago
68ead6b84f
(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.
15 years ago
196dd0974f
(svn r16876) -Codechange: add helper functions to cast to Station/Waypoint with some extra checks.
15 years ago
3fcfb9b248
(svn r16876) -Codechange: add helper functions to cast to Station/Waypoint with some extra checks.
15 years ago
3927fd6be7
(svn r16864) -Codechange: make Waypoints a subclass of BaseStation.
15 years ago
4e5af51d1f
(svn r16864) -Codechange: make Waypoints a subclass of BaseStation.
15 years ago
f59346a863
(svn r16861) -Codechange: move a few more bits from station to basestation (to be shared with waypoints)
15 years ago
72d6c3a9ad
(svn r16861) -Codechange: move a few more bits from station to basestation (to be shared with waypoints)
15 years ago
46d94fdfed
(svn r16859) -Codechange: split the Station struct into two so parts of it can be reused for Waypoints.
15 years ago
84df3ba2b4
(svn r16859) -Codechange: split the Station struct into two so parts of it can be reused for Waypoints.
15 years ago
64de470917
(svn r16814) -Codechange: make IsNormalAircraft() member of Aircraft
15 years ago
b6960e4e17
(svn r16814) -Codechange: make IsNormalAircraft() member of Aircraft
15 years ago
e4ef68405c
(svn r16766) -Codechange: remove station->MarkDirty. It is in all cases meant to only update the sign and not invalidate the widget; the widget would be invalidated by a call before/after the call to MarkDirty or it wouldn't make sense because e.g. the window doesn't exist anymore/yet.
15 years ago
9ae07bba85
(svn r16766) -Codechange: remove station->MarkDirty. It is in all cases meant to only update the sign and not invalidate the widget; the widget would be invalidated by a call before/after the call to MarkDirty or it wouldn't make sense because e.g. the window doesn't exist anymore/yet.
15 years ago
770ad0c022
(svn r16765) -Codechange: give ViewportSign's width_1 and width_2 more self explaining names
15 years ago
Jonathan G Rennison
Charles Pigott
keldorkatarn
patch-import
frosch
rubidium
fonsinchen
planetmaker
alberth
michi_cc
terkhen
smatz
yexo