Commit Graph

241 Commits (jgrpp)

Author SHA1 Message Date
Jonathan G Rennison bc04b07f2b Fix double-use of bits 3 and 7 in Order::flags.
Use a different encoding for the cargo type load/unload bit in flags.
8 years ago
Jonathan G Rennison 6031cca2d7 Refactor Link Refresher cargo mask handling.
Add some separate helper functions.
Move cargo checks out of LinkRefresher::Run.
8 years ago
Jonathan G Rennison f8f8e642dc Use unique_ptr and initialiser init for OrderExtraInfo. 8 years ago
Jonathan G Rennison e90b266af1 De-duplicate cargo masking boilerplate using C++11. 8 years ago
Jonathan G Rennison 871d26098e Move Order::cargo_type_flags into a separately allocated object.
Change savegame format, add a new chunk for cargo_type_flags.
8 years ago
Jonathan G Rennison 3507b51d9e Initial LinkRefresher support for cargo-specific links. 8 years ago
Jonathan G Rennison a670966acf Change GetNextStoppingStation to return per-cargo result(s). 8 years ago
Jonathan G Rennison ed99dd2583 Change name of Order cargo-typed get load/unload type accessors.
Move helper functions to get cargo-specific type in cargo-specific
mode, into Order class.
8 years ago
Jonathan G Rennison c1c983ea16 Import cargo type orders patch
https://www.tt-forums.net/viewtopic.php?p=1047749#p1047749

Port to current trunk, resolve various conflicts, etc.
Adjust bit allocations for CmdModifyOrder.
Use save_ext framework for added order flags.
8 years ago
Jonathan G Rennison 2e6b4cc961 Merge branch 'reverse_at_waypoint' into jgrpp
Conflicts:
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/train_cmd.cpp
9 years ago
Jonathan G Rennison 78f8627c34 Add order waypoint flags. 9 years ago
Jonathan G Rennison 8357b911e5 Merge branch 'more_cond_orders-sx' into jgrpp
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
9 years ago
Jonathan G Rennison ffdd845b1c Merge branch 'master' into more_cond_orders
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/saveload.cpp
	src/saveload/saveload.h
9 years ago
patch-import c757a97214 Import more conditional orders patch
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
9 years ago
Jonathan G Rennison f0fecda985 Merge branch 'order_occupancy-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_gui.cpp
9 years ago
Jonathan G Rennison 117599ec7f Order occupancy: Add column to orders GUI to show occupancy running average.
This is an exponentially weighted moving average of occupancies updated
when any vehicle in the shared order set leaves the station of that order.
The weighting factor is an adv setting.
9 years ago
patch-import d8c5de188f Import timetabling wait time in depots patch
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
9 years ago
fonsinchen c81a6070cb (svn r26547) -Codechange: Collect order travel and wait times independent of timetables 10 years ago
fonsinchen 3ee31a8f89 (svn r26547) -Codechange: Collect order travel and wait times independent of timetables 10 years ago
fonsinchen d49dad9f9c (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 10 years ago
fonsinchen c915d9fa55 (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 10 years ago
fonsinchen f0766d894c (svn r26267) -Fix [FS#5865]: Really fix the infinite recursion problem and always consider all branches of conditional orders as possible next stopping stations. 11 years ago
fonsinchen 7e91f96b92 (svn r26267) -Fix [FS#5865]: Really fix the infinite recursion problem and always consider all branches of conditional orders as possible next stopping stations. 11 years ago
fonsinchen fff00b6460 (svn r25891) -Feature: Use smallstack to allow for multiple next hops when loading and unloading. 11 years ago
fonsinchen 54db96be43 (svn r25891) -Feature: Use smallstack to allow for multiple next hops when loading and unloading. 11 years ago
fonsinchen 40120e1bad (svn r25736) -Codechange: move condition prediction out of GetNextStoppingOrder so that we can access both branches in calling code 11 years ago
fonsinchen 5c0b766ed9 (svn r25736) -Codechange: move condition prediction out of GetNextStoppingOrder so that we can access both branches in calling code 11 years ago
fonsinchen f022550df9 (svn r25361) -Feature: distribute cargo according to plan given by linkgraph 11 years ago
fonsinchen 04e3eb6fab (svn r25361) -Feature: distribute cargo according to plan given by linkgraph 11 years ago
rubidium 6b746167e4 (svn r25259) -Codechange: track capacities and usage of links 11 years ago
rubidium 3947453277 (svn r25259) -Codechange: track capacities and usage of links 11 years ago
frosch 972c4560dc (svn r25041) -Remove [FS#3764-ish]: ordered refit with subtypes, since the cases where it worked were corner cases rather than the general case. 11 years ago
frosch 22bb015f3d (svn r25041) -Remove [FS#3764-ish]: ordered refit with subtypes, since the cases where it worked were corner cases rather than the general case. 11 years ago
michi_cc 64c5299b4d (svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles. 13 years ago
michi_cc f2c694c8fb (svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles. 13 years ago
michi_cc ca633163ed (svn r23507) -Fix (r23505): Comment typo. 13 years ago
michi_cc 2a776a6ca3 (svn r23507) -Fix (r23505): Comment typo. 13 years ago
michi_cc 708b58b484 (svn r23505) -Add: Indication in the order list if the next destination of an order is out of range. 13 years ago
michi_cc 34ffd08a19 (svn r23505) -Add: Indication in the order list if the next destination of an order is out of range. 13 years ago
michi_cc 957b643ae6 (svn r23504) -Feature: Aircraft range. 13 years ago
michi_cc def8e7215b (svn r23504) -Feature: Aircraft range. 13 years ago
rubidium bec64ece5a (svn r23199) -Fix [FS#4822]: oil rigs that "expired" did not get removed from the station list 13 years ago
rubidium fb63543e2a (svn r23199) -Fix [FS#4822]: oil rigs that "expired" did not get removed from the station list 13 years ago
michi_cc 886bd3c4c7 (svn r23087) -Feature: Auto-refitting of vehicles during loading at a station when the vehicle allows it. 13 years ago
michi_cc f200ffa90c (svn r23087) -Feature: Auto-refitting of vehicles during loading at a station when the vehicle allows it. 13 years ago
planetmaker 7aa57e4acd (svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added 13 years ago
planetmaker 43c8cd1d5e (svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added 13 years ago
rubidium 0cf2ef83f0 (svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s]. 14 years ago
rubidium 9ca4b629cd (svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s]. 14 years ago
rubidium 1446bfaac6 (svn r21644) -Change: keep showing "No orders" when the order list is filled with only automatic orders 14 years ago
rubidium 28f16a732f (svn r21644) -Change: keep showing "No orders" when the order list is filled with only automatic orders 14 years ago
rubidium 4d6841b553 (svn r21642) -Feature: concept of automatic station orders; add stub orders for intermediate stations and remove them when not visiting them anymore. This allows you to see what trains visit a station without actually having to order a vehicle to stop at all stations. Based on patch by fonsinchen 14 years ago
rubidium 64f04c3a74 (svn r21642) -Feature: concept of automatic station orders; add stub orders for intermediate stations and remove them when not visiting them anymore. This allows you to see what trains visit a station without actually having to order a vehicle to stop at all stations. Based on patch by fonsinchen 14 years ago
rubidium bde1973e7a (svn r21602) -Codechange: split actual adding/removing of orders to/from a vehicle's order list from the validation of those (user) commands. Based on patch by fonsinchen 14 years ago
rubidium a38a1e7b0d (svn r21602) -Codechange: split actual adding/removing of orders to/from a vehicle's order list from the validation of those (user) commands. Based on patch by fonsinchen 14 years ago
alberth 0b0127b13d (svn r21593) -Codechange: endif comment correcttions. 14 years ago
alberth f65a9a5515 (svn r21593) -Codechange: endif comment correcttions. 14 years ago
frosch c18839704b (svn r20286) -Codechange: Unify end of doxygen comments. 14 years ago
frosch 4bd32799f1 (svn r20286) -Codechange: Unify end of doxygen comments. 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
frosch b7bfae70a8 (svn r19215) -Codechange: Add Order::GetLocation() to deduplicate code. 15 years ago
frosch 3222ace3e1 (svn r19215) -Codechange: Add Order::GetLocation() to deduplicate code. 15 years ago
rubidium 2e506b04aa (svn r18204) -Codechange: introduce a type for Ticks and use it; furthermore document some related variables/functions 15 years ago
rubidium 37056b564c (svn r18204) -Codechange: introduce a type for Ticks and use it; furthermore document some related variables/functions 15 years ago
rubidium cc7ba874b4 (svn r18202) -Codechange: remove an unused function 15 years ago
rubidium 2750c719cc (svn r18202) -Codechange: remove an unused function 15 years ago
rubidium 310465da07 (svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos 15 years ago
rubidium e8ddf001c8 (svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos 15 years ago
rubidium 99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium edf7b21e18 (svn r16976) -Codechange: remove WaypointID and MAX_LENGTH constants in favour of their Station variants 15 years ago
rubidium e473e69ba4 (svn r16976) -Codechange: remove WaypointID and MAX_LENGTH constants in favour of their Station variants 15 years ago
yexo 3531315322 (svn r16613) -Fix [NewGRF]: some of the var action 2 80+ variables contained wrong results due to OpenTTD codechanges 15 years ago
yexo 548a605263 (svn r16613) -Fix [NewGRF]: some of the var action 2 80+ variables contained wrong results due to OpenTTD codechanges 15 years ago
smatz 3793b966c3 (svn r16380) -Codechange: rename pool.hpp to pool_type.hpp 15 years ago
smatz 56a7b70591 (svn r16380) -Codechange: rename pool.hpp to pool_type.hpp 15 years ago
smatz 50624d5c0f (svn r16378) -Codechange: replace OldPool with simpler Pool. Compilation time, binary size and run time (with asserts disabled) should be improved 15 years ago
smatz 62a7948af0 (svn r16378) -Codechange: replace OldPool with simpler Pool. Compilation time, binary size and run time (with asserts disabled) should be improved 15 years ago
smatz 7eb14aa49f (svn r16377) -Codechange: unify FOR_ALL_* macros, use separate index variable instead of var->index 15 years ago
smatz 04723b240e (svn r16377) -Codechange: unify FOR_ALL_* macros, use separate index variable instead of var->index 15 years ago
smatz 769de62daf (svn r16338) -Codechange: split loading of references to two phases
In the first phase, indexes are stored. In the second phase, indexes are checked for validity and converted to pointers
15 years ago
smatz 570af0ce44 (svn r16338) -Codechange: split loading of references to two phases
In the first phase, indexes are stored. In the second phase, indexes are checked for validity and converted to pointers
15 years ago
rubidium 1cc82de384 (svn r16333) -Cleanup: remove a bunch of unused wrapper functions. 15 years ago
rubidium 88201ccd5c (svn r16333) -Cleanup: remove a bunch of unused wrapper functions. 15 years ago
smatz 0c10daa243 (svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index) 15 years ago
smatz 871107f529 (svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index) 15 years ago
smatz cf986c3099 (svn r16326) -Codechange: replace GetPoolItemPoolSize() by PoolItem::GetPoolSize() 15 years ago
smatz ed1e54bd84 (svn r16326) -Codechange: replace GetPoolItemPoolSize() by PoolItem::GetPoolSize() 15 years ago
smatz d495dc5dbc (svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index) 15 years ago
smatz 6221d74644 (svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index) 15 years ago
frosch ac1b753f9a (svn r16199) -Codechange: Pass OrderNonStopFlags also to MakeGoToDepotOrder().
-Fix: 'Go non-stop to nearest depot'-orders did not work wrt. the 'non-stop' part.
-Fix: Adding 'Go to nearest depot'-orders did not respect the default setting for 'non-stop'.
15 years ago
frosch d518b3d0ac (svn r16199) -Codechange: Pass OrderNonStopFlags also to MakeGoToDepotOrder().
-Fix: 'Go non-stop to nearest depot'-orders did not work wrt. the 'non-stop' part.
-Fix: Adding 'Go to nearest depot'-orders did not respect the default setting for 'non-stop'.
15 years ago
rubidium 4c707c7414 (svn r16037) -Feature: allow (per order) to let a train stop at the near end, middle or far end of a platform from the point of view of the driver of the train that enters the station. 15 years ago
rubidium 5790293af6 (svn r16037) -Feature: allow (per order) to let a train stop at the near end, middle or far end of a platform from the point of view of the driver of the train that enters the station. 15 years ago
smatz 91233ea596 (svn r14828) -Codechange: move most of save/load-specific code to separate files 16 years ago
smatz 7368c740a6 (svn r14828) -Codechange: move most of save/load-specific code to separate files 16 years ago
rubidium 3ac0875cf6 (svn r14813) -Codechange: use uint instead of 'just' unsigned. 16 years ago
rubidium 11c25a72fa (svn r14813) -Codechange: use uint instead of 'just' unsigned. 16 years ago
rubidium f316796629 (svn r14803) -Codechange: move order list management into it's own class and remove the order count from the savegame as we can easily count that (PhilSophus) 16 years ago
rubidium 0d54db5f9f (svn r14803) -Codechange: move order list management into it's own class and remove the order count from the savegame as we can easily count that (PhilSophus) 16 years ago
rubidium 155a2ca1f4 (svn r14601) -Fix: the nearest depot and stop in depot orders didn't work together (the vehicle didn't stop). 16 years ago
rubidium 2209c6a344 (svn r14601) -Fix: the nearest depot and stop in depot orders didn't work together (the vehicle didn't stop). 16 years ago
rubidium 1ce0b03bf0 (svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description. 16 years ago
rubidium d03994098b (svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description. 16 years ago
rubidium 0e40b1013c (svn r12667) -Feature: conditional 'skip/jump' orders. 16 years ago
rubidium ac94b6384b (svn r12667) -Feature: conditional 'skip/jump' orders. 16 years ago
rubidium e61dcab79d (svn r12648) -Feature: allow four different non-stop types in a single game instead of two. The "TTDP compatible order" setting now only sets the default behaviour of new trains.
-Feature: allow three different load type in a single game instead of two. One can choose full load all and full load any instead of full load being governed by the "full load any" patch setting.
16 years ago
rubidium 5992dad01f (svn r12648) -Feature: allow four different non-stop types in a single game instead of two. The "TTDP compatible order" setting now only sets the default behaviour of new trains.
-Feature: allow three different load type in a single game instead of two. One can choose full load all and full load any instead of full load being governed by the "full load any" patch setting.
16 years ago
rubidium 2e4044ac81 (svn r12640) -Codechange: let GetLoadType make a difference between full load and full load any based on the patch setting instead of using the patch setting directly. 16 years ago
rubidium 82155367f6 (svn r12640) -Codechange: let GetLoadType make a difference between full load and full load any based on the patch setting instead of using the patch setting directly. 16 years ago
rubidium d7afec34ac (svn r12633) -Fix: could not make a (go-to) depot order. 16 years ago
rubidium d8f88f06d4 (svn r12633) -Fix: could not make a (go-to) depot order. 16 years ago
rubidium 337c92090b (svn r12620) -Fix: automatic servicing of vehicles made them stop in the depot. 16 years ago
rubidium d31dee2717 (svn r12620) -Fix: automatic servicing of vehicles made them stop in the depot. 16 years ago
rubidium 973997e896 (svn r12617) -Codechange: add type safety to the Order's load and unload types. 16 years ago
rubidium d74c6ffb62 (svn r12617) -Codechange: add type safety to the Order's load and unload types. 16 years ago
rubidium cf250390c5 (svn r12615) -Codechange: rename some enums related to depot orders to make it more clear that they are no loading/unloading flags. Also add more type strictness. 16 years ago
rubidium f1cd7ef5ee (svn r12615) -Codechange: rename some enums related to depot orders to make it more clear that they are no loading/unloading flags. Also add more type strictness. 16 years ago
rubidium fcdd44b662 (svn r12600) -Codechange: make GetNonStopType return a more augmented type; not is there a non-stop order but the kind of non-stop order, so one doesn't need to check _patches.new_nonstop type everywhere. 16 years ago
rubidium c57a1d74c3 (svn r12600) -Codechange: make GetNonStopType return a more augmented type; not is there a non-stop order but the kind of non-stop order, so one doesn't need to check _patches.new_nonstop type everywhere. 16 years ago
rubidium 949762fc65 (svn r12595) -Codechange: hide Order's flags in the last few cases. 16 years ago
rubidium d90a041230 (svn r12595) -Codechange: hide Order's flags in the last few cases. 16 years ago
rubidium 53d101cc99 (svn r12593) -Codechange: hide Order's flags in most of the code. 16 years ago
rubidium fb1c4eccd8 (svn r12593) -Codechange: hide Order's flags in most of the code. 16 years ago
rubidium 935b562074 (svn r12588) -Codechange: do not access the destination of an order directly. 16 years ago
rubidium d6623cf654 (svn r12588) -Codechange: do not access the destination of an order directly. 16 years ago
rubidium a3224512cc (svn r12587) -Codechange: unduplicate some code in the Unpack*Order functions and move the 'normal' case Pack/Unpack to Order. 16 years ago
rubidium 8cd1795fe3 (svn r12587) -Codechange: unduplicate some code in the Unpack*Order functions and move the 'normal' case Pack/Unpack to Order. 16 years ago
rubidium 3edb967ecf (svn r12586) -Codechange: do not access an order's refit variables directly. 16 years ago
rubidium e68b2088ce (svn r12586) -Codechange: do not access an order's refit variables directly. 16 years ago
rubidium 3b0e3d8d30 (svn r12584) -Codechange: do not access the order type directly. 16 years ago
rubidium 5b47f81b0f (svn r12584) -Codechange: do not access the order type directly. 16 years ago
rubidium 4ff5d2057c (svn r12583) -Codechange: make AssignOrder a class function of order. 16 years ago
rubidium 56e63a6044 (svn r12583) -Codechange: make AssignOrder a class function of order. 16 years ago
rubidium 21ae6fa444 (svn r12582) -Codechange: move some (needlessly) static inlined functions from order_base.h to order_cmd.cpp. 16 years ago
rubidium 669b4bc609 (svn r12582) -Codechange: move some (needlessly) static inlined functions from order_base.h to order_cmd.cpp. 16 years ago
rubidium ed2acd6f3d (svn r12580) -Codechange: merge some logical related to non-stop orders. 16 years ago
rubidium aef20ec54d (svn r12580) -Codechange: merge some logical related to non-stop orders. 16 years ago
rubidium b84b16cfcd (svn r12488) -Codechange: split order.h into order_base.h and order_func.h. 16 years ago
rubidium 4a1035ab95 (svn r12488) -Codechange: split order.h into order_base.h and order_func.h. 16 years ago