Commit Graph

244 Commits (jgrpp)

Author SHA1 Message Date
Jonathan G Rennison c42ce832ae Fix viewport signs and text effects marking viewports dirty unnecessarily
* When at high zoom levels where the signs are not shown
* Where the sign type is disabled in the display options
4 years ago
Jonathan G Rennison 7960db35f2 Merge branch 'master' into jgrpp
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
4 years ago
glx ddabfed1cd Codechange: Replace station related FOR_ALL with range-based for loops 5 years ago
Jonathan G Rennison fe9b024f1a Merge branch 'master' into jgrpp
# Conflicts:
#	src/signs_cmd.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
#	src/waypoint_cmd.cpp
5 years ago
Niels Martin Hansen 9900af38f5
Fix #7847: Use ViewportSign coordinates for sign Kdtree coordinates (#7849)
Ensure the same coordinates are used for station/town/player signs regardless of how the landscape changes below it after the coordinates were first determined.

By keeping track of whether each ViewportSign is valid for Kdtree use (and only ever registering the viewport sign when the object is valid) a lot of code can be simplified and become more robust at the same time.
5 years ago
Jonathan G Rennison acc946f505 Always allow buoys under bridges 5 years ago
Jonathan G Rennison cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
5 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
stormcone 2817cd41f1 Fix #7250: Viewport kdtree not being updated for waypoints when sign moved.
Code based on the patch by JGRennison.
JGRennison/OpenTTD-patches@ac84f34062
5 years ago
Jonathan G Rennison d3e0c3787f Merge branch 'master' into jgrpp-nrt
Merge trunk multiple docks implementation

# Conflicts:
#	docs/landscape_grid.html
#	src/order_cmd.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_order.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/tunnelbridge_cmd.cpp
5 years ago
peter1138 f538179878 Feature: Multi-tile docks and docking points. 5 years ago
Jonathan G Rennison 0d93ecb6bf Merge branch 'master' into jgrpp
# Conflicts:
#	src/core/alloc_type.hpp
#	src/group_gui.cpp
#	src/newgrf.cpp
#	src/saveload/economy_sl.cpp
#	src/saveload/map_sl.cpp
#	src/station_cmd.cpp
5 years ago
PeterN abe8cf4985
Codechange: Replace duplicated code with TileArea::Expand() (#7467) 5 years ago
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Jonathan G Rennison 070160af40 Save point used when adding station to viewport kd tree, use for removal 5 years ago
Jonathan G Rennison 53ff27370d Do not update viewport sign kd tree in network dedicated mode, or during savegame conversion 5 years ago
Jonathan G Rennison 5e6d283463 Merge branch 'master' into jgrpp
Remove the viewport sign cache as this is now superseded by the kd tree
implementation

# Conflicts:
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/misc.cpp
#	src/pathfinder/follow_track.hpp
#	src/pbs.cpp
#	src/rail_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/thread/thread_morphos.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
5 years ago
Niels Martin Hansen e8d397e4ee Codechange: Make a merged k-d tree index of all viewport signs 5 years ago
Jonathan G Rennison 698409381e Cache viewport station/waypoint sign infomation 5 years ago
Jonathan G Rennison 8b37e5aac2 Implement custom bridge pillar flag support
Add bridge NewGRF property to set bridge pillars
Add station NewGRF property to disallow bridge pillars

Set values for default bridges and stations
6 years ago
J0an Josep 67f6bcdc9b Fix #6805: Update CmdBuilRailWaypoint bits. 6 years ago
Jonathan G Rennison ef0a0b0f8e Implement rail station property 1B, bridge clearance information 6 years ago
Jonathan G Rennison 912ddc85d4 Merge remote-tracking branch 'J0anJosep/MapArrayGrid-m8' into jgrpp
# Conflicts:
#	docs/landscape_grid.html
6 years ago
J0an Josep b843373245 Fix #6805: Update CmdBuilRailWaypoint bits. 6 years ago
Jonathan G Rennison 4bdbf3863d Add setting to allow placing stations under bridges 6 years ago
Jonathan G Rennison ac69b746ab Merge branch 'master' into jgrpp
# Conflicts:
#	src/gfxinit.cpp
#	src/saveload/saveload.cpp
7 years ago
peter1138 3aad5abfe9 (svn r27785) -Fix [FS#6508]: Buoys not always drawn after being placed depending on zoom level (Samu). 7 years ago
peter1138 c366425de6 (svn r27785) -Fix [FS#6508]: Buoys not always drawn after being placed depending on zoom level (Samu). 7 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
rubidium dc2b4f2498 (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 10 years ago
rubidium 9daf7e749c (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 10 years ago
rubidium 034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 10 years ago
rubidium 9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 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 10 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 10 years ago
zuu e124838db5 (svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro) 11 years ago
zuu dfb5663313 (svn r25849) -Codechange: Introduce IsTileFlat to not compute full slope information for situations when we only want to know if a tile is flat or not (cirdan, LordAro) 11 years ago
frosch 3d7ac6af1a (svn r24166) -Codechange: Turn NewGRFClass::Get(Tid, uint) and GetCount(Tid) into non-static members GetSpec(uint) and GetSpecCount(). 12 years ago
frosch 0f0e7e43cf (svn r24166) -Codechange: Turn NewGRFClass::Get(Tid, uint) and GetCount(Tid) into non-static members GetSpec(uint) and GetSpecCount(). 12 years ago
alberth 06597e684c (svn r23704) -Doc: Doxygen comment fixes and additions. 13 years ago
alberth 4af8c2d5e1 (svn r23704) -Doc: Doxygen comment fixes and additions. 13 years ago
michi_cc bf5ef7537e (svn r23414) -Add: Company infrastructure counts for stations/airports. 13 years ago
michi_cc f98312eb77 (svn r23414) -Add: Company infrastructure counts for stations/airports. 13 years ago
peter1138 0043123c33 (svn r23319) -Fix (r23316): Offsets of viewport signs were not scaled up. 13 years ago
peter1138 3e1d070413 (svn r23319) -Fix (r23316): Offsets of viewport signs were not scaled up. 13 years ago
rubidium bcb93b3b75 (svn r23093) -Codechange: add a default NULL for the Z of GetTileSlope and use it 13 years ago
rubidium 2ed0f93bfb (svn r23093) -Codechange: add a default NULL for the Z of GetTileSlope and use it 13 years ago
rubidium de980ef0f9 (svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight) 13 years ago
rubidium 7757a2ed40 (svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight) 13 years ago
rubidium 87272273b5 (svn r22405) -Document: some more "random-ish" tidbits 13 years ago
rubidium 1a515e6344 (svn r22405) -Document: some more "random-ish" tidbits 13 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
smatz 4aa45d8742 (svn r21953) -Remove [FS#4456]: the non-uniform stations setting. Support for uniform stations has been broken for over a year 14 years ago
smatz 3057a26fd5 (svn r21953) -Remove [FS#4456]: the non-uniform stations setting. Support for uniform stations has been broken for over a year 14 years ago
terkhen 9df9575e72 (svn r21806) -Codechange: Correct additional appearances of the same typo. 14 years ago
terkhen 53c9846f14 (svn r21806) -Codechange: Correct additional appearances of the same typo. 14 years ago
rubidium 7267a4de2c (svn r21415) -Codechange: limit station/waypoint name by amount of characters, not bytes 14 years ago
rubidium 44d1c55347 (svn r21415) -Codechange: limit station/waypoint name by amount of characters, not bytes 14 years ago
frosch 5a355daa5b (svn r21290) -Codechange: Add HasTileWaterGround() to deduplicate some tests. 14 years ago
frosch 612516ff76 (svn r21290) -Codechange: Add HasTileWaterGround() to deduplicate some tests. 14 years ago
rubidium 1de34d3103 (svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille) 14 years ago
rubidium af18c30f30 (svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille) 14 years ago
yexo ffe67c9171 (svn r20749) -Fix: allow overbuilding objects with buoys and ship depots 14 years ago
yexo a2ba35f57c (svn r20749) -Fix: allow overbuilding objects with buoys and ship depots 14 years ago
frosch 3db0cc004b (svn r20636) -Codechange: Move MarkTileDirtyByTile() and DeleteAnimatedTile() into MakeWaterKeepingClass(). 14 years ago
frosch 4901d42140 (svn r20636) -Codechange: Move MarkTileDirtyByTile() and DeleteAnimatedTile() into MakeWaterKeepingClass(). 14 years ago
frosch e8ec3de621 (svn r20579) -Change (r1579): Allow removing of buoys if they are only used by own vehicles. 14 years ago
frosch 03ab158935 (svn r20579) -Change (r1579): Allow removing of buoys if they are only used by own vehicles. 14 years ago
rubidium 40ab6a3298 (svn r20406) -Codechange: make StationClass use the new generic class 14 years ago
rubidium edbadde301 (svn r20406) -Codechange: make StationClass use the new generic class 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
rubidium 92648be718 (svn r19798) -Codechange: generalise the waypoint naming method 14 years ago
rubidium 863ff6522b (svn r19798) -Codechange: generalise the waypoint naming method 14 years ago
frosch ed80045221 (svn r19654) -Codechange: Use Extract<> in more places. 14 years ago
frosch 75d4bc947d (svn r19654) -Codechange: Use Extract<> in more places. 14 years ago
alberth 72d62fd6fc (svn r19494) -Codechange: Remove _error_message. 14 years ago
alberth 05d705e077 (svn r19494) -Codechange: Remove _error_message. 14 years ago
alberth d5fe3f96c7 (svn r19405) -Codechange: CheckOwnership() returns a CommandCost. 14 years ago
alberth 7cc68f493d (svn r19405) -Codechange: CheckOwnership() returns a CommandCost. 14 years ago
alberth beb46d1a7f (svn r19350) -Codechange: StationRect::BeforeAddRect() returns a CommandCost. 14 years ago
alberth 6a3dbaf99a (svn r19350) -Codechange: StationRect::BeforeAddRect() returns a CommandCost. 14 years ago
alberth 4c0d4990f5 (svn r19319) -Codechange: EnsureNoVehicleOnGround() returns a CommandCost. 14 years ago
alberth c395b93acd (svn r19319) -Codechange: EnsureNoVehicleOnGround() returns a CommandCost. 14 years ago
alberth 4d9bc56e88 (svn r19275) -Codechange: CanExpandRailStation() returns a CommandCost. 14 years ago
alberth b8f811c7ff (svn r19275) -Codechange: CanExpandRailStation() returns a CommandCost. 14 years ago
alberth 9f437abd40 (svn r19273) -Codechange: Return station joining error message when error is detected. 14 years ago
alberth a4927dcd21 (svn r19273) -Codechange: Return station joining error message when error is detected. 14 years ago
yexo 47527ca67a (svn r18921) -Codechange: make the preconditions for Get/Set CustomStationSpecIndex a bit more strict 15 years ago
yexo 7f998ce80d (svn r18921) -Codechange: make the preconditions for Get/Set CustomStationSpecIndex a bit more strict 15 years ago
yexo a8a4116783 (svn r18692) -Fix: after a company went bankrupt it was impossible to build a new waypoint close to a deleted one until the grey sign was gone 15 years ago
yexo c8c61faff2 (svn r18692) -Fix: after a company went bankrupt it was impossible to build a new waypoint close to a deleted one until the grey sign was gone 15 years ago
rubidium 4ddbe1793e (svn r18379) -Codechange: move the cache updating function to its own header to reduce the include 'pathfinder' dependencies 15 years ago
rubidium 9426f2b173 (svn r18379) -Codechange: move the cache updating function to its own header to reduce the include 'pathfinder' dependencies 15 years ago
rubidium 2f3053508d (svn r18364) -Codechange: move the pathfinders and their related files into a separate directory 15 years ago
rubidium f52e27c688 (svn r18364) -Codechange: move the pathfinders and their related files into a separate directory 15 years ago
frosch 13a72bb345 (svn r18283) -Feature: [NewGRF] Add new price bases for removing industries, building/removing unmovables (new objects), building/removing rail-waypoints/buoys, interacting with town-authority, building foundations, funding primary industries (when not prospecting) and towns.
If a GRF does not set price multipliers for these new prices, but for the previously used ones, the old modifiers will be propagated to the new bases.
15 years ago
frosch 830231e2bd (svn r18283) -Feature: [NewGRF] Add new price bases for removing industries, building/removing unmovables (new objects), building/removing rail-waypoints/buoys, interacting with town-authority, building foundations, funding primary industries (when not prospecting) and towns.
If a GRF does not set price multipliers for these new prices, but for the previously used ones, the old modifiers will be propagated to the new bases.
15 years ago