Commit Graph

651 Commits (fe730bce316520cb84c4e0594a337a64ac21ddb2)

Author SHA1 Message Date
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
peter1138 72b72dbec3 Add: Press ctrl to build diagonal rivers in scenario editor. 5 years ago
Jonathan G Rennison 7ff252c58d Merge branch 'master' into jgrpp
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h
5 years ago
SamuXarick 4adb91202d Fix: Remove desert around lakes upon generation 5 years ago
Jonathan G Rennison e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
6 years ago
Charles Pigott 52ed3bcbaa Remove: A few bits of dead code 6 years ago
Jonathan G Rennison 9e1e074c2b Update existing assertions to log tile information where suitable 6 years ago
Jonathan G Rennison ad1c402ad8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
6 years ago
J0anJosep 79a551a83c Codechange: Use TileAddBy(Diag)Dir when possible. 6 years ago
Jonathan G Rennison 1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 6 years ago
Michael Lutz f240274b7e Codechange: Replace magic numbers with the proper enum. 6 years ago
Jonathan G Rennison 385a2552e9 Merge branch 'enhanced_viewport_overlay' into jgrpp 6 years ago
Jonathan G Rennison 864d94d2c5 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/industry_cmd.cpp
#	src/vehicle.cpp
6 years ago
peter1138 50fb460203 (svn r27973) -Fix: [FS#6662] Avoid tile operations outside map border when building lock. 6 years ago
peter1138 c46e470f07 (svn r27973) -Fix: [FS#6662] Avoid tile operations outside map border when building lock. 6 years ago
Jonathan G Rennison f03de4bcc1 Fix not being allowed to build docks, ship depots, when removing water is disabled 7 years ago
Jonathan G Rennison 2574e46df8 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/smallmap_gui.cpp
7 years ago
Jonathan G Rennison f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
7 years ago
frosch b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
frosch a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
Jonathan G Rennison 4db69283c1 Add setting to disable removing sea/rivers 7 years ago
Jonathan G Rennison 591d2ee8b9 Merge branch 'ingame_rivers' into jgrpp
Conflicts:
	src/settings_gui.cpp
	src/settings_type.h
9 years ago
Jonathan G Rennison 9c75a3c477 Enable building rivers in-game.
Controlled by setting, default off.
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
frosch 9c75b61e5f (svn r27254) -Fix [FS#6264]: When building a lock on DC_AUTO-removable water-based objects, the water class was always set to canal. 9 years ago
frosch 7e12a1a985 (svn r27254) -Fix [FS#6264]: When building a lock on DC_AUTO-removable water-based objects, the water class was always set to canal. 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 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
planetmaker 0f44dfe473 (svn r26344) -Change [FS#5907]: Do not flood shores of type MP_TREE needlessly (MJP) 10 years ago
planetmaker 40f61eaf15 (svn r26344) -Change [FS#5907]: Do not flood shores of type MP_TREE needlessly (MJP) 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
planetmaker 83c2c96b74 (svn r25229) -Feature: [NewGRF] Variable 0x82 for canals and rivers (dike map) 11 years ago
planetmaker a8ba748434 (svn r25229) -Feature: [NewGRF] Variable 0x82 for canals and rivers (dike map) 11 years ago
frosch 0278d192c6 (svn r25220) -Change [FS#Eddi]: Consider map border as water wrt. river/canal continuation. 11 years ago
frosch 02924a1d3e (svn r25220) -Change [FS#Eddi]: Consider map border as water wrt. river/canal continuation. 11 years ago
rubidium 5f6e789e1f (svn r24972) -Fix [FS#5258]: do not make overbuilding rivers with canals insanely expensive; there is no real need to fill the river with dirt first, just excavate it a bit and build borders 11 years ago
rubidium 00530f4ccf (svn r24972) -Fix [FS#5258]: do not make overbuilding rivers with canals insanely expensive; there is no real need to fill the river with dirt first, just excavate it a bit and build borders 11 years ago
planetmaker c84ca4d500 (svn r24924) -Fix (r24923): Make sure that autoslope on steep coast tiles cannot not leave invalid canals 12 years ago
planetmaker 9823fac63b (svn r24924) -Fix (r24923): Make sure that autoslope on steep coast tiles cannot not leave invalid canals 12 years ago
planetmaker e264ab19f9 (svn r24923) -Fix [FS#5441]: When an object built on a river is removed, restore the river, if possible also on slopes (based on patch by Supercheese) 12 years ago
planetmaker 42883b9543 (svn r24923) -Fix [FS#5441]: When an object built on a river is removed, restore the river, if possible also on slopes (based on patch by Supercheese) 12 years ago
frosch 336a93a9d8 (svn r24846) -Add: Advanced settings to disable certain sound effects. 12 years ago
frosch 3ce8d2ce70 (svn r24846) -Add: Advanced settings to disable certain sound effects. 12 years ago
frosch 2aa43d6c8b (svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead. 12 years ago
frosch a8c88f43b6 (svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead. 12 years ago
frosch 808f1151c2 (svn r23920) -Fix: Consider only the middle tile of a lock for lock-infrastructure costs. The other two tiles may be owned by other companies. Also do not count the middle tile of a lock as canal, independent of whether it is build on ground or river slope. 12 years ago
frosch 07f69d8b88 (svn r23920) -Fix: Consider only the middle tile of a lock for lock-infrastructure costs. The other two tiles may be owned by other companies. Also do not count the middle tile of a lock as canal, independent of whether it is build on ground or river slope. 12 years ago
rubidium 0cfe86cead (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 13 years ago
rubidium e40eb8177a (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 13 years ago
yexo efe0fcf48d (svn r23725) -Fix (r23723): compile before commit 13 years ago
yexo f5caf142c0 (svn r23725) -Fix (r23723): compile before commit 13 years ago
yexo f884be58e5 (svn r23724) -Codechange: split of the check to see if ambient sounds are enabled to a header file allowing compilers to inline that check 13 years ago
yexo 5f79b4c5d1 (svn r23724) -Codechange: split of the check to see if ambient sounds are enabled to a header file allowing compilers to inline that check 13 years ago
yexo 7975bedc23 (svn r23723) -Codechange: speedup flood checks a bit 13 years ago
yexo b9e19cc6c1 (svn r23723) -Codechange: speedup flood checks a bit 13 years ago
michi_cc 0e273d27ae (svn r23686) -Fix [FS#4921] (r23413): Infrastructure count of canals/locks/ship depots wasn't updated properly when a company went into bankruptcy or was taken over. 13 years ago
michi_cc 24d530b55d (svn r23686) -Fix [FS#4921] (r23413): Infrastructure count of canals/locks/ship depots wasn't updated properly when a company went into bankruptcy or was taken over. 13 years ago
truebrain bc78328918 (svn r23622) -Add: a set of events to trigger in a GameScript 13 years ago
truebrain 77b7366c29 (svn r23622) -Add: a set of events to trigger in a GameScript 13 years ago
planetmaker 38c6c723f3 (svn r23512) -Change [FS#4872]: Allow to place locks also on river rapids and restore rivers, if locks are deleted 13 years ago
planetmaker 8c48fd1fe5 (svn r23512) -Change [FS#4872]: Allow to place locks also on river rapids and restore rivers, if locks are deleted 13 years ago
frosch 8b9d2a8a47 (svn r23443) -Fix (r23413): Building of locks in SE failed. 13 years ago
frosch 85ba182fde (svn r23443) -Fix (r23413): Building of locks in SE failed. 13 years ago
michi_cc 796fe54a2f (svn r23413) -Add: Company infrastructure counts for canals. 13 years ago
michi_cc c06bbb4863 (svn r23413) -Add: Company infrastructure counts for canals. 13 years ago
truebrain af1b3cc070 (svn r23355) -Codechange: rename all AI* to Script* (Rubidium) 13 years ago
truebrain 98103121d4 (svn r23355) -Codechange: rename all AI* to Script* (Rubidium) 13 years ago
rubidium 11bfbc2e02 (svn r23284) -Fix [FS#4845]: Pathfinders go haywire when you build a lock over a ship going perpendicular to the axis of the new lock 13 years ago
rubidium 56a2c4b177 (svn r23284) -Fix [FS#4845]: Pathfinders go haywire when you build a lock over a ship going perpendicular to the axis of the new lock 13 years ago
yexo 36e61e08b3 (svn r23160) -Fix: wrong comments in a lot of TileTypeProcs definitions 13 years ago
yexo 6a272233b3 (svn r23160) -Fix: wrong comments in a lot of TileTypeProcs definitions 13 years ago
michi_cc 109d15410e (svn r23116) -Fix (r23114): Ambient sound effect callback was called for unsupported tile types. 13 years ago
michi_cc 3e016e4254 (svn r23116) -Fix (r23114): Ambient sound effect callback was called for unsupported tile types. 13 years ago
michi_cc 84a103e112 (svn r23114) -Feature: [NewGRF] Ambient sound effect callback. 13 years ago
michi_cc 707b0f48e6 (svn r23114) -Feature: [NewGRF] Ambient sound effect callback. 13 years ago
rubidium 0e2d2b2317 (svn r23108) -Codechange: more uint -> int / byte -> int conversions for Z related variables 13 years ago
rubidium 2a2c102b0b (svn r23108) -Codechange: more uint -> int / byte -> int conversions for Z related variables 13 years ago
rubidium fb9fb416a1 (svn r23107) -Codechange: let GetSlopePixelZ and TerraformTile tile type functions use int z as well 13 years ago
rubidium 459c9523e8 (svn r23107) -Codechange: let GetSlopePixelZ and TerraformTile tile type functions use int z as well 13 years ago
rubidium 70faeeaba9 (svn r23106) -Codechange: pass int* to GetTileSlope and friends 13 years ago
rubidium 19eabdba2c (svn r23106) -Codechange: pass int* to GetTileSlope and friends 13 years ago
rubidium db14361d28 (svn r23099) -Codechange: remove pointless multiplications by TILE_HEIGHT for the water/river code 13 years ago
rubidium 0b6dbaf664 (svn r23099) -Codechange: remove pointless multiplications by TILE_HEIGHT for the water/river code 13 years ago
rubidium f7297d5c3a (svn r23094) -Codechange: add a default NULL to GetFoundationSlope and use it 13 years ago
rubidium ecbc56a677 (svn r23094) -Codechange: add a default NULL to GetFoundationSlope and use it 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
michi_cc 5477ac3eb1 (svn r22773) -Add: Some grass around rivers in desert areas. 13 years ago
michi_cc 4261e8fdfd (svn r22773) -Add: Some grass around rivers in desert areas. 13 years ago
frosch ba358638a8 (svn r22646) -Codechange: Simplify MP_WATER map accessors, esp. for locks and depots. (based on patched by adf88 and michi_cc) 13 years ago
frosch a7f7a97825 (svn r22646) -Codechange: Simplify MP_WATER map accessors, esp. for locks and depots. (based on patched by adf88 and michi_cc) 13 years ago
michi_cc f182f6e675 (svn r22638) -Fix: Keep the previous owner of the upper and lower lock parts if they are built on existing water. 13 years ago
michi_cc 662a0a9cd3 (svn r22638) -Fix: Keep the previous owner of the upper and lower lock parts if they are built on existing water. 13 years ago
frosch 3e619faeaf (svn r22110) -Codechange: Remove WaterDrawTileStruct and use DrawTileSprites/DrawTileSeqStruct instead. 13 years ago
frosch f575b45bae (svn r22110) -Codechange: Remove WaterDrawTileStruct and use DrawTileSprites/DrawTileSeqStruct instead. 13 years ago
frosch 415724ff38 (svn r22108) -Codechange: Replace some magic with some other magic though less easy to break. 13 years ago
frosch 9e59436c61 (svn r22108) -Codechange: Replace some magic with some other magic though less easy to break. 13 years ago
frosch 9f8a684460 (svn r22107) -Cleanup (r1903): Remove unused struct. 13 years ago
frosch 1dd6d037ba (svn r22107) -Cleanup (r1903): Remove unused struct. 13 years ago
rubidium cb2c7f871f (svn r22018) -Cleanup: remove some (now) unneeded includes of functions.h 14 years ago
rubidium bc3ce1e53b (svn r22018) -Cleanup: remove some (now) unneeded includes of functions.h 14 years ago
planetmaker a66e32efb5 (svn r21993) -Fix (r19720): When building a lock on dry land costs for clearing water were deducted rather than for building canals 14 years ago
planetmaker afad7920ef (svn r21993) -Fix (r19720): When building a lock on dry land costs for clearing water were deducted rather than for building canals 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
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
frosch 39f95fabe2 (svn r20763) -Fix [FS#4113](r20749): The bridgetest on building shipdepots can no longer rely on being only called for clear water tiles. 14 years ago
frosch b57a3ae5ec (svn r20763) -Fix [FS#4113](r20749): The bridgetest on building shipdepots can no longer rely on being only called for clear water tiles. 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
yexo 66d57b96a8 (svn r20748) -Fix: overbuilding an object tile with sea under it with a canal didn't take the cost for clearing the sea into account 14 years ago
yexo 0e250f2bdf (svn r20748) -Fix: overbuilding an object tile with sea under it with a canal didn't take the cost for clearing the sea into account 14 years ago
frosch b170aa4b83 (svn r20741) -Cleanup: Use IsTileOnWater() in more places. 14 years ago
frosch e9cd81953a (svn r20741) -Cleanup: Use IsTileOnWater() in more places. 14 years ago
rubidium b79c5b5f84 (svn r20640) -Add: support for water under objects 14 years ago
rubidium 50769995c7 (svn r20640) -Add: support for water under objects 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
rubidium 360d6daf34 (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 14 years ago
rubidium 30f2afac9b (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 14 years ago
rubidium c462611488 (svn r20631) -Codechange: generalise IsIndustryTileOnWater + simplify so related code 14 years ago
rubidium 08a41c6ee5 (svn r20631) -Codechange: generalise IsIndustryTileOnWater + simplify so related code 14 years ago
yexo e7f5780683 (svn r20559) -Fix [FS#4045]: make sure that all vehicles are build in the most northern depot/hangar tile 14 years ago
yexo 85740a0283 (svn r20559) -Fix [FS#4045]: make sure that all vehicles are build in the most northern depot/hangar tile 14 years ago
yexo 5363eff08c (svn r20527) -Codechange: move the flood code and remove some redundant checks 14 years ago
yexo cc45b99866 (svn r20527) -Codechange: move the flood code and remove some redundant checks 14 years ago
michi_cc 95f5ad8c79 (svn r20353) -Add: [NewGRF] Support for callback 0x147 ("add sprite offset") for canals. 14 years ago
michi_cc 4d927af488 (svn r20353) -Add: [NewGRF] Support for callback 0x147 ("add sprite offset") for canals. 14 years ago
michi_cc 33ab403be8 (svn r20352) -Add: [NewGRF] Support for property 09, feature 05, i.e alternate canal sprite layout. 14 years ago
michi_cc bd2f7e998c (svn r20352) -Add: [NewGRF] Support for property 09, feature 05, i.e alternate canal sprite layout. 14 years ago
michi_cc 80943c5ec7 (svn r20351) -Codechange: Uncouple water lock and depot drawing. 14 years ago
michi_cc f67c727c68 (svn r20351) -Codechange: Uncouple water lock and depot drawing. 14 years ago
terkhen 04134c1e51 (svn r20289) -Codechange: Unify fall through coding style. 14 years ago
terkhen 80c43f52e8 (svn r20289) -Codechange: Unify fall through coding style. 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 8c85b4ce3d (svn r20281) -Codechange: unify case scope closure + break coding style 14 years ago
rubidium e356cb9405 (svn r20281) -Codechange: unify case scope closure + break coding style 14 years ago
alberth c376ddacd2 (svn r20109) -Codechange: Make GetFloodingBehaviour() globally usable. 14 years ago
alberth 7e0e7fb0e5 (svn r20109) -Codechange: Make GetFloodingBehaviour() globally usable. 14 years ago
yexo ec723b7744 (svn r20003) -Feature [FS#3886]: [NewGRF] var 43 depot build date for railtypes 14 years ago
yexo 9cfb61adf5 (svn r20003) -Feature [FS#3886]: [NewGRF] var 43 depot build date for railtypes 14 years ago
frosch a5bea603ea (svn r19931) -Fix (r19914): Convert assertion in Backup<> destructor into DEBUG() output. It was triggered on exceptions, especially when aborting world generation. 14 years ago