dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/cheat_gui.cpp
#	src/gfx.cpp
#	src/linkgraph/linkgraph.cpp
#	src/spriteloader/grf.cpp
#	src/station_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2023-01-03 11:36:24 +00:00
parent ca11c66cb8 1fb101eabb
commit 760cbcbb8b
27 changed files with 117 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/linkgraph/linkgraph.cpp
View File

@@ -171,7 +171,7 @@ static void AddEdge(LinkGraph::BaseEdge &edge, uint capacity, uint usage, uint32
{
edge.capacity = capacity;
edge.usage = usage;
edge.travel_time_sum = travel_time * capacity;
edge.travel_time_sum = static_cast<uint64>(travel_time) * capacity;
if (mode & EUM_UNRESTRICTED) edge.last_unrestricted_update = _date;
if (mode & EUM_RESTRICTED) edge.last_restricted_update = _date;
if (mode & EUM_AIRCRAFT) edge.last_aircraft_update = _date;
@@ -227,11 +227,11 @@ void LinkGraph::Edge::Update(uint capacity, uint usage, uint32 travel_time, Edge
if (mode & EUM_INCREASE) {
if (edge.travel_time_sum == 0) {
edge.travel_time_sum = (edge.capacity + capacity) * travel_time;
edge.travel_time_sum = static_cast<uint64>(edge.capacity + capacity) * travel_time;
} else if (travel_time == 0) {
edge.travel_time_sum += (edge.travel_time_sum / edge.capacity) * capacity;
} else {
edge.travel_time_sum += travel_time * capacity;
edge.travel_time_sum += static_cast<uint64>(travel_time) * capacity;
}
edge.capacity += capacity;
edge.usage += usage;
@@ -240,13 +240,13 @@ void LinkGraph::Edge::Update(uint capacity, uint usage, uint32 travel_time, Edge
* the capacity increase. */
if (capacity > edge.capacity) {
if (travel_time == 0) {
edge.travel_time_sum = (edge.travel_time_sum / edge.capacity) * capacity;
edge.travel_time_sum = static_cast<uint64>(edge.travel_time_sum / edge.capacity) * capacity;
} else {
edge.travel_time_sum += (capacity - edge.capacity) * travel_time;
edge.travel_time_sum += static_cast<uint64>(capacity - edge.capacity) * travel_time;
}
edge.capacity = capacity;
} else if (edge.travel_time_sum == 0) {
edge.travel_time_sum = travel_time * edge.capacity;
edge.travel_time_sum = static_cast<uint64>(travel_time) * edge.capacity;
}
edge.usage = std::max(edge.usage, usage);
}