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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/cargomonitor.cpp
#	src/core/CMakeLists.txt
#	src/economy.cpp
#	src/landscape.cpp
#	src/linkgraph/flowmapper.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/misc_gui.cpp
#	src/newgrf_generic.cpp
#	src/newgrf_storage.cpp
#	src/rail_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/station_sl.cpp
#	src/script/script_gui.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/string_func.h
#	src/terraform_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2023-06-07 21:28:46 +01:00
parent d3fbe88a9c 3a03a12a9c
commit 02549c5224
129 changed files with 2080 additions and 2061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/linkgraph/linkgraph_gui.cpp
View File

@@ -412,11 +412,11 @@ void LinkGraphOverlay::Draw(const DrawPixelInfo *dpi) const
void LinkGraphOverlay::DrawLinks(const DrawPixelInfo *dpi) const
{
int width = ScaleGUITrad(this->scale);
for (LinkList::const_iterator i(this->cached_links.begin()); i != this->cached_links.end(); ++i) {
if (!this->IsLinkVisible(i->from_pt, i->to_pt, dpi, width + 2)) continue;
if (!Station::IsValidID(i->from_id)) continue;
if (!Station::IsValidID(i->to_id)) continue;
this->DrawContent(dpi, i->from_pt, i->to_pt, i->prop);
for (const auto &i : this->cached_links) {
if (!this->IsLinkVisible(i.from_pt, i.to_pt, dpi, width + 2)) continue;
if (!Station::IsValidID(i.from_id)) continue;
if (!Station::IsValidID(i.to_id)) continue;
this->DrawContent(dpi, i.from_pt, i.to_pt, i.prop);
}
}
@@ -454,14 +454,14 @@ void LinkGraphOverlay::DrawContent(const DrawPixelInfo *dpi, Point pta, Point pt
void LinkGraphOverlay::DrawStationDots(const DrawPixelInfo *dpi) const
{
int width = ScaleGUITrad(this->scale);
for (StationSupplyList::const_iterator i(this->cached_stations.begin()); i != this->cached_stations.end(); ++i) {
const Point &pt = i->pt;
for (const auto &i : this->cached_stations) {
const Point &pt = i.pt;
if (!this->IsPointVisible(pt, dpi, 3 * width)) continue;
const Station *st = Station::GetIfValid(i->id);
const Station *st = Station::GetIfValid(i.id);
if (st == nullptr) continue;
uint r = width * 2 + width * 2 * std::min<uint>(200, i->quantity) / 200;
uint r = width * 2 + width * 2 * std::min<uint>(200, i.quantity) / 200;
LinkGraphOverlay::DrawVertex(dpi, pt.x, pt.y, r,
_colour_gradient[st->owner != OWNER_NONE ?