King_DuckZ/memoserv
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Show the correct number of blocks for multiblock savegames

Browse source
This commit is contained in:
King_DuckZ 2020-03-21 21:12:26 +01:00
parent a98539aa06
commit bf6814df20
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/main_window.cpp
View file

@ -56,8 +56,10 @@ void MainWindow::open_file_from_dialog() {
auto& mc = m_memcards.back(); auto& mc = m_memcards.back();
auto& grid = m_grids.back(); auto& grid = m_grids.back();
for (int z = 0; z < 15; ++z) { for (int z = 0; z < 15; ++z) {
if (mc[z].has_magic()) auto block = mc[z];
grid.emplace_back(duck::make_nana_animation(mc[z], m_icon_size, m_icon_size, m_icon_fps)); for (std::size_t n = 0; block.has_magic() and n < block.block_count(); ++n) {
grid.emplace_back(duck::make_nana_animation(block, m_icon_size, m_icon_size, m_icon_fps));
}
} }
(*this)["slots"] << m_grids.back(); (*this)["slots"] << m_grids.back();
} }

2
subprojects/memcard/include/memcard/block.hpp
View file

@ -72,7 +72,7 @@ public:
std::vector<uint8_t> icon_palette() const; std::vector<uint8_t> icon_palette() const;
bool has_magic() const; bool has_magic() const;
IconDisplayFlag icon_display_flag() const; IconDisplayFlag icon_display_flag() const;
int block_count() const; std::size_t block_count() const;
std::size_t index() const { return m_index; } std::size_t index() const { return m_index; }
std::string title() const; std::string title() const;
std::size_t available_blocks() const; std::size_t available_blocks() const;

2
subprojects/memcard/src/block.cpp
View file

@ -163,7 +163,7 @@ IconDisplayFlag BasicBlock<Const>::icon_display_flag() const {
} }
template <bool Const> template <bool Const>
int BasicBlock<Const>::block_count() const { std::size_t BasicBlock<Const>::block_count() const {
return frame(0)[3]; return frame(0)[3];
} }