diff options
| author | Léo Lam <leo@leolam.fr> | 2020-10-26 02:06:51 +0100 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2020-10-26 02:08:45 +0100 |
| commit | 82a6c0152e75df97f56428732fa73ee5f6fc3aac (patch) | |
| tree | e865d940b63907c133a37ea4c610ff0282bf4dfb /src/KingSystem/GameData/gdtTriggerParam.cpp | |
| parent | c612f77fcda4b6d42f69cf22135669980764df4e (diff) | |
ksys/gdt: Add wrappers for property getters
Diffstat (limited to 'src/KingSystem/GameData/gdtTriggerParam.cpp')
| -rw-r--r-- | src/KingSystem/GameData/gdtTriggerParam.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/KingSystem/GameData/gdtTriggerParam.cpp b/src/KingSystem/GameData/gdtTriggerParam.cpp index f36b6a1d..7a800440 100644 --- a/src/KingSystem/GameData/gdtTriggerParam.cpp +++ b/src/KingSystem/GameData/gdtTriggerParam.cpp @@ -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) \ |