Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
6 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
6 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
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
6 years ago |
Jonathan G Rennison
|
1cc545c816
|
Fix iterator invalidation issues in CargoPacketList actions
See: #48
|
6 years ago |
Jonathan G Rennison
|
ab6119cb76
|
Merge branch 'infrastructure_sharing' into jgrpp
|
7 years ago |
Jonathan G Rennison
|
2c16800454
|
Add debug console command to show cargo packet deferred payment stats
|
7 years ago |
Jonathan G Rennison
|
8c0c9274ea
|
Merge branch 'infrastructure_sharing' into jgrpp
# Conflicts:
# src/economy.cpp
# src/misc.cpp
# src/openttd.cpp
# src/saveload/extended_ver_sl.cpp
|
7 years ago |
Jonathan G Rennison
|
9000d74f3c
|
Pay all cargo payment incomes when cargo finally delivered
|
7 years ago |
Jonathan G Rennison
|
a422cb6753
|
Use a deque instead of list for CargoPacketList and StationCargoPacketMap.
|
8 years ago |
Jonathan G Rennison
|
495aa729df
|
Fix VehicleCargoList::Truncate when not all cargo is MTA_KEEP.
|
9 years ago |
fonsinchen
|
a363b2c317
|
(svn r26575) -Change [FS#5995]: Add an assert to catch underflowing action counts.
|
11 years ago |
fonsinchen
|
1dc630ff26
|
(svn r26575) -Change [FS#5995]: Add an assert to catch underflowing action counts.
|
11 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
|
11 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
|
11 years ago |
frosch
|
858e80f3dd
|
(svn r26333) -Fix: Compilation without static_assert.
|
11 years ago |
frosch
|
a92bf49191
|
(svn r26333) -Fix: Compilation without static_assert.
|
11 years ago |
frosch
|
03169121c2
|
(svn r26328) -Fix: Warnings and compilation failures.
|
11 years ago |
frosch
|
6040da6654
|
(svn r26328) -Fix: Warnings and compilation failures.
|
11 years ago |
fonsinchen
|
88787412b6
|
(svn r26327) -Fix [FS#5901]: Take care of next_station when reassigning from MTA_DELIVER to MTA_TRANSFER.
|
11 years ago |
fonsinchen
|
fbd6707afc
|
(svn r26327) -Fix [FS#5901]: Take care of next_station when reassigning from MTA_DELIVER to MTA_TRANSFER.
|
11 years ago |
fonsinchen
|
f528d2c592
|
(svn r25910) -Fix: Guard against empty FlowStats in a few more places.
|
11 years ago |
fonsinchen
|
49d2cd4049
|
(svn r25910) -Fix: Guard against empty FlowStats in a few more places.
|
11 years ago |
fonsinchen
|
bd230f34f4
|
(svn r25900) -Change [FS#5677]: Allow restricted flows to be picked for kept cargo.
|
11 years ago |
fonsinchen
|
809df5aaf6
|
(svn r25900) -Change [FS#5677]: Allow restricted flows to be picked for kept cargo.
|
11 years ago |
fonsinchen
|
54db96be43
|
(svn r25891) -Feature: Use smallstack to allow for multiple next hops when loading and unloading.
|
11 years ago |
fonsinchen
|
fff00b6460
|
(svn r25891) -Feature: Use smallstack to allow for multiple next hops when loading and unloading.
|
11 years ago |
fonsinchen
|
6ce4c1808b
|
(svn r25715) -Fix: return correct value from StationCargoList::Reserve, fix some documentation and simplify StationCargoList::Load a bit
|
11 years ago |
fonsinchen
|
8bec8a982b
|
(svn r25715) -Fix: return correct value from StationCargoList::Reserve, fix some documentation and simplify StationCargoList::Load a bit
|
11 years ago |
fonsinchen
|
3dd811e179
|
(svn r25434) -Fix: reroute cargo staged for unloading if a link breaks
|
11 years ago |
fonsinchen
|
6ce6fd05d8
|
(svn r25434) -Fix: reroute cargo staged for unloading if a link breaks
|
11 years ago |
fonsinchen
|
c9452bbbff
|
(svn r25419) -Fix: assign some random other source station to packets which have lost their source
|
11 years ago |
fonsinchen
|
647d92c0d5
|
(svn r25419) -Fix: assign some random other source station to packets which have lost their source
|
11 years ago |
fonsinchen
|
741c431caa
|
(svn r25362) -Feature: consider cargo waiting at other stations for rating at the origin station
|
11 years ago |
fonsinchen
|
1de46050f6
|
(svn r25362) -Feature: consider cargo waiting at other stations for rating at the origin station
|
11 years ago |
fonsinchen
|
04e3eb6fab
|
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
|
11 years ago |
fonsinchen
|
f022550df9
|
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
|
11 years ago |
rubidium
|
cdb0a76958
|
(svn r25012) -Codechange: persistently keep 'reserved' cargo (for full-load improved loading) instead of calculating if for every cycle
|
12 years ago |
rubidium
|
7dd2354a13
|
(svn r25012) -Codechange: persistently keep 'reserved' cargo (for full-load improved loading) instead of calculating if for every cycle
|
12 years ago |
rubidium
|
d6e2a8aa56
|
(svn r25010) -Codechange: Add general framework for cargo actions, i.e. loading, transfering, delivering and such, to contain this logic in a single place instead of spread around (fonsinchen)
|
12 years ago |
rubidium
|
79b74a5925
|
(svn r25010) -Codechange: Add general framework for cargo actions, i.e. loading, transfering, delivering and such, to contain this logic in a single place instead of spread around (fonsinchen)
|
12 years ago |
rubidium
|
71bbc130fc
|
(svn r25009) -Codechange: refactor bits of cargo packet (lists) to reduce duplicated code (fonsinchen)
|
12 years ago |
rubidium
|
4301d77d65
|
(svn r25009) -Codechange: refactor bits of cargo packet (lists) to reduce duplicated code (fonsinchen)
|
12 years ago |
rubidium
|
2795ed5b09
|
(svn r25008) -Codechange: Make CargoList::Truncate behave similarly to CargoList::MoveTo, i.e. pass the amount to truncate (fonsinchen)
|
12 years ago |
rubidium
|
84ca041564
|
(svn r25008) -Codechange: Make CargoList::Truncate behave similarly to CargoList::MoveTo, i.e. pass the amount to truncate (fonsinchen)
|
12 years ago |
truebrain
|
1c9bec1999
|
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
|
13 years ago |
truebrain
|
aa1a0053b0
|
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
|
13 years ago |
michi_cc
|
56b7faed52
|
(svn r22582) -Fix: Don't increment STL iterators after they've been invalidated.
|
13 years ago |
michi_cc
|
ddfab2cc1c
|
(svn r22582) -Fix: Don't increment STL iterators after they've been invalidated.
|
13 years ago |
rubidium
|
ff143c6708
|
(svn r22413) -Document: even more stuff
|
14 years ago |