dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,670 Commits 1 Branch 0 Tags
196b78af3020e4616ab117e5fd3bc26176bcfc88
Commit Graph

180 Commits

Author SHA1 Message Date
Jonathan G Rennison
196b78af30 Merge branch 'zoning' into jgrpp 2015-11-01 16:08:06 +00:00
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.
 2015-11-01 16:07:55 +00:00
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
 2015-08-05 21:54:11 +01:00
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
 2015-08-05 21:25:13 +01:00
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
 2015-08-05 21:24:30 +01:00
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.
 2015-07-28 01:36:52 +01:00
frosch
a14b836bf2 (svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects. 2015-03-07 18:27:01 +00:00
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) 2014-10-21 19:16:47 +00:00
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 2014-04-23 20:13:33 +00:00
fonsinchen
4b726930f1 (svn r26343) -Fix: Rewrite SmallStack so that it doesn't use a pool and is reentrant. 2014-02-16 16:25:18 +00:00
fonsinchen
b31a1119fb (svn r26286) -Fix: Thoroughly erase dead flows. 2014-01-29 19:55:29 +00:00
fonsinchen
b908128ffb (svn r25890) -Codechange: define a smallstack for station IDs 2013-10-20 13:47:11 +00:00
fonsinchen
5733569153 (svn r25435) -Fix: reroute cargo in vehicles if station is deleted 2013-06-23 08:29:28 +00:00
fonsinchen
f022550df9 (svn r25361) -Feature: distribute cargo according to plan given by linkgraph 2013-06-09 13:03:48 +00:00
fonsinchen
9f49617eed (svn r25359) -Codechange: schedule jobs when tracking capacities of links 2013-06-09 13:02:40 +00:00
fonsinchen
c45cfa22a6 (svn r25346) -Codechange: Glue between stations and flow stats 2013-06-09 12:49:47 +00:00
rubidium
6b746167e4 (svn r25259) -Codechange: track capacities and usage of links 2013-05-19 14:22:04 +00:00
rubidium
84ca041564 (svn r25008) -Codechange: Make CargoList::Truncate behave similarly to CargoList::MoveTo, i.e. pass the amount to truncate (fonsinchen) 2013-02-17 14:10:15 +00:00
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
alberth
19adc87262 (svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb) 2012-12-01 13:12:39 +00:00
rubidium
d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00
michi_cc
fc8633e1ac (svn r23415) -Feature: Infrastructure maintenance costs. 2011-12-03 23:40:46 +00:00
rubidium
bec64ece5a (svn r23199) -Fix [FS#4822]: oil rigs that "expired" did not get removed from the station list 2011-11-12 18:06:34 +00:00
terkhen
7e0daae1ec (svn r22567) -Codechange: Store persistent storages inside a pool. 2011-06-12 20:47:45 +00:00
rubidium
6e9122828e (svn r22406) -Document: some more "random-ish" tidbits 2011-05-01 19:51:52 +00:00
smatz
c85e1c3089 (svn r22116) -Codechange: use PoolBase::Clean() at more places 2011-02-19 23:05:47 +00:00
rubidium
7e4ff17e35 (svn r22111) -Codechange/fix-ish: upon cleaning a pool a destructor should not delete items from other pools 2011-02-19 18:02:17 +00:00
rubidium
701bd8848a (svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h 2011-02-07 22:29:47 +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
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 2010-12-12 17:36:34 +00:00
alberth
9f3845227e (svn r21273) -Codechange: Return values should start at the same line. 2010-11-20 15:44:24 +00:00
rubidium
86a3fbb287 (svn r20774) -Fix [FS#4116]: assertion triggered when removing a station owned by nobody when the local company is "spectator" as well 2010-09-09 10:55:05 +00:00
rubidium
1664ac1eb5 (svn r20772) -Codechange: use packed VehicleListIdentifiers as window numbers 2010-09-08 21:37:13 +00:00
frosch
c18839704b (svn r20286) -Codechange: Unify end of doxygen comments. 2010-08-01 19:44:49 +00:00
frosch
5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
smatz
ba43c0f5dd (svn r19958) -Codechange: move common code from Waypoint and Station destructors to BaseStation destructor 2010-06-11 00:20:24 +00:00
smatz
a6232ad532 (svn r19957) -Codechange: remove VLW_WAYPOINT_LIST 2010-06-11 00:18:28 +00:00
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
 2010-06-10 23:52:09 +00:00
yexo
22a27d3b62 (svn r19455) -Codechange: split all airport information in Station to a seperate class 2010-03-18 21:02:20 +00:00
yexo
fadc8a3fee (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
1f2a0c3a77 (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
yexo
80982cc91b (svn r19198) -Codechange: store the size of stations in savegames 2010-02-22 14:17:07 +00:00
alberth
830c42c3b5 (svn r19038) -Codechange: Move TileArea methods to their own file. 2010-02-06 12:56:13 +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
yexo
84cd40a483 (svn r18807) -Codechange: introduce AirportSpec and move several non-statemachine-related variables to there 2010-01-15 12:08:08 +00:00
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.
 2010-01-04 21:10:20 +00:00
frosch
992bc6c345 (svn r18381) -Codechange: Add RoadVehicle::IsBus() to simplify some stuff. 2009-12-02 17:37:02 +00:00
rubidium
0f7cee89d8 (svn r18377) -Codechange: add 'cache' of the tile area of truck and bus stops. 2009-12-02 16:20:44 +00:00