piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7616 from AdmiralCurtiss/memcard-cleanup

Browse Source 
Clean up GCMemcard a bit.
This commit is contained in:
Léo Lam
2019-01-16 21:56:40 +01:00
committed by GitHub
parent 8d601b1466 04bcc64e82
commit fd3ef7ebc5
4 changed files with 499 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinQt/GCMemcardManager.cpp
View File

@ -199,10 +199,12 @@ void GCMemcardManager::UpdateSlotTable(int slot)
auto* icon = new QTableWidgetItem;
icon->setData(Qt::DecorationRole, frames[0]);
DEntry d;
memcard->GetDEntry(file_index, d);
std::optional<DEntry> entry = memcard->GetDEntry(file_index);
const auto speed = ((d.AnimSpeed[0] & 1) << 2) + (d.AnimSpeed[1] & 1);
// TODO: This is wrong, the animation speed is not static and is already correctly calculated in
// GetIconFromSaveFile(), just not returned
const u16 animation_speed = entry ? entry->m_animation_speed : 1;
const auto speed = (((animation_speed >> 8) & 1) << 2) + (animation_speed & 1);
m_slot_active_icons[slot].push_back({speed, frames});