Skip to content

Add Guild Leader and City Mayor Chat Channels #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cekis merged 1 commit into from
Oct 29, 2020
Merged

Add Guild Leader and City Mayor Chat Channels #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/engine/client/library/clientUserInterface/src/shared/core/CuiChatRoomManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/engine/client/library/clientUserInterface/src/shared/core/CuiStringIdsChatRoom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
};

Expand Down
2 changes: 2 additions & 0 deletions src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down