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

Check cargo action count consistencies on load

Browse Source 
Add scope info logging to AfterLoadVehicles
This commit is contained in:
Jonathan G Rennison
2018-05-13 18:56:31 +01:00
parent a60eff174d
commit 38779254e5
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/cargopacket.h
View File

@@ -309,17 +309,26 @@ protected:
template<class Taction>
void PopCargo(Taction action);
public:
/**
* Assert that the designation counts add up.
*/
inline void AssertCountConsistency() const
{
assert(this->action_counts[MTA_KEEP] +
assert_msg(this->action_counts[MTA_KEEP] +
this->action_counts[MTA_DELIVER] +
this->action_counts[MTA_TRANSFER] +
this->action_counts[MTA_LOAD] == this->count);
this->action_counts[MTA_LOAD] == this->count,
"%u + %u + %u + %u != %u",
this->action_counts[MTA_KEEP],
this->action_counts[MTA_DELIVER],
this->action_counts[MTA_TRANSFER],
this->action_counts[MTA_LOAD],
this->count);
}
protected:
void AddToCache(const CargoPacket *cp);
void RemoveFromCache(const CargoPacket *cp, uint count);