From 19508b12383eada8d90d7587a6de613790262ec4 Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG Date: Sun, 22 Nov 2020 04:35:59 -0500 Subject: [PATCH] Add new war planner chat room enum & strings --- .../clientUserInterface/src/shared/core/CuiChatRoomManager.cpp | 3 +++ .../clientUserInterface/src/shared/core/CuiStringIdsChatRoom.h | 1 + .../library/sharedNetworkMessages/src/shared/chat/ChatEnum.h | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) 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 af6b14b62..c6e120772 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiChatRoomManager.cpp +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiChatRoomManager.cpp @@ -1807,6 +1807,9 @@ void CuiChatRoomManager::receiveFailedEnterRoom (const uint32 sequen case SWG_CHAT_ERR_NOT_CITY_MAYOR: stringId = &CuiStringIdsChatRoom::join_fail_not_mayor_prose; break; + case SWG_CHAT_ERR_NOT_WAR_PLANNER: + stringId = &CuiStringIdsChatRoom::join_fail_cannot_enter_war_room_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 3a9999275..55a4b54c7 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiStringIdsChatRoom.h +++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiStringIdsChatRoom.h @@ -59,6 +59,7 @@ namespace CuiStringIdsChatRoom 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, join_fail_cannot_enter_war_room_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 396ef2ace..1664ccbfb 100644 --- a/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnum.h +++ b/src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnum.h @@ -54,7 +54,8 @@ enum ERROR_CODES 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 + SWG_CHAT_ERR_NOT_WAR_PLANNER, + SWG_CHAT_ERR_WRONG_GCW_REGION_DEFENDER_FACTION // this enum is deprecated }; #endif // CHATENUM_H