Commit Graph

105 Commits

Author SHA1 Message Date
Jonathan G Rennison
18a42664fc Merge branch 'master' into jgrpp
Remove 'byte' typedef
2024-05-07 17:21:50 +01:00
Patric Stout
a3cfd23cf9 Codechange: rename byte to uint8_t (#12308) 2024-03-16 23:59:32 +01:00
Jonathan G Rennison
97e6f3062e Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
2024-01-07 17:20:41 +00:00
Jonathan G Rennison
55d78a23be Merge branch 'master' into jgrpp
# Conflicts:
#	src/3rdparty/squirrel/include/squirrel.h
#	src/blitter/32bpp_sse_func.hpp
#	src/bridge_map.h
#	src/clear_map.h
#	src/company_manager_face.h
#	src/console_func.h
#	src/core/bitmath_func.hpp
#	src/core/endian_func.hpp
#	src/core/random_func.hpp
#	src/depot_map.h
#	src/elrail_func.h
#	src/fontcache.h
#	src/industry_map.h
#	src/map_func.h
#	src/newgrf_spritegroup.h
#	src/object_map.h
#	src/rail.h
#	src/rail_map.h
#	src/road_func.h
#	src/road_map.h
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/sl/oldloader.h
#	src/sprite.h
#	src/spritecache.h
#	src/station_func.h
#	src/station_map.h
#	src/story_base.h
#	src/strings_func.h
#	src/tile_cmd.h
#	src/tile_map.h
#	src/tile_type.h
#	src/town.h
#	src/town_map.h
#	src/tree_map.h
#	src/tunnel_map.h
#	src/tunnelbridge_map.h
#	src/vehicle_func.h
#	src/viewport_func.h
#	src/void_map.h
#	src/water.h
#	src/water_map.h
#	src/widget_type.h
2024-01-07 15:00:16 +00:00
Rubidium
3a676a5af0 Codechange: replace static inline with static for non-class functions 2024-01-06 13:37:33 +01:00
Jonathan G Rennison
cc57ac0eff Add pre-check to auxiliary tile loop flooding test 2023-08-17 14:40:07 +01:00
Rubidium
eaae0bb5e7 Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
2023-07-19 19:30:14 +02:00
PeterN
9910240f0e Cleanup: Remove obsolete (Make)EnumPropsT. (#10697)
This was used by the command system to help extract p1/p2 parameters, which no longer happens.
2023-04-23 17:46:14 +01:00
Rubidium
580d0a6343 Codechange: make use of Tile in for all direct map accesses 2023-02-28 07:11:48 +01:00
Jonathan G Rennison
29a1e49c28 Change various asserts to not be included in release builds 2022-10-22 12:34:54 +01:00
J0anJosep
d9a37c915f Cleanup #9725: Replace cmd_helper related functions and remove cmd_helper.h. 2022-02-02 21:30:15 +01:00
Michael Lutz
46bd2f1ced Codechange: Un-bitstuff remaining transport infrastructure commands. 2021-12-16 22:28:32 +01:00
Jonathan G Rennison
f595696e97 Add map bit to suppress water flooding checks
Set if all neighbour tiles are also water
This reduces the overhead of flood checks on large maps
2021-02-21 21:11:35 +00:00
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
2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
edfd378e93 Merge branch 'master' into jgrpp
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
2019-10-05 21:45:54 +01:00
JMcKiern
04f659e768 Fix: Some typos found using codespell 2019-09-29 21:27:32 +01:00
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
2019-07-13 20:34:52 +01:00
peter1138
f538179878 Feature: Multi-tile docks and docking points. 2019-06-30 16:46:32 +02:00
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
2019-03-04 01:18:25 +00:00
Eddi-z
b242a04c7d Fix #7307: Add WaterClass to MP_TREES, set when trees are on coast tiles (#7309)
This allows allows NewGRF object/industry placement rules to treat trees on coast tiles the same as regular bare coast.
2019-03-02 17:33:16 +00:00
Jonathan G Rennison
9e1e074c2b Update existing assertions to log tile information where suitable 2018-07-26 19:13:35 +01:00
HackaLittleBit
dee526c6d6 Chunnel patch 28395: Add: Basic chunnel. Creating tunnels under water.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
2017-03-04 11:48:07 +00:00
rubidium
f3b79480ed (svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable 2014-09-21 11:23:33 +00:00
rubidium
982f5a6aa2 (svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable 2014-09-21 11:23:33 +00:00
planetmaker
38c6c723f3 (svn r23512) -Change [FS#4872]: Allow to place locks also on river rapids and restore rivers, if locks are deleted 2011-12-13 23:01:36 +00:00
planetmaker
8c48fd1fe5 (svn r23512) -Change [FS#4872]: Allow to place locks also on river rapids and restore rivers, if locks are deleted 2011-12-13 23:01:36 +00:00
frosch
bbb9c1e52f (svn r22647) -Codechange: Enhance MP_WATER map accessors with assertions. (adf88) 2011-07-10 13:21:21 +00:00
frosch
3639456cc4 (svn r22647) -Codechange: Enhance MP_WATER map accessors with assertions. (adf88) 2011-07-10 13:21:21 +00:00
frosch
ba358638a8 (svn r22646) -Codechange: Simplify MP_WATER map accessors, esp. for locks and depots. (based on patched by adf88 and michi_cc) 2011-07-10 13:04:04 +00:00
frosch
a7f7a97825 (svn r22646) -Codechange: Simplify MP_WATER map accessors, esp. for locks and depots. (based on patched by adf88 and michi_cc) 2011-07-10 13:04:04 +00:00
michi_cc
f182f6e675 (svn r22638) -Fix: Keep the previous owner of the upper and lower lock parts if they are built on existing water. 2011-07-07 14:16:16 +00:00
michi_cc
662a0a9cd3 (svn r22638) -Fix: Keep the previous owner of the upper and lower lock parts if they are built on existing water. 2011-07-07 14:16:16 +00:00
rubidium
87272273b5 (svn r22405) -Document: some more "random-ish" tidbits 2011-05-01 19:14:12 +00:00
rubidium
1a515e6344 (svn r22405) -Document: some more "random-ish" tidbits 2011-05-01 19:14:12 +00:00
frosch
5a355daa5b (svn r21290) -Codechange: Add HasTileWaterGround() to deduplicate some tests. 2010-11-21 18:38:45 +00:00
frosch
612516ff76 (svn r21290) -Codechange: Add HasTileWaterGround() to deduplicate some tests. 2010-11-21 18:38:45 +00:00
rubidium
d160ca90a1 (svn r20909) -Fix [FS#4137]: don't see coasts as water for object construction 2010-10-08 21:08:38 +00:00
rubidium
7bbc19288f (svn r20909) -Fix [FS#4137]: don't see coasts as water for object construction 2010-10-08 21:08:38 +00:00
frosch
c13035bbbb (svn r20740) -Codechange: Add HasTileWaterClass() to test for tiletypes with WaterClass. 2010-09-05 13:18:26 +00:00
frosch
435c8d33b0 (svn r20740) -Codechange: Add HasTileWaterClass() to test for tiletypes with WaterClass. 2010-09-05 13:18:26 +00:00
rubidium
360d6daf34 (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 2010-08-26 22:01:16 +00:00
rubidium
30f2afac9b (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 2010-08-26 22:01:16 +00:00
rubidium
c462611488 (svn r20631) -Codechange: generalise IsIndustryTileOnWater + simplify so related code 2010-08-26 19:29:20 +00:00
rubidium
08a41c6ee5 (svn r20631) -Codechange: generalise IsIndustryTileOnWater + simplify so related code 2010-08-26 19:29:20 +00:00
rubidium
b18525ad86 (svn r20561) -Fix: compiler warning 2010-08-19 14:26:41 +00:00
rubidium
1fe3ce9993 (svn r20561) -Fix: compiler warning 2010-08-19 14:26:41 +00:00
yexo
e7f5780683 (svn r20559) -Fix [FS#4045]: make sure that all vehicles are build in the most northern depot/hangar tile 2010-08-19 13:44:41 +00:00
yexo
85740a0283 (svn r20559) -Fix [FS#4045]: make sure that all vehicles are build in the most northern depot/hangar tile 2010-08-19 13:44:41 +00:00
rubidium
8975ef1f7b (svn r20446) -Codechange: unify the location of the water class 2010-08-11 14:14:06 +00:00