3050620189
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/autoreplace_cmd.cpp
# src/build_vehicle_gui.cpp
# src/cargotype.cpp
# src/economy.cpp
# src/engine_gui.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/linkgraph/refresh.cpp
# src/linkgraph/refresh.h
# src/newgrf.cpp
# src/newgrf_airporttiles.h
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/newgrf_station.h
# src/order_base.h
# src/order_cmd.cpp
# src/order_func.h
# src/order_gui.cpp
# src/pathfinder/pathfinder_type.h
# src/saveload/afterload.cpp
# src/subsidy_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
5 months ago
952d111b94
Codechange: Split CT_INVALID into CT_INVALID and INVALID_CARGO.
...
INVALID_CARGO is a CargoID and should be used for most purposes in game.
CT_INVALID is a CargoType used for defining default properties.
5 months ago
97e6f3062e
Adding of _t to (u)int types, and WChar to char32_t
...
See: eaae0bb5e
5 months ago
57d4f52c15
Link graph: Use timetable for order-based link refresh travel time estimate
6 months ago
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
11 months ago
56085be9bd
Codechange: Move includes for common STL headers to stdafx.
1 year ago
68ff3fd062
Change: include fmt.h C++ headers in stdafx.h
...
This to prevent compilation issues between runs with and without precompiled
headers. Also remove the headers from the rest of the code base as they are
not needed there anymore, although they do relatively little harm.
1 year ago
dd40fa32df
Fix excessive recursion in link graph refresher with conditional order loops
2 years ago
89181ea9fd
Add setting to increase cost/distance of aircraft linkgraph links
2 years ago
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
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
3330e4cef8
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
6 years ago
00b1fe6246
Cargo type orders: Add support for 64 cargo types
6 years ago
9d5f34fea6
Replace various uses of std::set/map with btree containers.
7 years ago
6031cca2d7
Refactor Link Refresher cargo mask handling.
...
Add some separate helper functions.
Move cargo checks out of LinkRefresher::Run.
8 years ago
3507b51d9e
Initial LinkRefresher support for cargo-specific links.
8 years ago
f769305d7d
(svn r27614) -Codechange: Use a fixed array instead of a map for link refresher cargo capacities. (JGR)
8 years ago
ff96590312
(svn r27614) -Codechange: Use a fixed array instead of a map for link refresher cargo capacities. (JGR)
8 years ago
e2426b22fa
(svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR)
8 years ago
6b2eed0a70
(svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR)
8 years ago
d534c80e94
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
10 years ago
0c2f4bdc2b
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
10 years ago
831fb254f6
(svn r26889) -Feature: Predict links for station-autorefitting vehicles
10 years ago
ce9d75f517
(svn r26889) -Feature: Predict links for station-autorefitting vehicles
10 years ago
11d98f043e
(svn r26549) -Change: better estimation for link capacities during full load
10 years ago
b8381b6b25
(svn r26549) -Change: better estimation for link capacities during full load
10 years ago
b12bf124c7
(svn r26283) -Fix [FS#5878]: Prevent infinite recursion also in RefreshLinks.
11 years ago
21a5571d07
(svn r26283) -Fix [FS#5878]: Prevent infinite recursion also in RefreshLinks.
11 years ago
f6fd21e8e6
(svn r25948) -Fix [FS#5796]: Make sure LinkRefresher doesn't delete the LinkGraph DeleteStaleLinks() is examining.
11 years ago
b83b4ab4c2
(svn r25948) -Fix [FS#5796]: Make sure LinkRefresher doesn't delete the LinkGraph DeleteStaleLinks() is examining.
11 years ago
b5dd83e84f
(svn r25909) -Fix (r25906): That simplification was a bit too much.
11 years ago
3ebe7e3ef9
(svn r25909) -Fix (r25906): That simplification was a bit too much.
11 years ago
6c4e7ab51d
(svn r25908) -Fix: Some documentation for constructors of LinkRefresher::Hop.
11 years ago
9596352830
(svn r25908) -Fix: Some documentation for constructors of LinkRefresher::Hop.
11 years ago
fb7ad743d2
(svn r25906) -Fix: Simplify condition logic in link refresher.
11 years ago
a7f07d50b7
(svn r25906) -Fix: Simplify condition logic in link refresher.
11 years ago
a9f6a1eeb7
(svn r25905) -Codechange: A more robust way of detecting loops during order prediction.
11 years ago
ca0486e410
(svn r25905) -Codechange: A more robust way of detecting loops during order prediction.
11 years ago
d3fa322087
(svn r25904) -Fix: add forgotten files
11 years ago
8ef95222c9
(svn r25904) -Fix: add forgotten files
11 years ago
Jonathan G Rennison
Peter Nelson
Rubidium
S. D. Cloudt
fonsinchen