diff options
Diffstat (limited to 'src/Game/UI/uiPauseMenuDataMgr.cpp')
| -rw-r--r-- | src/Game/UI/uiPauseMenuDataMgr.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Game/UI/uiPauseMenuDataMgr.cpp b/src/Game/UI/uiPauseMenuDataMgr.cpp index 40faa561..6416633b 100644 --- a/src/Game/UI/uiPauseMenuDataMgr.cpp +++ b/src/Game/UI/uiPauseMenuDataMgr.cpp @@ -5,6 +5,7 @@ #include <math/seadMathCalcCommon.h> #include <prim/seadScopedLock.h> #include "Game/Actor/actWeapon.h" +#include "Game/Cooking/cookManager.h" #include "Game/DLC/aocManager.h" #include "Game/UI/uiUtils.h" #include "Game/gameItemUtils.h" @@ -17,7 +18,6 @@ #include "KingSystem/ActorSystem/actInfoCommon.h" #include "KingSystem/ActorSystem/actInfoData.h" #include "KingSystem/ActorSystem/actPlayerInfo.h" -#include "KingSystem/Cooking/cookItem.h" #include "KingSystem/GameData/gdtCommonFlagsUtils.h" #include "KingSystem/GameData/gdtSpecialFlags.h" #include "KingSystem/System/PlayReportMgr.h" @@ -1017,30 +1017,30 @@ void PauseMenuDataMgr::saveToGameData(const sead::OffsetList<PouchItem>& list) c } } -void PauseMenuDataMgr::cookItemGet(const ksys::CookItem& cook_item) { +void PauseMenuDataMgr::cookItemGet(const uking::CookItem& cook_item) { const auto* info = ksys::act::InfoData::instance(); - if (!info->hasTag(cook_item.name.cstr(), ksys::act::tags::CookResult)) + if (!info->hasTag(cook_item.actor_name.cstr(), ksys::act::tags::CookResult)) return; const auto lock = sead::makeScopedLock(mCritSection); auto& lists = mItemLists; - ksys::PlayReportMgr::instance()->reportDebug("PouchGet", cook_item.name); - const auto type = getType(cook_item.name); - addToPouch(cook_item.name, type, lists, 1, false); + ksys::PlayReportMgr::instance()->reportDebug("PouchGet", cook_item.actor_name); + const auto type = getType(cook_item.actor_name); + addToPouch(cook_item.actor_name, type, lists, 1, false); setCookDataOnLastAddedItem(cook_item); saveToGameData(lists.list1); } -void PauseMenuDataMgr::setCookDataOnLastAddedItem(const ksys::CookItem& cook_item) { +void PauseMenuDataMgr::setCookDataOnLastAddedItem(const uking::CookItem& cook_item) { if (!mLastAddedItem) return; - mLastAddedItem->getCookData().setStaminaRecoverY(cook_item.stamina_recover_y); - mLastAddedItem->getCookData().setStaminaRecoverX(cook_item.stamina_recover_x); - mLastAddedItem->getCookData().setCookEffect1(cook_item.cook_effect_1); - const int y = cook_item.cook_effect_0_y; - const int x = cook_item.cook_effect_0_x; + mLastAddedItem->getCookData().setStaminaRecoverY(cook_item.effect_time); + mLastAddedItem->getCookData().setStaminaRecoverX(cook_item.life_recover); + mLastAddedItem->getCookData().setCookEffect1(cook_item.sell_price); + const int y = cook_item.vitality_boost; + const CookEffectId x = cook_item.effect_id; mLastAddedItem->getCookData().setCookEffect0({float(x), float(y)}); for (s32 i = 0; i < cook_item.ingredients.size(); ++i) mLastAddedItem->setIngredient(i, cook_item.ingredients[i]); |
