Jonathan G Rennison
196b78af30
Merge branch 'zoning' into jgrpp
9 years ago
Jonathan G Rennison
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
Jonathan G Rennison
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
Jonathan G Rennison
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
patch-import
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
Jonathan G Rennison
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
frosch
a14b836bf2
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
10 years ago
frosch
780e595933
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
10 years ago
rubidium
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
rubidium
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
rubidium
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
11 years ago
rubidium
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
11 years ago
fonsinchen
4b726930f1
(svn r26343) -Fix: Rewrite SmallStack so that it doesn't use a pool and is reentrant.
11 years ago
fonsinchen
46590e112e
(svn r26343) -Fix: Rewrite SmallStack so that it doesn't use a pool and is reentrant.
11 years ago
fonsinchen
b31a1119fb
(svn r26286) -Fix: Thoroughly erase dead flows.
11 years ago
fonsinchen
91407b924e
(svn r26286) -Fix: Thoroughly erase dead flows.
11 years ago
fonsinchen
b908128ffb
(svn r25890) -Codechange: define a smallstack for station IDs
11 years ago
fonsinchen
dffc4d411e
(svn r25890) -Codechange: define a smallstack for station IDs
11 years ago
fonsinchen
5733569153
(svn r25435) -Fix: reroute cargo in vehicles if station is deleted
11 years ago
fonsinchen
930c19dae2
(svn r25435) -Fix: reroute cargo in vehicles if station is deleted
11 years ago
fonsinchen
f022550df9
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
11 years ago
fonsinchen
04e3eb6fab
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
11 years ago
fonsinchen
9f49617eed
(svn r25359) -Codechange: schedule jobs when tracking capacities of links
11 years ago
fonsinchen
5c8ff0a251
(svn r25359) -Codechange: schedule jobs when tracking capacities of links
11 years ago
fonsinchen
c45cfa22a6
(svn r25346) -Codechange: Glue between stations and flow stats
11 years ago
fonsinchen
db671ffb86
(svn r25346) -Codechange: Glue between stations and flow stats
11 years ago
rubidium
6b746167e4
(svn r25259) -Codechange: track capacities and usage of links
12 years ago
rubidium
3947453277
(svn r25259) -Codechange: track capacities and usage of links
12 years ago
rubidium
84ca041564
(svn r25008) -Codechange: Make CargoList::Truncate behave similarly to CargoList::MoveTo, i.e. pass the amount to truncate (fonsinchen)
12 years ago
rubidium
2795ed5b09
(svn r25008) -Codechange: Make CargoList::Truncate behave similarly to CargoList::MoveTo, i.e. pass the amount to truncate (fonsinchen)
12 years ago
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
planetmaker
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
alberth
19adc87262
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
12 years ago
alberth
732e073261
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
12 years ago
rubidium
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
rubidium
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
michi_cc
fc8633e1ac
(svn r23415) -Feature: Infrastructure maintenance costs.
13 years ago
michi_cc
d3b7b89493
(svn r23415) -Feature: Infrastructure maintenance costs.
13 years ago
rubidium
bec64ece5a
(svn r23199) -Fix [FS#4822]: oil rigs that "expired" did not get removed from the station list
13 years ago
rubidium
fb63543e2a
(svn r23199) -Fix [FS#4822]: oil rigs that "expired" did not get removed from the station list
13 years ago
terkhen
7e0daae1ec
(svn r22567) -Codechange: Store persistent storages inside a pool.
13 years ago
terkhen
00e5c1df18
(svn r22567) -Codechange: Store persistent storages inside a pool.
13 years ago
rubidium
6e9122828e
(svn r22406) -Document: some more "random-ish" tidbits
14 years ago
rubidium
5a620d1c65
(svn r22406) -Document: some more "random-ish" tidbits
14 years ago
smatz
c85e1c3089
(svn r22116) -Codechange: use PoolBase::Clean() at more places
14 years ago
smatz
756cc6cf65
(svn r22116) -Codechange: use PoolBase::Clean() at more places
14 years ago
rubidium
7e4ff17e35
(svn r22111) -Codechange/fix-ish: upon cleaning a pool a destructor should not delete items from other pools
14 years ago
rubidium
68bc93f950
(svn r22111) -Codechange/fix-ish: upon cleaning a pool a destructor should not delete items from other pools
14 years ago
rubidium
701bd8848a
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
14 years ago
rubidium
faf5d899f7
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
14 years ago
rubidium
0cf2ef83f0
(svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s].
14 years ago
rubidium
9ca4b629cd
(svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s].
14 years ago
rubidium
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
rubidium
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
alberth
9f3845227e
(svn r21273) -Codechange: Return values should start at the same line.
14 years ago
alberth
ab50f74d7f
(svn r21273) -Codechange: Return values should start at the same line.
14 years ago
rubidium
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
rubidium
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
rubidium
1664ac1eb5
(svn r20772) -Codechange: use packed VehicleListIdentifiers as window numbers
14 years ago
rubidium
f5128695c5
(svn r20772) -Codechange: use packed VehicleListIdentifiers as window numbers
14 years ago
frosch
c18839704b
(svn r20286) -Codechange: Unify end of doxygen comments.
14 years ago
frosch
4bd32799f1
(svn r20286) -Codechange: Unify end of doxygen comments.
14 years ago
frosch
5b86c79fce
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
frosch
ed4f806f1d
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
smatz
ba43c0f5dd
(svn r19958) -Codechange: move common code from Waypoint and Station destructors to BaseStation destructor
15 years ago
smatz
e71fd4bb57
(svn r19958) -Codechange: move common code from Waypoint and Station destructors to BaseStation destructor
15 years ago
smatz
a6232ad532
(svn r19957) -Codechange: remove VLW_WAYPOINT_LIST
15 years ago
smatz
c4175b752a
(svn r19957) -Codechange: remove VLW_WAYPOINT_LIST
15 years ago
smatz
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
15 years ago
smatz
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
15 years ago
yexo
22a27d3b62
(svn r19455) -Codechange: split all airport information in Station to a seperate class
15 years ago
yexo
c4a88ce022
(svn r19455) -Codechange: split all airport information in Station to a seperate class
15 years ago
yexo
fadc8a3fee
(svn r19351) -Codechange: use TileArea for AfterRemoveRect
15 years ago
yexo
bf6167710f
(svn r19351) -Codechange: use TileArea for AfterRemoveRect
15 years ago
alberth
beb46d1a7f
(svn r19350) -Codechange: StationRect::BeforeAddRect() returns a CommandCost.
15 years ago
alberth
6a3dbaf99a
(svn r19350) -Codechange: StationRect::BeforeAddRect() returns a CommandCost.
15 years ago
alberth
1f2a0c3a77
(svn r19335) -Codechange: StationRect::BeforeAddTile() returns a CommandCost.
15 years ago
alberth
d4b748e27e
(svn r19335) -Codechange: StationRect::BeforeAddTile() returns a CommandCost.
15 years ago
alberth
26d53fbb5f
(svn r19334) -Codechange: method-call codestyle fixes, and introduction of const reference formal parameter.
15 years ago
alberth
993c9e6f62
(svn r19334) -Codechange: method-call codestyle fixes, and introduction of const reference formal parameter.
15 years ago
yexo
80982cc91b
(svn r19198) -Codechange: store the size of stations in savegames
15 years ago
yexo
698737f485
(svn r19198) -Codechange: store the size of stations in savegames
15 years ago
alberth
830c42c3b5
(svn r19038) -Codechange: Move TileArea methods to their own file.
15 years ago
alberth
05388c953a
(svn r19038) -Codechange: Move TileArea methods to their own file.
15 years ago
rubidium
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
rubidium
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
yexo
84cd40a483
(svn r18807) -Codechange: introduce AirportSpec and move several non-statemachine-related variables to there
15 years ago
yexo
d669801f1d
(svn r18807) -Codechange: introduce AirportSpec and move several non-statemachine-related variables to there
15 years ago
rubidium
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
rubidium
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
frosch
992bc6c345
(svn r18381) -Codechange: Add RoadVehicle::IsBus() to simplify some stuff.
15 years ago
frosch
59f9163e37
(svn r18381) -Codechange: Add RoadVehicle::IsBus() to simplify some stuff.
15 years ago
rubidium
0f7cee89d8
(svn r18377) -Codechange: add 'cache' of the tile area of truck and bus stops.
15 years ago
rubidium
81062163a2
(svn r18377) -Codechange: add 'cache' of the tile area of truck and bus stops.
15 years ago
rubidium
da30e736ca
(svn r18330) -Cleanup: remove some unneeded includes
15 years ago
rubidium
b00a5f1069
(svn r18330) -Cleanup: remove some unneeded includes
15 years ago
rubidium
8234230f9e
(svn r17804) -Codechange: move the CargoPacket 'invalidation' when stations get removed to CargoPacket.
15 years ago
rubidium
62a6e9509b
(svn r17804) -Codechange: move the CargoPacket 'invalidation' when stations get removed to CargoPacket.
15 years ago
rubidium
982b8ee5fc
(svn r17693) -Cleanup: remove some unneeded includes
15 years ago
rubidium
d6cded5380
(svn r17693) -Cleanup: remove some unneeded includes
15 years ago