From 00f70b6119a658e2934095ee61c45694e2085655 Mon Sep 17 00:00:00 2001 From: Tahir Akhlaq Date: Fri, 17 Aug 2018 14:39:07 +0100 Subject: [PATCH] change Common::ClientLanguage enum --- src/common/Common.h | 13 +++++++++---- .../Network/Handlers/PacketHandlers.cpp | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/common/Common.h b/src/common/Common.h index 0d0f5159..644afc03 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -38,10 +38,15 @@ namespace Common { enum ClientLanguage : uint8_t { - Japanese = 1, - English = 2, - German = 4, - French = 8 + Japanese = 0, + English = 1, + German = 2, + French = 3, + + JapaneseMask = 1 << Japanese, + EnglishMask = 1 << English, + GermanMask = 1 << German, + FrenchMask = 1 << French }; enum EquipSlot : uint8_t diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp index ff71d409..5088893e 100644 --- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp @@ -423,7 +423,7 @@ void Core::Network::GameConnection::socialListHandler( const Core::Network::Pack // todo: store language in db search info or something listPacket->data().entries[0].clientLanguage = Common::ClientLanguage::English; // todo: read from memory - listPacket->data().entries[0].knownLanguages = Common::ClientLanguage::English | Common::ClientLanguage::German; // todo: read from memory + listPacket->data().entries[0].knownLanguages = Common::ClientLanguage::EnglishMask | Common::ClientLanguage::GermanMask; // todo: read from memory listPacket->data().entries[0].classJob = player.getClass(); listPacket->data().entries[0].contentId = player.getContentId(); listPacket->data().entries[0].level = player.getLevel();