falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI/PauseMenuDataMgr: Use getItems() instead of mItemLists.list1

This commit is contained in:
Léo Lam 2022-02-27 23:34:14 +01:00
parent 63bf3d2fa4
commit b3b97a93aa
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Game/UI/uiPauseMenuDataMgr.cpp
View File

@ -2740,15 +2740,15 @@ void PauseMenuDataMgr::equipWeapon(PouchItem* weapon) {
return; return;
} }
auto lock = sead::makeScopedLock(mCritSection); auto lock = sead::makeScopedLock(mCritSection);
auto* item = mItemLists.list1.nth(0); auto* item = getItems().nth(0);
while (item && item->isWeapon()) { while (item && item->isWeapon()) {
if (item->mType == weapon->mType) { if (item->mType == weapon->mType) {
item->mEquipped = false; item->mEquipped = false;
} }
item = mItemLists.list1.next(item); item = getItems().next(item);
} }
weapon->mEquipped = true; weapon->mEquipped = true;
saveToGameData(mItemLists.list1); saveToGameData(getItems());
} }
void PauseMenuDataMgr::unequip(PouchItem* item) { void PauseMenuDataMgr::unequip(PouchItem* item) {
@ -2757,21 +2757,21 @@ void PauseMenuDataMgr::unequip(PouchItem* item) {
} }
auto lock = sead::makeScopedLock(mCritSection); auto lock = sead::makeScopedLock(mCritSection);
item->mEquipped = false; item->mEquipped = false;
saveToGameData(mItemLists.list1); saveToGameData(getItems());
} }
// FIXME: types // FIXME: types
bool PauseMenuDataMgr::useItemFromRecipeAndSave(void* unk, int multiplier, PouchItem* item) { bool PauseMenuDataMgr::useItemFromRecipeAndSave(void* unk, int multiplier, PouchItem* item) {
auto lock = sead::makeScopedLock(mCritSection); auto lock = sead::makeScopedLock(mCritSection);
useItemFromRecipe(&mItemLists, unk, multiplier, item); useItemFromRecipe(&mItemLists, unk, multiplier, item);
saveToGameData(mItemLists.list1); saveToGameData(getItems());
return true; return true;
} }
void PauseMenuDataMgr::grabbedItemStuff(PouchItem* item) { void PauseMenuDataMgr::grabbedItemStuff(PouchItem* item) {
auto lock = sead::makeScopedLock(mCritSection); auto lock = sead::makeScopedLock(mCritSection);
for (auto& cur : mItemLists.list1) { for (auto& cur : getItems()) {
if (&cur == item && item->mType == PouchItemType::Material) { if (&cur == item && item->mType == PouchItemType::Material) {
if (item->mValue > 1) { if (item->mValue > 1) {
item->mValue -= 1; item->mValue -= 1;
@ -2797,8 +2797,8 @@ void PauseMenuDataMgr::grabbedItemStuff(PouchItem* item) {
} }
} }
} }
updateInventoryInfo(mItemLists.list1); updateInventoryInfo(getItems());
saveToGameData(mItemLists.list1); saveToGameData(getItems());
} }
} }