diff options
Diffstat (limited to 'src/KingSystem/Resource/resResourceLifeCondition.cpp')
| -rw-r--r-- | src/KingSystem/Resource/resResourceLifeCondition.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/KingSystem/Resource/resResourceLifeCondition.cpp b/src/KingSystem/Resource/resResourceLifeCondition.cpp index 09a1bd91..7cdd45a0 100644 --- a/src/KingSystem/Resource/resResourceLifeCondition.cpp +++ b/src/KingSystem/Resource/resResourceLifeCondition.cpp @@ -25,7 +25,7 @@ bool LifeCondition::parse_(u8* data, size_t, sead::Heap* heap) { if (display_distance_obj.ptr()) { mDisplayDistance.init(0.0, "Item", "表示距離", &mDisplayDistanceObj); addObj(&mDisplayDistanceObj, "DisplayDistance"); - mDisplayDistanceObj.applyResParameterObj(display_distance_obj, nullptr); + mDisplayDistanceObj.applyResParameterObj(display_distance_obj); } const auto auto_display_distance_algorithm_obj = @@ -33,14 +33,14 @@ bool LifeCondition::parse_(u8* data, size_t, sead::Heap* heap) { if (auto_display_distance_algorithm_obj.ptr()) { mBoundingY.init("Bouding.Y", "Item", "自動距離算出アルゴリズム", &mBoundingYObj); addObj(&mBoundingYObj, "AutoDisplayDistanceAlgorithm"); - mBoundingYObj.applyResParameterObj(auto_display_distance_algorithm_obj, nullptr); + mBoundingYObj.applyResParameterObj(auto_display_distance_algorithm_obj); } const auto y_limit_algorithm_obj = agl::utl::getResParameterObj(root, "YLimitAlgorithm"); if (y_limit_algorithm_obj.ptr()) { mYLimitAlgorithm.init("NoLimit", "Item", "Y制限アルゴリズム", &mYLimitAlgorithmObj); addObj(&mYLimitAlgorithmObj, "YLimitAlgorithm"); - mYLimitAlgorithmObj.applyResParameterObj(y_limit_algorithm_obj, nullptr); + mYLimitAlgorithmObj.applyResParameterObj(y_limit_algorithm_obj); } const auto delete_weathers_obj = agl::utl::getResParameterObj(root, "DeleteWeathers"); @@ -61,7 +61,7 @@ void LifeCondition::parseArray(const agl::utl::ResParameterObj* data, agl::utl:: const sead::SafeString& key, const sead::SafeString& desc, sead::Heap* heap) { addObj(obj, key); - obj->applyResParameterObj(*data, nullptr); + obj->applyResParameterObj(*data); auto count = data->mPtr->getNumParameters(); if (count == 0) @@ -76,7 +76,7 @@ void LifeCondition::parseArray(const agl::utl::ResParameterObj* data, agl::utl:: (*buffer)[i].init("", s, desc, obj); } - obj->applyResParameterObj(*data, nullptr); + obj->applyResParameterObj(*data); } } // namespace ksys::res |