From 0799a0377ad850ef5f140dfa6098302115548712 Mon Sep 17 00:00:00 2001 From: mrb0nk500 Date: Thu, 2 Mar 2023 15:35:05 -0400 Subject: TPlyGuildCardTag: Fix compilation error in `_assign()` Also makes it simpler too. --- context.h | 6 ++---- include/pso/TPlyGuildCardTag.h | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/context.h b/context.h index cf894ab..2539293 100644 --- a/context.h +++ b/context.h @@ -632,10 +632,8 @@ public: PRIVATE_MEMBER_ACCESSORS(u32, guildcard_number); private: void _assign(const TPlyGuildCardTag &src) { - m_tag.tag0 = src.tag().tag0; - m_tag.tag1 = src.tag().tag1; - m_tag.tag2 = src.tag().tag2; - m_guildcard_number = src.guildcard_number(); + m_tag = src.m_tag; + m_guildcard_number = src.m_guildcard_number; }; union { diff --git a/include/pso/TPlyGuildCardTag.h b/include/pso/TPlyGuildCardTag.h index f10b8e4..815685d 100644 --- a/include/pso/TPlyGuildCardTag.h +++ b/include/pso/TPlyGuildCardTag.h @@ -22,10 +22,8 @@ public: PRIVATE_MEMBER_ACCESSORS(u32, guildcard_number); private: void _assign(const TPlyGuildCardTag &src) { - m_tag.tag0 = src.tag().tag0; - m_tag.tag1 = src.tag().tag1; - m_tag.tag2 = src.tag().tag2; - m_guildcard_number = src.guildcard_number(); + m_tag = src.m_tag; + m_guildcard_number = src.m_guildcard_number; }; union { -- cgit v1.2.3-13-gbd6f