mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 12:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit fd3ef7ebc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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});