swg-source/client-tools
1
0
Fork 0
mirror of https://github.com/SWG-Source/client-tools.git synced 2026-01-16 23:04:27 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6 from AconiteGodOfSWG/master

Browse Source 
Add Guild Leader and City Mayor Chat Channels
This commit is contained in:
Cekis
2020-10-28 17:05:00 -07:00
committed by GitHub
parent 896f9926a3 32d3431241
commit 9261fb9952
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/engine/client/library/clientUserInterface/src/shared/core/CuiChatRoomManager.cpp
View File

@@ -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;

2
src/engine/client/library/clientUserInterface/src/shared/core/CuiStringIdsChatRoom.h
View File

@@ -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);

2
src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnum.h
View File

@@ -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
};

2
src/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomData.h
View File

@@ -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