From 4ec667d65032128c7f26db3e569650125b5f7821 Mon Sep 17 00:00:00 2001 From: ZenoArrows <129334871+ZenoArrows@users.noreply.github.com> Date: Wed, 3 Jun 2026 14:12:57 +0900 Subject: [PATCH] GameObjects: Resolve operator ambiguity --- f4se/GameObjects.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/f4se/GameObjects.h b/f4se/GameObjects.h index 9b19db0..0f5cc65 100644 --- a/f4se/GameObjects.h +++ b/f4se/GameObjects.h @@ -172,8 +172,9 @@ class TESNPC : public TESActorBase UInt32 key; // 00 float value; // 04 - bool operator==(const UInt32 a_key) const { return key == a_key; } - operator UInt32() const { return key; } + bool operator==(const UInt32 a_key) const { return key == a_key; } + bool operator==(const MorphSetData & rhs) const { return key == rhs.key; } + operator UInt32() const { return key; } static inline UInt32 GetHash(const UInt32 * key) { UInt32 hash; @@ -194,8 +195,9 @@ class TESNPC : public TESActorBase UInt32 index; // 00 float value[8]; // 04 - bool operator==(const UInt32 a_key) const { return index == a_key; } - operator UInt32() const { return index; } + bool operator==(const UInt32 a_key) const { return index == a_key; } + bool operator==(const FaceMorphRegion & rhs) const { return index == rhs.index; } + operator UInt32() const { return index; } static inline UInt32 GetHash(const UInt32 * key) { UInt32 hash;