From 32d34312410a9478d8ffd55da72a289fdba9efa0 Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG Date: Thu, 8 Oct 2020 11:32:03 -0400 Subject: [PATCH] Add Guild Leader and City Mayor Chat Channels --- .../src/shared/core/CuiChatRoomManager.cpp | 6 ++++++ .../src/shared/core/CuiStringIdsChatRoom.h | 2 ++ .../sharedNetworkMessages/src/shared/chat/ChatEnum.h | 2 ++ .../sharedNetworkMessages/src/shared/chat/ChatRoomData.h | 2 ++ 4 files changed, 12 insertions(+) diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiChatRoomManager.cpp b/src/engine/client/library/clientUserInterface/src/shared/core/CuiChatRoomManager.cpp index 6762d8792..af6b14b62 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiChatRoomManager.cpp +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiChatRoomManager.cpp @@ -1801,6 +1801,12 @@ void CuiChatRoomManager::receiveFailedEnterRoom (const uint32 sequen case SWG_CHAT_ERR_NOT_WARDEN: stringId = &CuiStringIdsChatRoom::join_fail_not_warden_prose; break; + case SWG_CHAT_ERR_NOT_GUILD_LEADER: + stringId = &CuiStringIdsChatRoom::join_fail_not_guild_leader_prose; + break; + case SWG_CHAT_ERR_NOT_CITY_MAYOR: + stringId = &CuiStringIdsChatRoom::join_fail_not_mayor_prose; + break; case SWG_CHAT_ERR_INVALID_OBJECT: stringId = &CuiStringIdsChatRoom::join_fail_invalid_object_prose; break; diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiStringIdsChatRoom.h b/src/engine/client/library/clientUserInterface/src/shared/core/CuiStringIdsChatRoom.h index aa6aee724..3a9999275 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiStringIdsChatRoom.h +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiStringIdsChatRoom.h @@ -57,6 +57,8 @@ namespace CuiStringIdsChatRoom MAKE_STRING_ID(ui_chatroom, join_fail_invalid_object_prose); MAKE_STRING_ID(ui_chatroom, join_fail_no_game_server_prose); MAKE_STRING_ID(ui_chatroom, join_fail_not_warden_prose); + MAKE_STRING_ID(ui_chatroom, join_fail_not_guild_leader_prose); + MAKE_STRING_ID(ui_chatroom, join_fail_not_mayor_prose); MAKE_STRING_ID(ui_chatroom, list_received); MAKE_STRING_ID(ui_chatroom, not_a_room); MAKE_STRING_ID(ui_chatroom, not_found); diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnum.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnum.h index df96665b0..396ef2ace 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnum.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnum.h @@ -52,6 +52,8 @@ enum ERROR_CODES SWG_CHAT_ERR_INVALID_OBJECT, SWG_CHAT_ERR_NO_GAME_SERVER, SWG_CHAT_ERR_NOT_WARDEN, + SWG_CHAT_ERR_NOT_GUILD_LEADER, + SWG_CHAT_ERR_NOT_CITY_MAYOR, SWG_CHAT_ERR_WRONG_GCW_REGION_DEFENDER_FACTION }; diff --git a/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomData.h b/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomData.h index 5122efff6..b9294e094 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomData.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomData.h @@ -44,6 +44,8 @@ namespace ChatRoomTypes static const std::string ROOM_TRADER = "Trader"; static const std::string ROOM_BEAST_MASTERY = "BeastMastery"; static const std::string ROOM_WARDEN = "Warden"; + static const std::string ROOM_GUILD_LEADER = "GuildLeaders"; + static const std::string ROOM_CITY_MAYOR = "CityMayors"; }//namespace ChatRoomTypes enum