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

uking/ui: Add named constants for inventory item limits 

Cleaner
This commit is contained in:
Léo Lam 2021-01-11 15:44:43 +01:00
parent 2ae06d6b39
commit d943be4ea1
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -688,23 +688,23 @@ bool PauseMenuDataMgr::isOverCategoryLimit(PouchItemType type) const {
const auto count = countItemsWithType(type);
switch (type) {
case PouchItemType::Weapon:
return ksys::gdt::getFlag_WeaponPorchStockNum() <= count || count >= 20;
return ksys::gdt::getFlag_WeaponPorchStockNum() <= count || count >= NumWeaponsMax;
case PouchItemType::Bow:
return ksys::gdt::getFlag_BowPorchStockNum() <= count || count >= 14;
return ksys::gdt::getFlag_BowPorchStockNum() <= count || count >= NumBowsMax;
case PouchItemType::Arrow:
return count >= 6;
return count >= NumArrowsMax;
case PouchItemType::Shield:
return ksys::gdt::getFlag_ShieldPorchStockNum() <= count || count >= 20;
return ksys::gdt::getFlag_ShieldPorchStockNum() <= count || count >= NumShieldsMax;
case PouchItemType::ArmorHead:
case PouchItemType::ArmorUpper:
case PouchItemType::ArmorLower:
return count >= 100;
return count >= NumArmorsMax;
case PouchItemType::Material:
return count >= 160;
return count >= NumMaterialsMax;
case PouchItemType::Food:
return count >= 60;
return count >= NumFoodMax;
case PouchItemType::KeyItem:
return count >= 40;
return count >= NumKeyItemsMax;
case PouchItemType::Invalid:
break;
}

15
src/Game/UI/uiPauseMenuDataMgr.h
View File

@ -21,7 +21,20 @@ class InfoData;
namespace uking::ui {
constexpr int NumPouchItemsMax = 420;
constexpr int NumWeaponsMax = 20;
constexpr int NumBowsMax = 14;
constexpr int NumArrowsMax = 6;
constexpr int NumShieldsMax = 20;
constexpr int NumArmorsMax = 100;
constexpr int NumMaterialsMax = 160;
constexpr int NumFoodMax = 60;
constexpr int NumKeyItemsMax = 40;
constexpr int NumPouchItemsMax = NumWeaponsMax + NumBowsMax + NumArrowsMax + NumShieldsMax +
NumArmorsMax + NumMaterialsMax + NumFoodMax + NumKeyItemsMax;
static_assert(NumPouchItemsMax == 420, "NumPouchItemsMax must be 420 for now");
// TODO: figure out what this is
constexpr int NumPouch50 = 50;