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

ksys/gdt: Add wrappers for property getters

This commit is contained in:
Léo Lam 2020-10-26 02:06:51 +01:00
parent c612f77fcd
commit 82a6c0152e
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/KingSystem/GameData/gdtFlag.h
View File

@ -137,13 +137,19 @@ public:
virtual u32 getRandomResetData() const = 0;
bool isResettable() const { return isResettableFlag(getProperties().getResetType()); }
bool isResettable() const { return isResettableFlag(getResetType()); }
bool isPermanent() const {
return getProperties().isSave() && getProperties().getResetType() == ResetType::NoReset &&
getRandomResetData() == 0;
return isSave() && getResetType() == ResetType::NoReset && getRandomResetData() == 0;
}
bool isProgramReadable() const { return getProperties().isProgramReadable(); }
bool isProgramWritable() const { return getProperties().isProgramWritable(); }
bool isSave() const { return getProperties().isSave(); }
bool isOneTrigger() const { return getProperties().isOneTrigger(); }
bool isEventAssociated() const { return getProperties().isEventAssociated(); }
ResetType getResetType() const { return getProperties().getResetType(); }
protected:
s32 clampValue_(const s32& min_value, s32* value, const s32& max_value);
s32 clampValue_(const f32& min_value, f32* value, const f32& max_value);

7
src/KingSystem/GameData/gdtTriggerParam.cpp
View File

@ -81,7 +81,7 @@ inline bool getFlagValue(const sead::PtrArray<FlagBase>& array, T* out_value, s3
if (!flag)
return false;
if (check_permissions && !flag->getProperties().isProgramReadable())
if (check_permissions && !flag->isProgramReadable())
return false;
if constexpr (std::is_same<T, const char*>())
@ -108,7 +108,7 @@ inline bool getFlagValue(const sead::PtrArray<sead::PtrArray<FlagBase>>& arrays,
if (!flag)
return false;
if (check_permissions && !flag->getProperties().isProgramReadable())
if (check_permissions && !flag->isProgramReadable())
return false;
if constexpr (std::is_same<T, const char*>())
@ -354,8 +354,7 @@ void TriggerParam::initResetData(sead::Heap* heap) {
else \
mResetEntries[reset_entry_idx].index = i; \
\
mResetEntries[reset_entry_idx].reset_type = \
(*ARRAYS[i])[0]->getProperties().getResetType(); \
mResetEntries[reset_entry_idx].reset_type = (*ARRAYS[i])[0]->getResetType(); \
\
++reset_entry_idx; \
if (reset_entry_idx == num_reset_entries) \