Commit Graph

31 Commits

Author SHA1 Message Date
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
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
2018-07-02 21:04:06 +01:00
Jonathan G Rennison
00b1fe6246 Cargo type orders: Add support for 64 cargo types 2018-07-02 21:03:53 +01:00
Jonathan G Rennison
9d5f34fea6 Replace various uses of std::set/map with btree containers. 2017-02-08 00:18:09 +00:00
Jonathan G Rennison
6031cca2d7 Refactor Link Refresher cargo mask handling.
Add some separate helper functions.
Move cargo checks out of LinkRefresher::Run.
2016-09-06 22:16:29 +01:00
Jonathan G Rennison
3507b51d9e Initial LinkRefresher support for cargo-specific links. 2016-09-05 00:12:48 +01:00
fonsinchen
f769305d7d (svn r27614) -Codechange: Use a fixed array instead of a map for link refresher cargo capacities. (JGR) 2016-07-10 12:17:00 +00:00
fonsinchen
ff96590312 (svn r27614) -Codechange: Use a fixed array instead of a map for link refresher cargo capacities. (JGR) 2016-07-10 12:17:00 +00:00
fonsinchen
e2426b22fa (svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR) 2016-07-10 11:57:16 +00:00
fonsinchen
6b2eed0a70 (svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR) 2016-07-10 11:57:16 +00:00
rubidium
d534c80e94 (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 2014-10-15 18:31:37 +00:00
rubidium
0c2f4bdc2b (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 2014-10-15 18:31:37 +00:00
fonsinchen
831fb254f6 (svn r26889) -Feature: Predict links for station-autorefitting vehicles 2014-09-21 14:22:32 +00:00
fonsinchen
ce9d75f517 (svn r26889) -Feature: Predict links for station-autorefitting vehicles 2014-09-21 14:22:32 +00:00
fonsinchen
11d98f043e (svn r26549) -Change: better estimation for link capacities during full load 2014-05-01 14:50:52 +00:00
fonsinchen
b8381b6b25 (svn r26549) -Change: better estimation for link capacities during full load 2014-05-01 14:50:52 +00:00
fonsinchen
b12bf124c7 (svn r26283) -Fix [FS#5878]: Prevent infinite recursion also in RefreshLinks. 2014-01-28 19:49:43 +00:00
fonsinchen
21a5571d07 (svn r26283) -Fix [FS#5878]: Prevent infinite recursion also in RefreshLinks. 2014-01-28 19:49:43 +00:00
fonsinchen
f6fd21e8e6 (svn r25948) -Fix [FS#5796]: Make sure LinkRefresher doesn't delete the LinkGraph DeleteStaleLinks() is examining. 2013-11-07 20:50:03 +00:00
fonsinchen
b83b4ab4c2 (svn r25948) -Fix [FS#5796]: Make sure LinkRefresher doesn't delete the LinkGraph DeleteStaleLinks() is examining. 2013-11-07 20:50:03 +00:00
fonsinchen
b5dd83e84f (svn r25909) -Fix (r25906): That simplification was a bit too much. 2013-10-23 17:11:34 +00:00
fonsinchen
3ebe7e3ef9 (svn r25909) -Fix (r25906): That simplification was a bit too much. 2013-10-23 17:11:34 +00:00
fonsinchen
6c4e7ab51d (svn r25908) -Fix: Some documentation for constructors of LinkRefresher::Hop. 2013-10-22 19:25:29 +00:00
fonsinchen
9596352830 (svn r25908) -Fix: Some documentation for constructors of LinkRefresher::Hop. 2013-10-22 19:25:29 +00:00
fonsinchen
fb7ad743d2 (svn r25906) -Fix: Simplify condition logic in link refresher. 2013-10-22 18:46:58 +00:00
fonsinchen
a7f07d50b7 (svn r25906) -Fix: Simplify condition logic in link refresher. 2013-10-22 18:46:58 +00:00
fonsinchen
a9f6a1eeb7 (svn r25905) -Codechange: A more robust way of detecting loops during order prediction. 2013-10-22 18:46:20 +00:00
fonsinchen
ca0486e410 (svn r25905) -Codechange: A more robust way of detecting loops during order prediction. 2013-10-22 18:46:20 +00:00
fonsinchen
d3fa322087 (svn r25904) -Fix: add forgotten files 2013-10-22 18:45:55 +00:00
fonsinchen
8ef95222c9 (svn r25904) -Fix: add forgotten files 2013-10-22 18:45:55 +00:00