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

Fix various compiler warnings

Browse Source 
See: #267
This commit is contained in:
Jonathan G Rennison
2021-06-11 22:54:27 +01:00
parent 97d5982cb5
commit 1002c6d9d2
46 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/linkgraph/demands.cpp
View File

@@ -161,7 +161,7 @@ public:
*/
inline void AdjustDemandNodes(LinkGraphJob &job, const std::vector<NodeID> &demands)
{
const uint count = std::min<uint>(demands.size(), this->missing_supply);
const uint count = std::min<uint>((uint)demands.size(), this->missing_supply);
this->missing_supply = 0;
for (uint i = 0; i < count; i++) {
job[demands[i]].ReceiveDemand(1);
@@ -371,7 +371,7 @@ void DemandCalculator::CalcMinimisedDistanceDemand(LinkGraphJob &job, const std:
if (supplies.empty() || demands.empty()) return;
scaler.SetDemandPerNode(demands.size());
scaler.SetDemandPerNode((uint)demands.size());
scaler.AdjustDemandNodes(job, demands);
struct EdgeCandidate {

2
src/linkgraph/linkgraph_gui.cpp
View File

@@ -62,7 +62,7 @@ const uint8 LinkGraphOverlay::LINK_COLOURS[][12] = {
void LinkGraphOverlay::GetWidgetDpi(DrawPixelInfo *dpi, uint margin) const
{
const NWidgetBase *wi = this->window->GetWidget<NWidgetBase>(this->widget_id);
dpi->left = dpi->top = -margin;
dpi->left = dpi->top = -(int)margin;
dpi->width = wi->current_x + 2 * margin;
dpi->height = wi->current_y + 2 * margin;
}