Skip to content

Commit 7b15b5f

Browse files
committed
Replaced GetActorValueIdFromName with ActorValueList::LookupActorValueByName
1 parent 43e2bd4 commit 7b15b5f

File tree

5 files changed

+4
-12
lines changed

5 files changed

+4
-12
lines changed

src/Papyrus/ActorValueHelper.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@
44

55
namespace ActorValueHelper
66
{
7-
auto GetActorValueIdFromName(const char* a_name) -> std::int32_t
8-
{
9-
using func_t = decltype(&ActorValueHelper::GetActorValueIdFromName);
10-
REL::Relocation<func_t> func{ RELOCATION_ID(26570, 27203) };
11-
return func(a_name);
12-
}
13-
147
auto ActorValueToString(const RE::ActorValue a_actorValue) -> RE::BSFixedString
158
{
169
switch (a_actorValue) {

src/Papyrus/ActorValueHelper.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44

55
namespace ActorValueHelper
66
{
7-
auto GetActorValueIdFromName(const char* a_name) -> std::int32_t;
87
auto ActorValueToString(RE::ActorValue a_actorValue) -> RE::BSFixedString;
98
}

src/Papyrus/PapyrusObjectREFR.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ namespace PapyrusObjectREFR
188188
}
189189

190190
if (const auto actor = a_ref->As<RE::Actor>(); actor) {
191-
const auto actorValueId = ActorValueHelper::GetActorValueIdFromName(a_actorValue.c_str());
191+
const auto actorValueId = RE::ActorValueList::GetSingleton()->LookupActorValueByName(a_actorValue);
192192
const auto actorValue = static_cast<RE::ActorValue>(actorValueId);
193193
return actor->GetPermanentActorValue(actorValue);
194194
}

src/Papyrus/PapyrusRace.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace PapyrusRace
1313
return -1;
1414
}
1515

16-
const auto actorValueId = ActorValueHelper::GetActorValueIdFromName(a_actorValue.c_str());
16+
const auto actorValueId = RE::ActorValueList::GetSingleton()->LookupActorValueByName(a_actorValue);
1717
const auto actorValue = static_cast<RE::ActorValue>(actorValueId);
1818

1919
for (const auto& [skill, bonus] : a_race->data.skillBoosts) {

src/Version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
#define FIRE_VERSION_MAJOR 1
88
#define FIRE_VERSION_MINOR 0
9-
#define FIRE_VERSION_PATCH 3
10-
#define FIRE_VERSION_BETA 0
9+
#define FIRE_VERSION_PATCH 8
10+
#define FIRE_VERSION_BETA 1
1111
#define FIRE_VERSION_VERSTRING \
1212
MAKE_STR(FIRE_VERSION_MAJOR) \
1313
"." MAKE_STR(FIRE_VERSION_MINOR) "." MAKE_STR(FIRE_VERSION_PATCH) "." MAKE_STR(FIRE_VERSION_BETA)

0 commit comments

Comments
 (0)