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

Add recalculated total to AssertCountConsistency assertion message

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-08-05 11:32:05 +01:00
parent f13b686d0c
commit 64c71f5136
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cargopacket.h
View File

@@ -309,6 +309,15 @@ protected:
template<class Taction> template<class Taction>
void PopCargo(Taction action); void PopCargo(Taction action);
inline uint RecalculateCargoTotal() const
{
uint total = 0;
for (const auto &cp : this->packets) {
total += cp->Count();
}
return total;
}
public: public:
/** /**
@@ -320,12 +329,14 @@ public:
this->action_counts[MTA_DELIVER] + this->action_counts[MTA_DELIVER] +
this->action_counts[MTA_TRANSFER] + this->action_counts[MTA_TRANSFER] +
this->action_counts[MTA_LOAD] == this->count, this->action_counts[MTA_LOAD] == this->count,
"%u + %u + %u + %u != %u", "%u + %u + %u + %u != %u, (%u in %u packets)",
this->action_counts[MTA_KEEP], this->action_counts[MTA_KEEP],
this->action_counts[MTA_DELIVER], this->action_counts[MTA_DELIVER],
this->action_counts[MTA_TRANSFER], this->action_counts[MTA_TRANSFER],
this->action_counts[MTA_LOAD], this->action_counts[MTA_LOAD],
this->count); this->count,
this->RecalculateCargoTotal(),
(uint) this->packets.size());
} }
protected: protected: