From 8569722db68dc01024ffbbc852cf66e3a80a89c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 9 Jan 2021 16:59:00 +0100 Subject: ksys/act: Start adding actInfoCommon --- src/KingSystem/ActorSystem/actInfoData.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/KingSystem/ActorSystem/actInfoData.cpp') diff --git a/src/KingSystem/ActorSystem/actInfoData.cpp b/src/KingSystem/ActorSystem/actInfoData.cpp index 9d6427cb..c23a94de 100644 --- a/src/KingSystem/ActorSystem/actInfoData.cpp +++ b/src/KingSystem/ActorSystem/actInfoData.cpp @@ -204,7 +204,7 @@ void InfoData::getRecipeInfo(const char* actor, InfoData::RecipeInfo& info) cons } } -s32 InfoData::getIntByKey(const al::ByamlIter& iter, const char* key, s32 default_) { +s32 InfoData::getIntByKey(const al::ByamlIter& iter, const char* key, s32 default_, bool) { s32 value; return iter.tryGetIntByKey(&value, key) ? value : default_; } @@ -511,12 +511,12 @@ bool InfoData::getBool(const char* actor, const char* key, bool default_, bool x return getBoolByKey(iter, key, default_); } -f32 InfoData::getFloatByKey(const al::ByamlIter& iter, const char* key, f32 default_) { +f32 InfoData::getFloatByKey(const al::ByamlIter& iter, const char* key, f32 default_, bool) { f32 value; return iter.tryGetFloatByKey(&value, key) ? value : default_; } -bool InfoData::getBoolByKey(const al::ByamlIter& iter, const char* key, bool default_) { +bool InfoData::getBoolByKey(const al::ByamlIter& iter, const char* key, bool default_, bool) { bool value; return iter.tryGetBoolByKey(&value, key) ? value != 0 : default_; } -- cgit v1.2.3