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

uking/ui: Fix minor accuracy issue (don't use memcpy) 

Still matches, but the original code didn't use memcpy (according to
the Wii U version)
This commit is contained in:
Léo Lam 2021-01-10 14:36:11 +01:00
parent 29817a3e21
commit dd653e871f
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -464,9 +464,6 @@ void PauseMenuDataMgr::restoreMasterSword(bool only_if_broken) {
using SortPredicate = int (*)(const PouchItem* lhs, const PouchItem* rhs,
ksys::act::InfoData* data);
static sead::SafeArray<SortPredicate, 7> sSortPredicates{
{sortWeapon, sortBow, sortShield, sortArmor, sortMaterial, sortFood, sortKeyItem}};
static PouchCategory getTypeForCategory(PouchItemType type) {
static constexpr sead::SafeArray<PouchCategory, NumPouchItemTypes> sMap{{
PouchCategory::Weapon, // Weapon
@ -483,6 +480,12 @@ static PouchCategory getTypeForCategory(PouchItemType type) {
return sMap[s32(type)];
}
static auto getSortPredicateTable() {
sead::SafeArray<SortPredicate, 7> table{
{sortWeapon, sortBow, sortShield, sortArmor, sortMaterial, sortFood, sortKeyItem}};
return table;
}
int pouchItemSortPredicate(const PouchItem* lhs, const PouchItem* rhs) {
if (!lhs || !rhs)
return 0;
@ -500,8 +503,7 @@ int pouchItemSortPredicate(const PouchItem* lhs, const PouchItem* rhs) {
if (cat3 != PouchCategory::Invalid && cat1 != cat3)
return 0;
decltype(sSortPredicates) predicate_table{};
sead::MemUtil::copy(&predicate_table, &sSortPredicates, sizeof(predicate_table));
auto predicate_table = getSortPredicateTable();
const auto* fn = &predicate_table[0];
if (u32(cat1) < u32(predicate_table.size()))
fn = &predicate_table(u32(cat1));
@ -596,8 +598,7 @@ int pouchItemSortPredicateForArrow(const PouchItem* lhs, const PouchItem* rhs) {
if (cat3 != PouchCategory::Invalid && cat1 != cat3)
return 0;
decltype(sSortPredicates) predicate_table{};
sead::MemUtil::copy(&predicate_table, &sSortPredicates, sizeof(predicate_table));
const auto predicate_table = getSortPredicateTable();
const auto* fn = &predicate_table[0];
if (u32(cat1) < u32(predicate_table.size()))
fn = &predicate_table(u32(cat1));