From 2352bfddc17564bbb1b28080c20eadb868d5e354 Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Sat, 21 Mar 2020 23:20:05 +0100 Subject: [PATCH] Fix size(), now linked blocks also count toward the total count. --- subprojects/memcard/src/memorycard.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/subprojects/memcard/src/memorycard.cpp b/subprojects/memcard/src/memorycard.cpp index 5aa2dd9..073d9f3 100644 --- a/subprojects/memcard/src/memorycard.cpp +++ b/subprojects/memcard/src/memorycard.cpp @@ -62,7 +62,9 @@ std::size_t MemoryCard::size() const { return std::count_if( const_iterator(this, 0), const_iterator(this, 15), - [](const auto& blk) {return blk.has_magic();} + [](const auto& blk) { + return (blk.available_blocks() & 0xF) != 0 and (blk.available_blocks() & 0xF) != 0xF; + } ); }