From bca76322bf57c665191d121c2ad46414b3b1e6d6 Mon Sep 17 00:00:00 2001
From: Martin Michelsen <fuzziqersoftware+g@gmail.com>
Date: Sat, 27 Aug 2022 18:59:00 -0700
Subject: [PATCH] fix dc guild card format

---
 src/CommandFormats.hh     | 2 +-
 src/ReceiveSubcommands.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommandFormats.hh b/src/CommandFormats.hh
index 65fb26f3..4d8fbd1f 100644
--- a/src/CommandFormats.hh
+++ b/src/CommandFormats.hh
@@ -2761,7 +2761,7 @@ struct G_SendGuildCard_DC_PC_V3 {
   uint8_t char_class;
 };
 
-struct G_SendGuildCard_DC_6x06 : G_SendGuildCard_DC_PC_V3<char16_t, 0x11> {
+struct G_SendGuildCard_DC_6x06 : G_SendGuildCard_DC_PC_V3<char, 0x11> {
   parray<uint8_t, 3> unused3;
 };
 struct G_SendGuildCard_PC_6x06 : G_SendGuildCard_DC_PC_V3<char16_t, 0x24> { };
diff --git a/src/ReceiveSubcommands.cc b/src/ReceiveSubcommands.cc
index 82462bea..6494a8ef 100644
--- a/src/ReceiveSubcommands.cc
+++ b/src/ReceiveSubcommands.cc
@@ -117,7 +117,7 @@ static void process_subcommand_send_guild_card(shared_ptr<ServerState>,
 
   switch (c->version()) {
     case GameVersion::DC: {
-      const auto* cmd = check_size_sc<G_SendGuildCard_PC_6x06>(data);
+      const auto* cmd = check_size_sc<G_SendGuildCard_DC_6x06>(data);
       c->game_data.player()->guild_card_description = cmd->description;
       break;
     }