diff --git a/3rdparty/flatbuffers b/3rdparty/flatbuffers index 06c5c7ed0b..0100f6a577 160000 --- a/3rdparty/flatbuffers +++ b/3rdparty/flatbuffers @@ -1 +1 @@ -Subproject commit 06c5c7ed0bd987a918cf88caafb094f22cdd1721 +Subproject commit 0100f6a5779831fa7a651e4b67ef389a8752bd9b diff --git a/Utilities/StrFmt.cpp b/Utilities/StrFmt.cpp index 8d5837eb58..0af09a5da8 100644 --- a/Utilities/StrFmt.cpp +++ b/Utilities/StrFmt.cpp @@ -652,6 +652,11 @@ std::string fmt::to_lower(std::string_view string) return result; } +std::string fmt::truncate(std::string_view src, usz length) +{ + return std::string(src.begin(), src.begin() + std::min(src.size(), length)); +} + bool fmt::match(const std::string& source, const std::string& mask) { usz source_position = 0, mask_position = 0; diff --git a/Utilities/StrUtil.h b/Utilities/StrUtil.h index bbc9e655d9..4fe6fc90cc 100644 --- a/Utilities/StrUtil.h +++ b/Utilities/StrUtil.h @@ -178,6 +178,8 @@ namespace fmt std::string to_upper(std::string_view string); std::string to_lower(std::string_view string); + std::string truncate(std::string_view src, usz length); + bool match(const std::string& source, const std::string& mask); struct buf_to_hexstring diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp index bae0a4e616..83b90d0d9e 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp.cpp @@ -762,7 +762,7 @@ error_code sceNpBasicRegisterHandler(vm::cptr context, vm: return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (nph.basic_handler.registered) + if (nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_EXCEEDS_MAX; } @@ -772,11 +772,7 @@ error_code sceNpBasicRegisterHandler(vm::cptr context, vm: return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT; } - memcpy(&nph.basic_handler.context, context.get_ptr(), sizeof(nph.basic_handler.context)); - nph.basic_handler.handler_func = handler; - nph.basic_handler.handler_arg = arg; - nph.basic_handler.registered = true; - nph.basic_handler.context_sensitive = false; + nph.register_basic_handler(context, handler, arg, false); return CELL_OK; } @@ -792,7 +788,7 @@ error_code sceNpBasicRegisterContextSensitiveHandler(vm::cptr data, u32 size) { - sceNp.todo("sceNpBasicSetPresence(data=*0x%x, size=%d)", data, size); + sceNp.warning("sceNpBasicSetPresence(data=*0x%x, size=%d)", data, size); auto& nph = g_fxo->get>(); @@ -843,28 +835,28 @@ error_code sceNpBasicSetPresence(vm::cptr data, u32 size) return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } - // TODO: Correct but causes issues atm(breaks bomberman ultra) - // if (!data || !data[0]) - // { - // return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT; - // } - if (size > SCE_NP_BASIC_MAX_PRESENCE_SIZE) { return SCE_NP_BASIC_ERROR_EXCEEDS_MAX; } + // Not checked by API + ensure(data); + + std::vector pr_data(data.get_ptr(), data.get_ptr() + size); + nph.set_presence(std::nullopt, pr_data); + return CELL_OK; } error_code sceNpBasicSetPresenceDetails(vm::cptr pres, u32 options) { - sceNp.todo("sceNpBasicSetPresenceDetails(pres=*0x%x, options=0x%x)", pres, options); + sceNp.warning("sceNpBasicSetPresenceDetails(pres=*0x%x, options=0x%x)", pres, options); auto& nph = g_fxo->get>(); @@ -873,27 +865,45 @@ error_code sceNpBasicSetPresenceDetails(vm::cptr pres return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } - if (!pres || options > SCE_NP_BASIC_PRESENCE_OPTIONS_ALL_OPTIONS) + if (options < SCE_NP_BASIC_PRESENCE_OPTIONS_SET_DATA || options > SCE_NP_BASIC_PRESENCE_OPTIONS_ALL_OPTIONS) { return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT; } + // Not checked by API + ensure(pres); + if (pres->size > SCE_NP_BASIC_MAX_PRESENCE_SIZE) { return SCE_NP_BASIC_ERROR_EXCEEDS_MAX; } + std::optional pr_status; + if (options & SCE_NP_BASIC_PRESENCE_OPTIONS_SET_STATUS) + { + pr_status = std::optional(std::string(reinterpret_cast(&pres->status[0]))); + } + + std::optional> pr_data; + if (options & SCE_NP_BASIC_PRESENCE_OPTIONS_SET_DATA) + { + const u8* ptr = &pres->data[0]; + pr_data = std::vector(ptr, ptr + pres->size); + } + + nph.set_presence(pr_status, pr_data); + return CELL_OK; } error_code sceNpBasicSetPresenceDetails2(vm::cptr pres, u32 options) { - sceNp.todo("sceNpBasicSetPresenceDetails2(pres=*0x%x, options=0x%x)", pres, options); + sceNp.warning("sceNpBasicSetPresenceDetails2(pres=*0x%x, options=0x%x)", pres, options); auto& nph = g_fxo->get>(); @@ -902,21 +912,39 @@ error_code sceNpBasicSetPresenceDetails2(vm::cptr pr return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } - if (!pres || options > SCE_NP_BASIC_PRESENCE_OPTIONS_ALL_OPTIONS) + if (options < SCE_NP_BASIC_PRESENCE_OPTIONS_SET_DATA || options > SCE_NP_BASIC_PRESENCE_OPTIONS_ALL_OPTIONS || pres->struct_size != sizeof(SceNpBasicPresenceDetails2)) { return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT; } + // Not checked by API + ensure(pres); + if (pres->size > SCE_NP_BASIC_MAX_PRESENCE_SIZE) { return SCE_NP_BASIC_ERROR_EXCEEDS_MAX; } + std::optional pr_status; + if (options & SCE_NP_BASIC_PRESENCE_OPTIONS_SET_STATUS) + { + pr_status = std::optional(std::string(reinterpret_cast(&pres->status[0]))); + } + + std::optional> pr_data; + if (options & SCE_NP_BASIC_PRESENCE_OPTIONS_SET_DATA) + { + const u8* ptr = &pres->data[0]; + pr_data = std::vector(ptr, ptr + pres->size); + } + + nph.set_presence(pr_status, pr_data); + return CELL_OK; } @@ -931,7 +959,7 @@ error_code sceNpBasicSendMessage(vm::cptr to, vm::cptr data, u32 return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -971,7 +999,7 @@ error_code sceNpBasicSendMessageGui(vm::cptr msg, sys_ return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -996,10 +1024,10 @@ error_code sceNpBasicSendMessageGui(vm::cptr msg, sys_ // Prepare message data message_data msg_data = { - .commId = nph.basic_handler.context, - .msgId = msg->msgId, - .mainType = msg->mainType, - .subType = msg->subType, + .commId = nph.get_basic_handler_context(), + .msgId = msg->msgId, + .mainType = msg->mainType, + .subType = msg->subType, .msgFeatures = msg->msgFeatures}; std::set npids; @@ -1078,7 +1106,7 @@ error_code sceNpBasicSendMessageAttachment(vm::cptr to, vm::cptr return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1114,7 +1142,7 @@ error_code sceNpBasicRecvMessageAttachment(sys_memory_container_t containerId) return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1133,7 +1161,7 @@ error_code sceNpBasicRecvMessageAttachmentLoad(SceNpBasicAttachmentDataId id, vm return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1186,7 +1214,7 @@ error_code sceNpBasicRecvMessageCustom(u16 mainType, u32 recvOptions, sys_memory return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1259,7 +1287,7 @@ error_code sceNpBasicMarkMessageAsUsed(SceNpBasicMessageId msgId) return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1283,7 +1311,7 @@ error_code sceNpBasicAbortGui() return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1304,7 +1332,7 @@ error_code sceNpBasicAddFriend(vm::cptr contact, vm::cptr body, s return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1392,7 +1420,7 @@ error_code sceNpBasicGetFriendListEntry(u32 index, vm::ptr npid) error_code sceNpBasicGetFriendPresenceByIndex(u32 index, vm::ptr user, vm::ptr pres, u32 options) { - sceNp.todo("sceNpBasicGetFriendPresenceByIndex(index=%d, user=*0x%x, pres=*0x%x, options=%d)", index, user, pres, options); + sceNp.warning("sceNpBasicGetFriendPresenceByIndex(index=%d, user=*0x%x, pres=*0x%x, options=%d)", index, user, pres, options); if (!pres) { @@ -1412,12 +1440,12 @@ error_code sceNpBasicGetFriendPresenceByIndex(u32 index, vm::ptr return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT; } - return CELL_OK; + return nph.get_friend_presence_by_index(index, user.get_ptr(), pres.get_ptr()); } error_code sceNpBasicGetFriendPresenceByIndex2(u32 index, vm::ptr user, vm::ptr pres, u32 options) { - sceNp.todo("sceNpBasicGetFriendPresenceByIndex2(index=%d, user=*0x%x, pres=*0x%x, options=%d)", index, user, pres, options); + sceNp.warning("sceNpBasicGetFriendPresenceByIndex2(index=%d, user=*0x%x, pres=*0x%x, options=%d)", index, user, pres, options); if (!pres) { @@ -1437,20 +1465,20 @@ error_code sceNpBasicGetFriendPresenceByIndex2(u32 index, vm::ptr return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT; } - return CELL_OK; + return nph.get_friend_presence_by_index(index, user.get_ptr(), pres.get_ptr()); } error_code sceNpBasicGetFriendPresenceByNpId(vm::cptr npid, vm::ptr pres, u32 options) { - sceNp.todo("sceNpBasicGetFriendPresenceByNpId(npid=*0x%x, pres=*0x%x, options=%d)", npid, pres, options); - - auto& nph = g_fxo->get>(); + sceNp.warning("sceNpBasicGetFriendPresenceByNpId(npid=*0x%x, pres=*0x%x, options=%d)", npid, pres, options); if (!pres) { return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT; } + auto& nph = g_fxo->get>(); + if (!nph.is_NP_init) { return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; @@ -1462,20 +1490,20 @@ error_code sceNpBasicGetFriendPresenceByNpId(vm::cptr npid, vm::ptr npid, vm::ptr pres, u32 options) { - sceNp.todo("sceNpBasicGetFriendPresenceByNpId2(npid=*0x%x, pres=*0x%x, options=%d)", npid, pres, options); - - auto& nph = g_fxo->get>(); + sceNp.warning("sceNpBasicGetFriendPresenceByNpId2(npid=*0x%x, pres=*0x%x, options=%d)", npid, pres, options); if (!pres) { return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT; } + auto& nph = g_fxo->get>(); + if (!nph.is_NP_init) { return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; @@ -1487,7 +1515,7 @@ error_code sceNpBasicGetFriendPresenceByNpId2(vm::cptr npid, vm::ptr npid, vm::ptr description) @@ -1579,7 +1607,7 @@ error_code sceNpBasicGetPlayersHistoryEntryCount(u32 options, vm::ptr count return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1617,7 +1645,7 @@ error_code sceNpBasicGetPlayersHistoryEntry(u32 options, u32 index, vm::ptr npid) return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1731,7 +1759,7 @@ error_code sceNpBasicGetMessageAttachmentEntryCount(vm::ptr count) return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1764,7 +1792,7 @@ error_code sceNpBasicGetMessageAttachmentEntry(u32 index, vm::ptr return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1795,7 +1823,7 @@ error_code sceNpBasicGetCustomInvitationEntryCount(vm::ptr count) return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1828,7 +1856,7 @@ error_code sceNpBasicGetCustomInvitationEntry(u32 index, vm::ptr return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1859,7 +1887,7 @@ error_code sceNpBasicGetMatchingInvitationEntryCount(vm::ptr count) return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1892,7 +1920,7 @@ error_code sceNpBasicGetMatchingInvitationEntry(u32 index, vm::ptr count) return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -1956,7 +1984,7 @@ error_code sceNpBasicGetClanMessageEntry(u32 index, vm::ptr from) return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -2053,7 +2081,7 @@ error_code sceNpBasicGetEvent(vm::ptr event, vm::ptr from, v return SCE_NP_BASIC_ERROR_NOT_INITIALIZED; } - if (!nph.basic_handler.registered) + if (!nph.basic_handler_registered) { return SCE_NP_BASIC_ERROR_NOT_REGISTERED; } @@ -3273,7 +3301,7 @@ error_code sceNpManagerGetAccountRegion(vm::ptr countryCode, v return SCE_NP_ERROR_INVALID_STATE; } - memset(countryCode.get_ptr(), 0, sizeof(countryCode)); + memset(countryCode.get_ptr(), 0, sizeof(SceNpCountryCode)); countryCode->data[0] = 'u'; countryCode->data[1] = 's'; @@ -5634,7 +5662,7 @@ error_code sceNpUtilCmpNpIdInOrder(vm::cptr id1, vm::cptr id2, return CELL_OK; } - if (s32 res = memcmp(id1->unk1, id2->unk1, 4)) + if (s32 res = std::memcmp(id1->unk1, id2->unk1, 4)) { *order = std::clamp(res, -1, 1); return CELL_OK; @@ -5651,12 +5679,12 @@ error_code sceNpUtilCmpNpIdInOrder(vm::cptr id1, vm::cptr id2, if (opt14 != 0 && opt24 != 0) { - s32 res = memcmp(id1->unk1 + 1, id2->unk1 + 1, 4); + s32 res = std::memcmp(id1->unk1 + 1, id2->unk1 + 1, 4); *order = std::clamp(res, -1, 1); return CELL_OK; } - s32 res = memcmp((opt14 != 0 ? id1 : id2)->unk1 + 1, "ps3", 4); + s32 res = std::memcmp((opt14 != 0 ? id1 : id2)->unk1 + 1, "ps3", 4); *order = std::clamp(res, -1, 1); return CELL_OK; } diff --git a/rpcs3/Emu/Cell/Modules/sceNpTus.cpp b/rpcs3/Emu/Cell/Modules/sceNpTus.cpp index 3df206233f..0caa12c81d 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpTus.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpTus.cpp @@ -288,33 +288,44 @@ error_code sceNpTusPollAsync(s32 transId, vm::ptr result) template error_code scenp_tus_set_multislot_variable(s32 transId, T targetNpId, vm::cptr slotIdArray, vm::cptr variableArray, s32 arrayNum, vm::ptr option, bool vuser, bool async) { - auto& nph = g_fxo->get>(); - - if (!nph.is_NP_TUS_init) - { - return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; - } - - if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; - } - - if (!targetNpId || !slotIdArray || !variableArray || arrayNum <= 0) + if (!slotIdArray || !variableArray) { return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; } + if (arrayNum == 0 || option) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS) { return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID; } - if (option || !is_slot_array_valid(slotIdArray, arrayNum)) + if (!is_slot_array_valid(slotIdArray, arrayNum)) { return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; } + auto& nph = g_fxo->get>(); + + if (!nph.is_NP_TUS_init) + { + return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; + } + + if (!targetNpId) + { + return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; + } + + // Probable vsh behaviour + if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; + } + auto trans_ctx = idm::get(transId); if (!trans_ctx) @@ -359,29 +370,12 @@ error_code sceNpTusSetMultiSlotVariableVUserAsync(s32 transId, vm::cptr error_code scenp_tus_get_multislot_variable(s32 transId, T targetNpId, vm::cptr slotIdArray, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option, bool vuser, bool async) { - auto& nph = g_fxo->get>(); - - if (!nph.is_NP_TUS_init) - { - return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; - } - - if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; - } - - if (!targetNpId || !slotIdArray || !variableArray || arrayNum <= 0) + if (!slotIdArray || !variableArray) { return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; } - if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS) - { - return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID; - } - - if (option || !is_slot_array_valid(slotIdArray, arrayNum)) + if (arrayNum == 0 || option) { return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; } @@ -391,6 +385,34 @@ error_code scenp_tus_get_multislot_variable(s32 transId, T targetNpId, vm::cptr< return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT; } + if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS) + { + return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID; + } + + if (!is_slot_array_valid(slotIdArray, arrayNum)) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + + auto& nph = g_fxo->get>(); + + if (!nph.is_NP_TUS_init) + { + return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; + } + + if (!targetNpId) + { + return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; + } + + // Probable vsh behaviour + if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; + } + auto trans_ctx = idm::get(transId); if (!trans_ctx) @@ -435,6 +457,31 @@ error_code sceNpTusGetMultiSlotVariableVUserAsync(s32 transId, vm::cptr error_code scenp_tus_get_multiuser_variable(s32 transId, T targetNpIdArray, SceNpTusSlotId slotId, vm::ptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option, bool vuser, bool async) { + if (!variableArray) + { + return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; + } + + if (arrayNum == 0 || option) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + + if (arrayNum > SCE_NP_SCORE_MAX_NPID_NUM_PER_TRANS) + { + return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID; + } + + if (variableArraySize != arrayNum * sizeof(SceNpTusVariable)) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT; + } + + if (slotId < 0) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + auto& nph = g_fxo->get>(); if (!nph.is_NP_TUS_init) @@ -442,29 +489,15 @@ error_code scenp_tus_get_multiuser_variable(s32 transId, T targetNpIdArray, SceN return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; } - if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; - } - - if (!targetNpIdArray || !variableArray || arrayNum <= 0) + if (!targetNpIdArray) { return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; } - if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS) + // Probable vsh behaviour + if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) { - return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID; - } - - if (option || slotId < 0) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; - } - - if (variableArraySize != arrayNum * sizeof(SceNpTusVariable)) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT; + return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; } auto trans_ctx = idm::get(transId); @@ -516,6 +549,43 @@ error_code sceNpTusGetMultiUserVariableVUserAsync(s32 transId, vm::cptr variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr option, bool async) { + if (!variableArray) + { + return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; + } + + if (arrayNum == 0) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + + // Undocumented behaviour and structure unknown + // Also checks a u32* at offset 4 of the struct for nullptr in which case it behaves like option == nullptr + if (option && *static_cast(option.get_ptr()) != 0xC) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + + if (sortType < SCE_NP_TUS_VARIABLE_SORTTYPE_DESCENDING_DATE || sortType > SCE_NP_TUS_VARIABLE_SORTTYPE_ASCENDING_VALUE) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + + if (arrayNum > SCE_NP_SCORE_MAX_SELECTED_FRIENDS_NUM) + { + return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID; + } + + if (variableArraySize != arrayNum * sizeof(SceNpTusVariable)) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT; + } + + if (slotId < 0) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + auto& nph = g_fxo->get>(); if (!nph.is_NP_TUS_init) @@ -523,31 +593,12 @@ error_code scenp_tus_get_friends_variable(s32 transId, SceNpTusSlotId slotId, s3 return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; } + // Probable vsh behaviour if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) { return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; } - if (!variableArray) - { - return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; - } - - if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS) - { - return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID; - } - - if (option || arrayNum <= 0 || slotId < 0) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; - } - - if (variableArraySize != arrayNum * sizeof(SceNpTusVariable)) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT; - } - auto trans_ctx = idm::get(transId); if (!trans_ctx) @@ -587,9 +638,14 @@ error_code scenp_tus_add_and_get_variable(s32 transId, T targetNpId, SceNpTusSlo return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; } - if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) + if (slotId < 0) { - return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + + if ((option && option->size != sizeof(SceNpTusAddAndGetVariableOptParam)) || outVariableSize != sizeof(SceNpTusVariable)) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT; } if (!targetNpId) @@ -597,14 +653,10 @@ error_code scenp_tus_add_and_get_variable(s32 transId, T targetNpId, SceNpTusSlo return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; } - if (slotId < 0) + // Probable vsh behaviour + if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) { - return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; - } - - if (outVariableSize != sizeof(SceNpTusVariable)) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT; + return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; } auto trans_ctx = idm::get(transId); @@ -658,12 +710,7 @@ error_code scenp_tus_try_and_set_variable(s32 transId, T targetNpId, SceNpTusSlo return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; } - if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; - } - - if (!targetNpId || !resultVariable) + if (!resultVariable) { return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; } @@ -673,11 +720,22 @@ error_code scenp_tus_try_and_set_variable(s32 transId, T targetNpId, SceNpTusSlo return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; } - if (resultVariableSize != sizeof(SceNpTusVariable)) + if ((option && option->size != sizeof(SceNpTusTryAndSetVariableOptParam)) || resultVariableSize != sizeof(SceNpTusVariable)) { return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT; } + if (!targetNpId) + { + return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; + } + + // Probable vsh behaviour + if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; + } + auto trans_ctx = idm::get(transId); if (!trans_ctx) @@ -722,33 +780,39 @@ error_code sceNpTusTryAndSetVariableVUserAsync(s32 transId, vm::cptr error_code scenp_tus_delete_multislot_variable(s32 transId, T targetNpId, vm::cptr slotIdArray, s32 arrayNum, vm::ptr option, bool vuser, bool async) { - auto& nph = g_fxo->get>(); - - if (!nph.is_NP_TUS_init) - { - return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; - } - - if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; - } - - if (!targetNpId || !slotIdArray || arrayNum <= 0) + if (!slotIdArray) { return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; } + if (arrayNum == 0 || option) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS) { return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID; } - if (option || !is_slot_array_valid(slotIdArray, arrayNum)) + if (!is_slot_array_valid(slotIdArray, arrayNum)) { return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; } + auto& nph = g_fxo->get>(); + + if (!nph.is_NP_TUS_init) + { + return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; + } + + // Probable vsh behaviour + if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; + } + auto trans_ctx = idm::get(transId); if (!trans_ctx) @@ -793,6 +857,16 @@ error_code sceNpTusDeleteMultiSlotVariableVUserAsync(s32 transId, vm::cptr error_code scenp_tus_set_data(s32 transId, T targetNpId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr data, vm::cptr info, u32 infoStructSize, vm::ptr option, bool vuser, bool async) { + if (slotId < 0 || !data || !totalSize) + { + return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; + } + + if ((option && option->size != sizeof(SceNpTusSetDataOptParam)) || (info && infoStructSize != sizeof(SceNpTusDataInfo))) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT; + } + auto& nph = g_fxo->get>(); if (!nph.is_NP_TUS_init) @@ -800,19 +874,15 @@ error_code scenp_tus_set_data(s32 transId, T targetNpId, SceNpTusSlotId slotId, return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; } - if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; - } - - if (!targetNpId || !data || totalSize == 0) + if (!targetNpId) { return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; } - if (slotId < 0) + // Probable vsh behaviour + if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) { - return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; } auto trans_ctx = idm::get(transId); @@ -859,18 +929,6 @@ error_code sceNpTusSetDataVUserAsync(s32 transId, vm::cptr error_code scenp_tus_get_data(s32 transId, T targetNpId, SceNpTusSlotId slotId, vm::ptr dataStatus, u32 dataStatusSize, vm::ptr data, u32 recvSize, vm::ptr option, bool vuser, bool async) { - auto& nph = g_fxo->get>(); - - if (!nph.is_NP_TUS_init) - { - return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; - } - - if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; - } - if (!targetNpId) { return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; @@ -881,6 +939,24 @@ error_code scenp_tus_get_data(s32 transId, T targetNpId, SceNpTusSlotId slotId, return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; } + if (dataStatusSize != sizeof(SceNpTusDataStatus)) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT; + } + + auto& nph = g_fxo->get>(); + + if (!nph.is_NP_TUS_init) + { + return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; + } + + // Probable vsh behaviour + if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; + } + auto trans_ctx = idm::get(transId); if (!trans_ctx) @@ -925,6 +1001,31 @@ error_code sceNpTusGetDataVUserAsync(s32 transId, vm::cptr error_code scenp_tus_get_multislot_data_status(s32 transId, T targetNpId, vm::cptr slotIdArray, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option, bool vuser, bool async) { + if (!slotIdArray || !statusArray) + { + return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; + } + + if (arrayNum == 0 || option) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + + if (statusArraySize != arrayNum * sizeof(SceNpTusDataStatus)) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT; + } + + if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS) + { + return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID; + } + + if (!is_slot_array_valid(slotIdArray, arrayNum)) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + auto& nph = g_fxo->get>(); if (!nph.is_NP_TUS_init) @@ -932,24 +1033,15 @@ error_code scenp_tus_get_multislot_data_status(s32 transId, T targetNpId, vm::cp return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; } - if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; - } - - if (!targetNpId || !statusArray || arrayNum <= 0) + if (!targetNpId) { return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; } - if (option || !is_slot_array_valid(slotIdArray, arrayNum)) + // Probable vsh behaviour + if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) { - return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; - } - - if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS) - { - return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID; + return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; } auto trans_ctx = idm::get(transId); @@ -996,6 +1088,31 @@ error_code sceNpTusGetMultiSlotDataStatusVUserAsync(s32 transId, vm::cptr error_code scenp_tus_get_multiuser_data_status(s32 transId, T targetNpIdArray, SceNpTusSlotId slotId, vm::ptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option, bool vuser, bool async) { + if (!statusArray) + { + return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; + } + + if (arrayNum == 0 || option) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + + if (arrayNum > SCE_NP_SCORE_MAX_NPID_NUM_PER_TRANS) + { + return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID; + } + + if (statusArraySize != arrayNum * sizeof(SceNpTusDataStatus)) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT; + } + + if (slotId < 0) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + auto& nph = g_fxo->get>(); if (!nph.is_NP_TUS_init) @@ -1003,24 +1120,15 @@ error_code scenp_tus_get_multiuser_data_status(s32 transId, T targetNpIdArray, S return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; } - if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; - } - - if (!targetNpIdArray || !statusArray || arrayNum <= 0) + if (!targetNpIdArray) { return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; } - if (option || slotId < 0) + // Probable vsh behaviour + if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) { - return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; - } - - if (arrayNum > SCE_NP_TUS_MAX_USER_NUM_PER_TRANS) - { - return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID; + return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; } auto trans_ctx = idm::get(transId); @@ -1072,6 +1180,43 @@ error_code sceNpTusGetMultiUserDataStatusVUserAsync(s32 transId, vm::cptr statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr option, bool async) { + if (!statusArray) + { + return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; + } + + if (arrayNum == 0) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + + // Undocumented behaviour and structure unknown + // Also checks a u32* at offset 4 of the struct for nullptr in which case it behaves like option == nullptr + if (option && *static_cast(option.get_ptr()) != 0xC) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + + if (sortType != SCE_NP_TUS_DATASTATUS_SORTTYPE_DESCENDING_DATE && sortType != SCE_NP_TUS_DATASTATUS_SORTTYPE_ASCENDING_DATE) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + + if (arrayNum > SCE_NP_SCORE_MAX_SELECTED_FRIENDS_NUM) + { + return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID; + } + + if (statusArraySize != arrayNum * sizeof(SceNpTusDataStatus)) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT; + } + + if (slotId < 0) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; + } + auto& nph = g_fxo->get>(); if (!nph.is_NP_TUS_init) @@ -1079,26 +1224,12 @@ error_code scenp_tus_get_friends_data_status(s32 transId, SceNpTusSlotId slotId, return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; } + // Probable vsh behaviour if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) { return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; } - if (!statusArray) - { - return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; - } - - if (option || arrayNum < 0 || slotId < 0) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; - } - - if (arrayNum > SCE_NP_TUS_MAX_SELECTED_FRIENDS_NUM) - { - return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID; - } - auto trans_ctx = idm::get(transId); if (!trans_ctx) @@ -1131,24 +1262,12 @@ error_code sceNpTusGetFriendsDataStatusAsync(s32 transId, SceNpTusSlotId slotId, template error_code scenp_tus_delete_multislot_data(s32 transId, T targetNpId, vm::cptr slotIdArray, s32 arrayNum, vm::ptr option, bool vuser, bool async) { - auto& nph = g_fxo->get>(); - - if (!nph.is_NP_TUS_init) - { - return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; - } - - if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) - { - return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; - } - - if (!targetNpId || !slotIdArray || arrayNum < 0) + if (!slotIdArray) { return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT; } - if (option || !is_slot_array_valid(slotIdArray, arrayNum)) + if (arrayNum == 0 || option) { return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT; } @@ -1158,6 +1277,24 @@ error_code scenp_tus_delete_multislot_data(s32 transId, T targetNpId, vm::cptrget>(); + + if (!nph.is_NP_TUS_init) + { + return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED; + } + + // Probable vsh behaviour + if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE) + { + return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID; + } + auto trans_ctx = idm::get(transId); if (!trans_ctx) diff --git a/rpcs3/Emu/NP/generated/np2_structs.fbs b/rpcs3/Emu/NP/generated/np2_structs.fbs index fdcac6a3fd..68f8fe5f5b 100644 --- a/rpcs3/Emu/NP/generated/np2_structs.fbs +++ b/rpcs3/Emu/NP/generated/np2_structs.fbs @@ -466,3 +466,9 @@ table TusDeleteMultiSlotDataRequest { slotIdArray:[int32]; } +table SetPresenceRequest { + title:string; + status:string; + comment:string; + data:[uint8]; +} diff --git a/rpcs3/Emu/NP/generated/np2_structs_generated.h b/rpcs3/Emu/NP/generated/np2_structs_generated.h index a749cca2a8..a761d4c60d 100644 --- a/rpcs3/Emu/NP/generated/np2_structs_generated.h +++ b/rpcs3/Emu/NP/generated/np2_structs_generated.h @@ -8,9 +8,9 @@ // Ensure the included flatbuffers.h is the same version as when this file was // generated, otherwise it may not be compatible. -static_assert(FLATBUFFERS_VERSION_MAJOR == 2 && - FLATBUFFERS_VERSION_MINOR == 0 && - FLATBUFFERS_VERSION_REVISION == 8, +static_assert(FLATBUFFERS_VERSION_MAJOR == 23 && + FLATBUFFERS_VERSION_MINOR == 5 && + FLATBUFFERS_VERSION_REVISION == 26, "Non-compatible flatbuffers version included"); struct BinAttr; @@ -208,7 +208,10 @@ struct TusGetFriendsDataStatusRequestBuilder; struct TusDeleteMultiSlotDataRequest; struct TusDeleteMultiSlotDataRequestBuilder; -struct BinAttr FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct SetPresenceRequest; +struct SetPresenceRequestBuilder; + +struct BinAttr FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef BinAttrBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ID = 4, @@ -217,10 +220,10 @@ struct BinAttr FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint16_t id() const { return GetField(VT_ID, 0); } - const flatbuffers::Vector *data() const { - return GetPointer *>(VT_DATA); + const ::flatbuffers::Vector *data() const { + return GetPointer *>(VT_DATA); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_ID, 2) && VerifyOffset(verifier, VT_DATA) && @@ -231,37 +234,37 @@ struct BinAttr FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct BinAttrBuilder { typedef BinAttr Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_id(uint16_t id) { fbb_.AddElement(BinAttr::VT_ID, id, 0); } - void add_data(flatbuffers::Offset> data) { + void add_data(::flatbuffers::Offset<::flatbuffers::Vector> data) { fbb_.AddOffset(BinAttr::VT_DATA, data); } - explicit BinAttrBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit BinAttrBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateBinAttr( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateBinAttr( + ::flatbuffers::FlatBufferBuilder &_fbb, uint16_t id = 0, - flatbuffers::Offset> data = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector> data = 0) { BinAttrBuilder builder_(_fbb); builder_.add_data(data); builder_.add_id(id); return builder_.Finish(); } -inline flatbuffers::Offset CreateBinAttrDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateBinAttrDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint16_t id = 0, const std::vector *data = nullptr) { auto data__ = data ? _fbb.CreateVector(*data) : 0; @@ -271,7 +274,7 @@ inline flatbuffers::Offset CreateBinAttrDirect( data__); } -struct IntAttr FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct IntAttr FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef IntAttrBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ID = 4, @@ -283,7 +286,7 @@ struct IntAttr FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint32_t num() const { return GetField(VT_NUM, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_ID, 2) && VerifyField(verifier, VT_NUM, 4) && @@ -293,27 +296,27 @@ struct IntAttr FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct IntAttrBuilder { typedef IntAttr Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_id(uint16_t id) { fbb_.AddElement(IntAttr::VT_ID, id, 0); } void add_num(uint32_t num) { fbb_.AddElement(IntAttr::VT_NUM, num, 0); } - explicit IntAttrBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit IntAttrBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateIntAttr( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateIntAttr( + ::flatbuffers::FlatBufferBuilder &_fbb, uint16_t id = 0, uint32_t num = 0) { IntAttrBuilder builder_(_fbb); @@ -322,7 +325,7 @@ inline flatbuffers::Offset CreateIntAttr( return builder_.Finish(); } -struct RoomMemberBinAttrInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct RoomMemberBinAttrInternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef RoomMemberBinAttrInternalBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_UPDATEDATE = 4, @@ -334,7 +337,7 @@ struct RoomMemberBinAttrInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers:: const BinAttr *data() const { return GetPointer(VT_DATA); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_UPDATEDATE, 8) && VerifyOffset(verifier, VT_DATA) && @@ -345,36 +348,36 @@ struct RoomMemberBinAttrInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers:: struct RoomMemberBinAttrInternalBuilder { typedef RoomMemberBinAttrInternal Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_updateDate(uint64_t updateDate) { fbb_.AddElement(RoomMemberBinAttrInternal::VT_UPDATEDATE, updateDate, 0); } - void add_data(flatbuffers::Offset data) { + void add_data(::flatbuffers::Offset data) { fbb_.AddOffset(RoomMemberBinAttrInternal::VT_DATA, data); } - explicit RoomMemberBinAttrInternalBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit RoomMemberBinAttrInternalBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateRoomMemberBinAttrInternal( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRoomMemberBinAttrInternal( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t updateDate = 0, - flatbuffers::Offset data = 0) { + ::flatbuffers::Offset data = 0) { RoomMemberBinAttrInternalBuilder builder_(_fbb); builder_.add_updateDate(updateDate); builder_.add_data(data); return builder_.Finish(); } -struct BinAttrInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct BinAttrInternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef BinAttrInternalBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_UPDATEDATE = 4, @@ -390,7 +393,7 @@ struct BinAttrInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const BinAttr *data() const { return GetPointer(VT_DATA); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_UPDATEDATE, 8) && VerifyField(verifier, VT_UPDATEMEMBERID, 2) && @@ -402,33 +405,33 @@ struct BinAttrInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct BinAttrInternalBuilder { typedef BinAttrInternal Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_updateDate(uint64_t updateDate) { fbb_.AddElement(BinAttrInternal::VT_UPDATEDATE, updateDate, 0); } void add_updateMemberId(uint16_t updateMemberId) { fbb_.AddElement(BinAttrInternal::VT_UPDATEMEMBERID, updateMemberId, 0); } - void add_data(flatbuffers::Offset data) { + void add_data(::flatbuffers::Offset data) { fbb_.AddOffset(BinAttrInternal::VT_DATA, data); } - explicit BinAttrInternalBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit BinAttrInternalBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateBinAttrInternal( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateBinAttrInternal( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t updateDate = 0, uint16_t updateMemberId = 0, - flatbuffers::Offset data = 0) { + ::flatbuffers::Offset data = 0) { BinAttrInternalBuilder builder_(_fbb); builder_.add_updateDate(updateDate); builder_.add_data(data); @@ -436,7 +439,7 @@ inline flatbuffers::Offset CreateBinAttrInternal( return builder_.Finish(); } -struct OptParam FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct OptParam FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef OptParamBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_TYPE = 4, @@ -452,7 +455,7 @@ struct OptParam FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint16_t hubMemberId() const { return GetField(VT_HUBMEMBERID, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_TYPE, 1) && VerifyField(verifier, VT_FLAG, 1) && @@ -463,8 +466,8 @@ struct OptParam FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct OptParamBuilder { typedef OptParam Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_type(uint8_t type) { fbb_.AddElement(OptParam::VT_TYPE, type, 0); } @@ -474,19 +477,19 @@ struct OptParamBuilder { void add_hubMemberId(uint16_t hubMemberId) { fbb_.AddElement(OptParam::VT_HUBMEMBERID, hubMemberId, 0); } - explicit OptParamBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit OptParamBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateOptParam( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateOptParam( + ::flatbuffers::FlatBufferBuilder &_fbb, uint8_t type = 0, uint8_t flag = 0, uint16_t hubMemberId = 0) { @@ -497,7 +500,7 @@ inline flatbuffers::Offset CreateOptParam( return builder_.Finish(); } -struct GroupConfig FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct GroupConfig FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef GroupConfigBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_SLOTNUM = 4, @@ -511,13 +514,13 @@ struct GroupConfig FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { bool withLabel() const { return GetField(VT_WITHLABEL, 0) != 0; } - const flatbuffers::Vector *label() const { - return GetPointer *>(VT_LABEL); + const ::flatbuffers::Vector *label() const { + return GetPointer *>(VT_LABEL); } bool withPassword() const { return GetField(VT_WITHPASSWORD, 0) != 0; } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SLOTNUM, 4) && VerifyField(verifier, VT_WITHLABEL, 1) && @@ -530,36 +533,36 @@ struct GroupConfig FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct GroupConfigBuilder { typedef GroupConfig Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_slotNum(uint32_t slotNum) { fbb_.AddElement(GroupConfig::VT_SLOTNUM, slotNum, 0); } void add_withLabel(bool withLabel) { fbb_.AddElement(GroupConfig::VT_WITHLABEL, static_cast(withLabel), 0); } - void add_label(flatbuffers::Offset> label) { + void add_label(::flatbuffers::Offset<::flatbuffers::Vector> label) { fbb_.AddOffset(GroupConfig::VT_LABEL, label); } void add_withPassword(bool withPassword) { fbb_.AddElement(GroupConfig::VT_WITHPASSWORD, static_cast(withPassword), 0); } - explicit GroupConfigBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit GroupConfigBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateGroupConfig( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateGroupConfig( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t slotNum = 0, bool withLabel = false, - flatbuffers::Offset> label = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> label = 0, bool withPassword = false) { GroupConfigBuilder builder_(_fbb); builder_.add_label(label); @@ -569,8 +572,8 @@ inline flatbuffers::Offset CreateGroupConfig( return builder_.Finish(); } -inline flatbuffers::Offset CreateGroupConfigDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateGroupConfigDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t slotNum = 0, bool withLabel = false, const std::vector *label = nullptr, @@ -584,23 +587,23 @@ inline flatbuffers::Offset CreateGroupConfigDirect( withPassword); } -struct UserInfo2 FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct UserInfo2 FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef UserInfo2Builder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_NPID = 4, VT_ONLINENAME = 6, VT_AVATARURL = 8 }; - const flatbuffers::String *npId() const { - return GetPointer(VT_NPID); + const ::flatbuffers::String *npId() const { + return GetPointer(VT_NPID); } - const flatbuffers::String *onlineName() const { - return GetPointer(VT_ONLINENAME); + const ::flatbuffers::String *onlineName() const { + return GetPointer(VT_ONLINENAME); } - const flatbuffers::String *avatarUrl() const { - return GetPointer(VT_AVATARURL); + const ::flatbuffers::String *avatarUrl() const { + return GetPointer(VT_AVATARURL); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_NPID) && verifier.VerifyString(npId()) && @@ -614,33 +617,33 @@ struct UserInfo2 FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct UserInfo2Builder { typedef UserInfo2 Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_npId(flatbuffers::Offset npId) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_npId(::flatbuffers::Offset<::flatbuffers::String> npId) { fbb_.AddOffset(UserInfo2::VT_NPID, npId); } - void add_onlineName(flatbuffers::Offset onlineName) { + void add_onlineName(::flatbuffers::Offset<::flatbuffers::String> onlineName) { fbb_.AddOffset(UserInfo2::VT_ONLINENAME, onlineName); } - void add_avatarUrl(flatbuffers::Offset avatarUrl) { + void add_avatarUrl(::flatbuffers::Offset<::flatbuffers::String> avatarUrl) { fbb_.AddOffset(UserInfo2::VT_AVATARURL, avatarUrl); } - explicit UserInfo2Builder(flatbuffers::FlatBufferBuilder &_fbb) + explicit UserInfo2Builder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateUserInfo2( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset npId = 0, - flatbuffers::Offset onlineName = 0, - flatbuffers::Offset avatarUrl = 0) { +inline ::flatbuffers::Offset CreateUserInfo2( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> npId = 0, + ::flatbuffers::Offset<::flatbuffers::String> onlineName = 0, + ::flatbuffers::Offset<::flatbuffers::String> avatarUrl = 0) { UserInfo2Builder builder_(_fbb); builder_.add_avatarUrl(avatarUrl); builder_.add_onlineName(onlineName); @@ -648,8 +651,8 @@ inline flatbuffers::Offset CreateUserInfo2( return builder_.Finish(); } -inline flatbuffers::Offset CreateUserInfo2Direct( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateUserInfo2Direct( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *npId = nullptr, const char *onlineName = nullptr, const char *avatarUrl = nullptr) { @@ -663,7 +666,7 @@ inline flatbuffers::Offset CreateUserInfo2Direct( avatarUrl__); } -struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef RoomMemberDataInternalBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_USERINFO = 4, @@ -696,10 +699,10 @@ struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab uint32_t flagAttr() const { return GetField(VT_FLAGATTR, 0); } - const flatbuffers::Vector> *roomMemberBinAttrInternal() const { - return GetPointer> *>(VT_ROOMMEMBERBINATTRINTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomMemberBinAttrInternal() const { + return GetPointer> *>(VT_ROOMMEMBERBINATTRINTERNAL); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_USERINFO) && verifier.VerifyTable(userInfo()) && @@ -719,9 +722,9 @@ struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab struct RoomMemberDataInternalBuilder { typedef RoomMemberDataInternal Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_userInfo(flatbuffers::Offset userInfo) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_userInfo(::flatbuffers::Offset userInfo) { fbb_.AddOffset(RoomMemberDataInternal::VT_USERINFO, userInfo); } void add_joinDate(uint64_t joinDate) { @@ -733,7 +736,7 @@ struct RoomMemberDataInternalBuilder { void add_teamId(uint8_t teamId) { fbb_.AddElement(RoomMemberDataInternal::VT_TEAMID, teamId, 0); } - void add_roomGroup(flatbuffers::Offset roomGroup) { + void add_roomGroup(::flatbuffers::Offset roomGroup) { fbb_.AddOffset(RoomMemberDataInternal::VT_ROOMGROUP, roomGroup); } void add_natType(uint8_t natType) { @@ -742,30 +745,30 @@ struct RoomMemberDataInternalBuilder { void add_flagAttr(uint32_t flagAttr) { fbb_.AddElement(RoomMemberDataInternal::VT_FLAGATTR, flagAttr, 0); } - void add_roomMemberBinAttrInternal(flatbuffers::Offset>> roomMemberBinAttrInternal) { + void add_roomMemberBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomMemberBinAttrInternal) { fbb_.AddOffset(RoomMemberDataInternal::VT_ROOMMEMBERBINATTRINTERNAL, roomMemberBinAttrInternal); } - explicit RoomMemberDataInternalBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit RoomMemberDataInternalBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateRoomMemberDataInternal( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset userInfo = 0, +inline ::flatbuffers::Offset CreateRoomMemberDataInternal( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset userInfo = 0, uint64_t joinDate = 0, uint16_t memberId = 0, uint8_t teamId = 0, - flatbuffers::Offset roomGroup = 0, + ::flatbuffers::Offset roomGroup = 0, uint8_t natType = 0, uint32_t flagAttr = 0, - flatbuffers::Offset>> roomMemberBinAttrInternal = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomMemberBinAttrInternal = 0) { RoomMemberDataInternalBuilder builder_(_fbb); builder_.add_joinDate(joinDate); builder_.add_roomMemberBinAttrInternal(roomMemberBinAttrInternal); @@ -778,17 +781,17 @@ inline flatbuffers::Offset CreateRoomMemberDataInternal( return builder_.Finish(); } -inline flatbuffers::Offset CreateRoomMemberDataInternalDirect( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset userInfo = 0, +inline ::flatbuffers::Offset CreateRoomMemberDataInternalDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset userInfo = 0, uint64_t joinDate = 0, uint16_t memberId = 0, uint8_t teamId = 0, - flatbuffers::Offset roomGroup = 0, + ::flatbuffers::Offset roomGroup = 0, uint8_t natType = 0, uint32_t flagAttr = 0, - const std::vector> *roomMemberBinAttrInternal = nullptr) { - auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector>(*roomMemberBinAttrInternal) : 0; + const std::vector<::flatbuffers::Offset> *roomMemberBinAttrInternal = nullptr) { + auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomMemberBinAttrInternal) : 0; return CreateRoomMemberDataInternal( _fbb, userInfo, @@ -801,7 +804,7 @@ inline flatbuffers::Offset CreateRoomMemberDataInternalD roomMemberBinAttrInternal__); } -struct RoomGroup FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct RoomGroup FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef RoomGroupBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_GROUPID = 4, @@ -820,8 +823,8 @@ struct RoomGroup FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { bool withLabel() const { return GetField(VT_WITHLABEL, 0) != 0; } - const flatbuffers::Vector *label() const { - return GetPointer *>(VT_LABEL); + const ::flatbuffers::Vector *label() const { + return GetPointer *>(VT_LABEL); } uint32_t slotNum() const { return GetField(VT_SLOTNUM, 0); @@ -829,7 +832,7 @@ struct RoomGroup FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint32_t curGroupMemberNum() const { return GetField(VT_CURGROUPMEMBERNUM, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_GROUPID, 1) && VerifyField(verifier, VT_WITHPASSWORD, 1) && @@ -844,8 +847,8 @@ struct RoomGroup FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct RoomGroupBuilder { typedef RoomGroup Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_groupId(uint8_t groupId) { fbb_.AddElement(RoomGroup::VT_GROUPID, groupId, 0); } @@ -855,7 +858,7 @@ struct RoomGroupBuilder { void add_withLabel(bool withLabel) { fbb_.AddElement(RoomGroup::VT_WITHLABEL, static_cast(withLabel), 0); } - void add_label(flatbuffers::Offset> label) { + void add_label(::flatbuffers::Offset<::flatbuffers::Vector> label) { fbb_.AddOffset(RoomGroup::VT_LABEL, label); } void add_slotNum(uint32_t slotNum) { @@ -864,23 +867,23 @@ struct RoomGroupBuilder { void add_curGroupMemberNum(uint32_t curGroupMemberNum) { fbb_.AddElement(RoomGroup::VT_CURGROUPMEMBERNUM, curGroupMemberNum, 0); } - explicit RoomGroupBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit RoomGroupBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateRoomGroup( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRoomGroup( + ::flatbuffers::FlatBufferBuilder &_fbb, uint8_t groupId = 0, bool withPassword = false, bool withLabel = false, - flatbuffers::Offset> label = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> label = 0, uint32_t slotNum = 0, uint32_t curGroupMemberNum = 0) { RoomGroupBuilder builder_(_fbb); @@ -893,8 +896,8 @@ inline flatbuffers::Offset CreateRoomGroup( return builder_.Finish(); } -inline flatbuffers::Offset CreateRoomGroupDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRoomGroupDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint8_t groupId = 0, bool withPassword = false, bool withLabel = false, @@ -912,7 +915,7 @@ inline flatbuffers::Offset CreateRoomGroupDirect( curGroupMemberNum); } -struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef RoomDataInternalBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_SERVERID = 4, @@ -945,22 +948,22 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint32_t maxSlot() const { return GetField(VT_MAXSLOT, 0); } - const flatbuffers::Vector> *memberList() const { - return GetPointer> *>(VT_MEMBERLIST); + const ::flatbuffers::Vector<::flatbuffers::Offset> *memberList() const { + return GetPointer> *>(VT_MEMBERLIST); } uint16_t ownerId() const { return GetField(VT_OWNERID, 0); } - const flatbuffers::Vector> *roomGroup() const { - return GetPointer> *>(VT_ROOMGROUP); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomGroup() const { + return GetPointer> *>(VT_ROOMGROUP); } uint32_t flagAttr() const { return GetField(VT_FLAGATTR, 0); } - const flatbuffers::Vector> *roomBinAttrInternal() const { - return GetPointer> *>(VT_ROOMBINATTRINTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomBinAttrInternal() const { + return GetPointer> *>(VT_ROOMBINATTRINTERNAL); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SERVERID, 2) && VerifyField(verifier, VT_WORLDID, 4) && @@ -985,8 +988,8 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct RoomDataInternalBuilder { typedef RoomDataInternal Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_serverId(uint16_t serverId) { fbb_.AddElement(RoomDataInternal::VT_SERVERID, serverId, 0); } @@ -1005,45 +1008,45 @@ struct RoomDataInternalBuilder { void add_maxSlot(uint32_t maxSlot) { fbb_.AddElement(RoomDataInternal::VT_MAXSLOT, maxSlot, 0); } - void add_memberList(flatbuffers::Offset>> memberList) { + void add_memberList(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> memberList) { fbb_.AddOffset(RoomDataInternal::VT_MEMBERLIST, memberList); } void add_ownerId(uint16_t ownerId) { fbb_.AddElement(RoomDataInternal::VT_OWNERID, ownerId, 0); } - void add_roomGroup(flatbuffers::Offset>> roomGroup) { + void add_roomGroup(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomGroup) { fbb_.AddOffset(RoomDataInternal::VT_ROOMGROUP, roomGroup); } void add_flagAttr(uint32_t flagAttr) { fbb_.AddElement(RoomDataInternal::VT_FLAGATTR, flagAttr, 0); } - void add_roomBinAttrInternal(flatbuffers::Offset>> roomBinAttrInternal) { + void add_roomBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomBinAttrInternal) { fbb_.AddOffset(RoomDataInternal::VT_ROOMBINATTRINTERNAL, roomBinAttrInternal); } - explicit RoomDataInternalBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit RoomDataInternalBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateRoomDataInternal( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRoomDataInternal( + ::flatbuffers::FlatBufferBuilder &_fbb, uint16_t serverId = 0, uint32_t worldId = 0, uint64_t lobbyId = 0, uint64_t roomId = 0, uint64_t passwordSlotMask = 0, uint32_t maxSlot = 0, - flatbuffers::Offset>> memberList = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> memberList = 0, uint16_t ownerId = 0, - flatbuffers::Offset>> roomGroup = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomGroup = 0, uint32_t flagAttr = 0, - flatbuffers::Offset>> roomBinAttrInternal = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomBinAttrInternal = 0) { RoomDataInternalBuilder builder_(_fbb); builder_.add_passwordSlotMask(passwordSlotMask); builder_.add_roomId(roomId); @@ -1059,22 +1062,22 @@ inline flatbuffers::Offset CreateRoomDataInternal( return builder_.Finish(); } -inline flatbuffers::Offset CreateRoomDataInternalDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRoomDataInternalDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint16_t serverId = 0, uint32_t worldId = 0, uint64_t lobbyId = 0, uint64_t roomId = 0, uint64_t passwordSlotMask = 0, uint32_t maxSlot = 0, - const std::vector> *memberList = nullptr, + const std::vector<::flatbuffers::Offset> *memberList = nullptr, uint16_t ownerId = 0, - const std::vector> *roomGroup = nullptr, + const std::vector<::flatbuffers::Offset> *roomGroup = nullptr, uint32_t flagAttr = 0, - const std::vector> *roomBinAttrInternal = nullptr) { - auto memberList__ = memberList ? _fbb.CreateVector>(*memberList) : 0; - auto roomGroup__ = roomGroup ? _fbb.CreateVector>(*roomGroup) : 0; - auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector>(*roomBinAttrInternal) : 0; + const std::vector<::flatbuffers::Offset> *roomBinAttrInternal = nullptr) { + auto memberList__ = memberList ? _fbb.CreateVector<::flatbuffers::Offset>(*memberList) : 0; + auto roomGroup__ = roomGroup ? _fbb.CreateVector<::flatbuffers::Offset>(*roomGroup) : 0; + auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomBinAttrInternal) : 0; return CreateRoomDataInternal( _fbb, serverId, @@ -1090,7 +1093,7 @@ inline flatbuffers::Offset CreateRoomDataInternalDirect( roomBinAttrInternal__); } -struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef RoomDataExternalBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_SERVERID = 4, @@ -1147,22 +1150,22 @@ struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const UserInfo2 *owner() const { return GetPointer(VT_OWNER); } - const flatbuffers::Vector> *roomGroup() const { - return GetPointer> *>(VT_ROOMGROUP); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomGroup() const { + return GetPointer> *>(VT_ROOMGROUP); } uint32_t flagAttr() const { return GetField(VT_FLAGATTR, 0); } - const flatbuffers::Vector> *roomSearchableIntAttrExternal() const { - return GetPointer> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomSearchableIntAttrExternal() const { + return GetPointer> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL); } - const flatbuffers::Vector> *roomSearchableBinAttrExternal() const { - return GetPointer> *>(VT_ROOMSEARCHABLEBINATTREXTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomSearchableBinAttrExternal() const { + return GetPointer> *>(VT_ROOMSEARCHABLEBINATTREXTERNAL); } - const flatbuffers::Vector> *roomBinAttrExternal() const { - return GetPointer> *>(VT_ROOMBINATTREXTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomBinAttrExternal() const { + return GetPointer> *>(VT_ROOMBINATTREXTERNAL); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SERVERID, 2) && VerifyField(verifier, VT_WORLDID, 4) && @@ -1196,8 +1199,8 @@ struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct RoomDataExternalBuilder { typedef RoomDataExternal Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_serverId(uint16_t serverId) { fbb_.AddElement(RoomDataExternal::VT_SERVERID, serverId, 0); } @@ -1231,37 +1234,37 @@ struct RoomDataExternalBuilder { void add_passwordSlotMask(uint64_t passwordSlotMask) { fbb_.AddElement(RoomDataExternal::VT_PASSWORDSLOTMASK, passwordSlotMask, 0); } - void add_owner(flatbuffers::Offset owner) { + void add_owner(::flatbuffers::Offset owner) { fbb_.AddOffset(RoomDataExternal::VT_OWNER, owner); } - void add_roomGroup(flatbuffers::Offset>> roomGroup) { + void add_roomGroup(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomGroup) { fbb_.AddOffset(RoomDataExternal::VT_ROOMGROUP, roomGroup); } void add_flagAttr(uint32_t flagAttr) { fbb_.AddElement(RoomDataExternal::VT_FLAGATTR, flagAttr, 0); } - void add_roomSearchableIntAttrExternal(flatbuffers::Offset>> roomSearchableIntAttrExternal) { + void add_roomSearchableIntAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomSearchableIntAttrExternal) { fbb_.AddOffset(RoomDataExternal::VT_ROOMSEARCHABLEINTATTREXTERNAL, roomSearchableIntAttrExternal); } - void add_roomSearchableBinAttrExternal(flatbuffers::Offset>> roomSearchableBinAttrExternal) { + void add_roomSearchableBinAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomSearchableBinAttrExternal) { fbb_.AddOffset(RoomDataExternal::VT_ROOMSEARCHABLEBINATTREXTERNAL, roomSearchableBinAttrExternal); } - void add_roomBinAttrExternal(flatbuffers::Offset>> roomBinAttrExternal) { + void add_roomBinAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomBinAttrExternal) { fbb_.AddOffset(RoomDataExternal::VT_ROOMBINATTREXTERNAL, roomBinAttrExternal); } - explicit RoomDataExternalBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit RoomDataExternalBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateRoomDataExternal( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRoomDataExternal( + ::flatbuffers::FlatBufferBuilder &_fbb, uint16_t serverId = 0, uint32_t worldId = 0, uint16_t publicSlotNum = 0, @@ -1273,12 +1276,12 @@ inline flatbuffers::Offset CreateRoomDataExternal( uint16_t openPrivateSlotNum = 0, uint16_t curMemberNum = 0, uint64_t passwordSlotMask = 0, - flatbuffers::Offset owner = 0, - flatbuffers::Offset>> roomGroup = 0, + ::flatbuffers::Offset owner = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomGroup = 0, uint32_t flagAttr = 0, - flatbuffers::Offset>> roomSearchableIntAttrExternal = 0, - flatbuffers::Offset>> roomSearchableBinAttrExternal = 0, - flatbuffers::Offset>> roomBinAttrExternal = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomSearchableIntAttrExternal = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomSearchableBinAttrExternal = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomBinAttrExternal = 0) { RoomDataExternalBuilder builder_(_fbb); builder_.add_passwordSlotMask(passwordSlotMask); builder_.add_roomId(roomId); @@ -1300,8 +1303,8 @@ inline flatbuffers::Offset CreateRoomDataExternal( return builder_.Finish(); } -inline flatbuffers::Offset CreateRoomDataExternalDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRoomDataExternalDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint16_t serverId = 0, uint32_t worldId = 0, uint16_t publicSlotNum = 0, @@ -1313,16 +1316,16 @@ inline flatbuffers::Offset CreateRoomDataExternalDirect( uint16_t openPrivateSlotNum = 0, uint16_t curMemberNum = 0, uint64_t passwordSlotMask = 0, - flatbuffers::Offset owner = 0, - const std::vector> *roomGroup = nullptr, + ::flatbuffers::Offset owner = 0, + const std::vector<::flatbuffers::Offset> *roomGroup = nullptr, uint32_t flagAttr = 0, - const std::vector> *roomSearchableIntAttrExternal = nullptr, - const std::vector> *roomSearchableBinAttrExternal = nullptr, - const std::vector> *roomBinAttrExternal = nullptr) { - auto roomGroup__ = roomGroup ? _fbb.CreateVector>(*roomGroup) : 0; - auto roomSearchableIntAttrExternal__ = roomSearchableIntAttrExternal ? _fbb.CreateVector>(*roomSearchableIntAttrExternal) : 0; - auto roomSearchableBinAttrExternal__ = roomSearchableBinAttrExternal ? _fbb.CreateVector>(*roomSearchableBinAttrExternal) : 0; - auto roomBinAttrExternal__ = roomBinAttrExternal ? _fbb.CreateVector>(*roomBinAttrExternal) : 0; + const std::vector<::flatbuffers::Offset> *roomSearchableIntAttrExternal = nullptr, + const std::vector<::flatbuffers::Offset> *roomSearchableBinAttrExternal = nullptr, + const std::vector<::flatbuffers::Offset> *roomBinAttrExternal = nullptr) { + auto roomGroup__ = roomGroup ? _fbb.CreateVector<::flatbuffers::Offset>(*roomGroup) : 0; + auto roomSearchableIntAttrExternal__ = roomSearchableIntAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomSearchableIntAttrExternal) : 0; + auto roomSearchableBinAttrExternal__ = roomSearchableBinAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomSearchableBinAttrExternal) : 0; + auto roomBinAttrExternal__ = roomBinAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomBinAttrExternal) : 0; return CreateRoomDataExternal( _fbb, serverId, @@ -1344,7 +1347,7 @@ inline flatbuffers::Offset CreateRoomDataExternalDirect( roomBinAttrExternal__); } -struct IntSearchFilter FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct IntSearchFilter FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef IntSearchFilterBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_SEARCHOPERATOR = 4, @@ -1356,7 +1359,7 @@ struct IntSearchFilter FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const IntAttr *attr() const { return GetPointer(VT_ATTR); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SEARCHOPERATOR, 1) && VerifyOffset(verifier, VT_ATTR) && @@ -1367,36 +1370,36 @@ struct IntSearchFilter FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct IntSearchFilterBuilder { typedef IntSearchFilter Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_searchOperator(uint8_t searchOperator) { fbb_.AddElement(IntSearchFilter::VT_SEARCHOPERATOR, searchOperator, 0); } - void add_attr(flatbuffers::Offset attr) { + void add_attr(::flatbuffers::Offset attr) { fbb_.AddOffset(IntSearchFilter::VT_ATTR, attr); } - explicit IntSearchFilterBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit IntSearchFilterBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateIntSearchFilter( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateIntSearchFilter( + ::flatbuffers::FlatBufferBuilder &_fbb, uint8_t searchOperator = 0, - flatbuffers::Offset attr = 0) { + ::flatbuffers::Offset attr = 0) { IntSearchFilterBuilder builder_(_fbb); builder_.add_attr(attr); builder_.add_searchOperator(searchOperator); return builder_.Finish(); } -struct BinSearchFilter FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct BinSearchFilter FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef BinSearchFilterBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_SEARCHOPERATOR = 4, @@ -1408,7 +1411,7 @@ struct BinSearchFilter FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const BinAttr *attr() const { return GetPointer(VT_ATTR); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SEARCHOPERATOR, 1) && VerifyOffset(verifier, VT_ATTR) && @@ -1419,48 +1422,48 @@ struct BinSearchFilter FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct BinSearchFilterBuilder { typedef BinSearchFilter Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_searchOperator(uint8_t searchOperator) { fbb_.AddElement(BinSearchFilter::VT_SEARCHOPERATOR, searchOperator, 0); } - void add_attr(flatbuffers::Offset attr) { + void add_attr(::flatbuffers::Offset attr) { fbb_.AddOffset(BinSearchFilter::VT_ATTR, attr); } - explicit BinSearchFilterBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit BinSearchFilterBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateBinSearchFilter( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateBinSearchFilter( + ::flatbuffers::FlatBufferBuilder &_fbb, uint8_t searchOperator = 0, - flatbuffers::Offset attr = 0) { + ::flatbuffers::Offset attr = 0) { BinSearchFilterBuilder builder_(_fbb); builder_.add_attr(attr); builder_.add_searchOperator(searchOperator); return builder_.Finish(); } -struct PresenceOptionData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct PresenceOptionData FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef PresenceOptionDataBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_DATA = 4, VT_LEN = 6 }; - const flatbuffers::Vector *data() const { - return GetPointer *>(VT_DATA); + const ::flatbuffers::Vector *data() const { + return GetPointer *>(VT_DATA); } uint32_t len() const { return GetField(VT_LEN, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_DATA) && verifier.VerifyVector(data()) && @@ -1471,28 +1474,28 @@ struct PresenceOptionData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct PresenceOptionDataBuilder { typedef PresenceOptionData Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_data(flatbuffers::Offset> data) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_data(::flatbuffers::Offset<::flatbuffers::Vector> data) { fbb_.AddOffset(PresenceOptionData::VT_DATA, data); } void add_len(uint32_t len) { fbb_.AddElement(PresenceOptionData::VT_LEN, len, 0); } - explicit PresenceOptionDataBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit PresenceOptionDataBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreatePresenceOptionData( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset> data = 0, +inline ::flatbuffers::Offset CreatePresenceOptionData( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector> data = 0, uint32_t len = 0) { PresenceOptionDataBuilder builder_(_fbb); builder_.add_len(len); @@ -1500,8 +1503,8 @@ inline flatbuffers::Offset CreatePresenceOptionData( return builder_.Finish(); } -inline flatbuffers::Offset CreatePresenceOptionDataDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreatePresenceOptionDataDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const std::vector *data = nullptr, uint32_t len = 0) { auto data__ = data ? _fbb.CreateVector(*data) : 0; @@ -1511,19 +1514,19 @@ inline flatbuffers::Offset CreatePresenceOptionDataDirect( len); } -struct RoomGroupPasswordConfig FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct RoomGroupPasswordConfig FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef RoomGroupPasswordConfigBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_GROUPID = 4, VT_WITHPASSWORD = 6 }; - const flatbuffers::Vector *groupId() const { - return GetPointer *>(VT_GROUPID); + const ::flatbuffers::Vector *groupId() const { + return GetPointer *>(VT_GROUPID); } bool withPassword() const { return GetField(VT_WITHPASSWORD, 0) != 0; } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_GROUPID) && verifier.VerifyVector(groupId()) && @@ -1534,28 +1537,28 @@ struct RoomGroupPasswordConfig FLATBUFFERS_FINAL_CLASS : private flatbuffers::Ta struct RoomGroupPasswordConfigBuilder { typedef RoomGroupPasswordConfig Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_groupId(flatbuffers::Offset> groupId) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_groupId(::flatbuffers::Offset<::flatbuffers::Vector> groupId) { fbb_.AddOffset(RoomGroupPasswordConfig::VT_GROUPID, groupId); } void add_withPassword(bool withPassword) { fbb_.AddElement(RoomGroupPasswordConfig::VT_WITHPASSWORD, static_cast(withPassword), 0); } - explicit RoomGroupPasswordConfigBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit RoomGroupPasswordConfigBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateRoomGroupPasswordConfig( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset> groupId = 0, +inline ::flatbuffers::Offset CreateRoomGroupPasswordConfig( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector> groupId = 0, bool withPassword = false) { RoomGroupPasswordConfigBuilder builder_(_fbb); builder_.add_groupId(groupId); @@ -1563,8 +1566,8 @@ inline flatbuffers::Offset CreateRoomGroupPasswordConfi return builder_.Finish(); } -inline flatbuffers::Offset CreateRoomGroupPasswordConfigDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRoomGroupPasswordConfigDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const std::vector *groupId = nullptr, bool withPassword = false) { auto groupId__ = groupId ? _fbb.CreateVector(*groupId) : 0; @@ -1574,7 +1577,7 @@ inline flatbuffers::Offset CreateRoomGroupPasswordConfi withPassword); } -struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef SearchRoomRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_OPTION = 4, @@ -1609,16 +1612,16 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint32_t flagAttr() const { return GetField(VT_FLAGATTR, 0); } - const flatbuffers::Vector> *intFilter() const { - return GetPointer> *>(VT_INTFILTER); + const ::flatbuffers::Vector<::flatbuffers::Offset> *intFilter() const { + return GetPointer> *>(VT_INTFILTER); } - const flatbuffers::Vector> *binFilter() const { - return GetPointer> *>(VT_BINFILTER); + const ::flatbuffers::Vector<::flatbuffers::Offset> *binFilter() const { + return GetPointer> *>(VT_BINFILTER); } - const flatbuffers::Vector *attrId() const { - return GetPointer *>(VT_ATTRID); + const ::flatbuffers::Vector *attrId() const { + return GetPointer *>(VT_ATTRID); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_OPTION, 4) && VerifyField(verifier, VT_WORLDID, 4) && @@ -1641,8 +1644,8 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct SearchRoomRequestBuilder { typedef SearchRoomRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_option(int32_t option) { fbb_.AddElement(SearchRoomRequest::VT_OPTION, option, 0); } @@ -1664,28 +1667,28 @@ struct SearchRoomRequestBuilder { void add_flagAttr(uint32_t flagAttr) { fbb_.AddElement(SearchRoomRequest::VT_FLAGATTR, flagAttr, 0); } - void add_intFilter(flatbuffers::Offset>> intFilter) { + void add_intFilter(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> intFilter) { fbb_.AddOffset(SearchRoomRequest::VT_INTFILTER, intFilter); } - void add_binFilter(flatbuffers::Offset>> binFilter) { + void add_binFilter(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> binFilter) { fbb_.AddOffset(SearchRoomRequest::VT_BINFILTER, binFilter); } - void add_attrId(flatbuffers::Offset> attrId) { + void add_attrId(::flatbuffers::Offset<::flatbuffers::Vector> attrId) { fbb_.AddOffset(SearchRoomRequest::VT_ATTRID, attrId); } - explicit SearchRoomRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit SearchRoomRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateSearchRoomRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSearchRoomRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, int32_t option = 0, uint32_t worldId = 0, uint64_t lobbyId = 0, @@ -1693,9 +1696,9 @@ inline flatbuffers::Offset CreateSearchRoomRequest( uint32_t rangeFilter_max = 0, uint32_t flagFilter = 0, uint32_t flagAttr = 0, - flatbuffers::Offset>> intFilter = 0, - flatbuffers::Offset>> binFilter = 0, - flatbuffers::Offset> attrId = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> intFilter = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> binFilter = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> attrId = 0) { SearchRoomRequestBuilder builder_(_fbb); builder_.add_lobbyId(lobbyId); builder_.add_attrId(attrId); @@ -1710,8 +1713,8 @@ inline flatbuffers::Offset CreateSearchRoomRequest( return builder_.Finish(); } -inline flatbuffers::Offset CreateSearchRoomRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSearchRoomRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, int32_t option = 0, uint32_t worldId = 0, uint64_t lobbyId = 0, @@ -1719,11 +1722,11 @@ inline flatbuffers::Offset CreateSearchRoomRequestDirect( uint32_t rangeFilter_max = 0, uint32_t flagFilter = 0, uint32_t flagAttr = 0, - const std::vector> *intFilter = nullptr, - const std::vector> *binFilter = nullptr, + const std::vector<::flatbuffers::Offset> *intFilter = nullptr, + const std::vector<::flatbuffers::Offset> *binFilter = nullptr, const std::vector *attrId = nullptr) { - auto intFilter__ = intFilter ? _fbb.CreateVector>(*intFilter) : 0; - auto binFilter__ = binFilter ? _fbb.CreateVector>(*binFilter) : 0; + auto intFilter__ = intFilter ? _fbb.CreateVector<::flatbuffers::Offset>(*intFilter) : 0; + auto binFilter__ = binFilter ? _fbb.CreateVector<::flatbuffers::Offset>(*binFilter) : 0; auto attrId__ = attrId ? _fbb.CreateVector(*attrId) : 0; return CreateSearchRoomRequest( _fbb, @@ -1739,7 +1742,7 @@ inline flatbuffers::Offset CreateSearchRoomRequestDirect( attrId__); } -struct SearchRoomResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct SearchRoomResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef SearchRoomResponseBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_STARTINDEX = 4, @@ -1756,10 +1759,10 @@ struct SearchRoomResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint32_t size() const { return GetField(VT_SIZE, 0); } - const flatbuffers::Vector> *rooms() const { - return GetPointer> *>(VT_ROOMS); + const ::flatbuffers::Vector<::flatbuffers::Offset> *rooms() const { + return GetPointer> *>(VT_ROOMS); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_STARTINDEX, 4) && VerifyField(verifier, VT_TOTAL, 4) && @@ -1773,8 +1776,8 @@ struct SearchRoomResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct SearchRoomResponseBuilder { typedef SearchRoomResponse Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_startIndex(uint32_t startIndex) { fbb_.AddElement(SearchRoomResponse::VT_STARTINDEX, startIndex, 0); } @@ -1784,26 +1787,26 @@ struct SearchRoomResponseBuilder { void add_size(uint32_t size) { fbb_.AddElement(SearchRoomResponse::VT_SIZE, size, 0); } - void add_rooms(flatbuffers::Offset>> rooms) { + void add_rooms(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> rooms) { fbb_.AddOffset(SearchRoomResponse::VT_ROOMS, rooms); } - explicit SearchRoomResponseBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit SearchRoomResponseBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateSearchRoomResponse( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSearchRoomResponse( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t startIndex = 0, uint32_t total = 0, uint32_t size = 0, - flatbuffers::Offset>> rooms = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> rooms = 0) { SearchRoomResponseBuilder builder_(_fbb); builder_.add_rooms(rooms); builder_.add_size(size); @@ -1812,13 +1815,13 @@ inline flatbuffers::Offset CreateSearchRoomResponse( return builder_.Finish(); } -inline flatbuffers::Offset CreateSearchRoomResponseDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSearchRoomResponseDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t startIndex = 0, uint32_t total = 0, uint32_t size = 0, - const std::vector> *rooms = nullptr) { - auto rooms__ = rooms ? _fbb.CreateVector>(*rooms) : 0; + const std::vector<::flatbuffers::Offset> *rooms = nullptr) { + auto rooms__ = rooms ? _fbb.CreateVector<::flatbuffers::Offset>(*rooms) : 0; return CreateSearchRoomResponse( _fbb, startIndex, @@ -1827,7 +1830,7 @@ inline flatbuffers::Offset CreateSearchRoomResponseDirect( rooms__); } -struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef CreateJoinRoomRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_WORLDID = 4, @@ -1860,38 +1863,38 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl uint32_t flagAttr() const { return GetField(VT_FLAGATTR, 0); } - const flatbuffers::Vector> *roomBinAttrInternal() const { - return GetPointer> *>(VT_ROOMBINATTRINTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomBinAttrInternal() const { + return GetPointer> *>(VT_ROOMBINATTRINTERNAL); } - const flatbuffers::Vector> *roomSearchableIntAttrExternal() const { - return GetPointer> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomSearchableIntAttrExternal() const { + return GetPointer> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL); } - const flatbuffers::Vector> *roomSearchableBinAttrExternal() const { - return GetPointer> *>(VT_ROOMSEARCHABLEBINATTREXTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomSearchableBinAttrExternal() const { + return GetPointer> *>(VT_ROOMSEARCHABLEBINATTREXTERNAL); } - const flatbuffers::Vector> *roomBinAttrExternal() const { - return GetPointer> *>(VT_ROOMBINATTREXTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomBinAttrExternal() const { + return GetPointer> *>(VT_ROOMBINATTREXTERNAL); } - const flatbuffers::Vector *roomPassword() const { - return GetPointer *>(VT_ROOMPASSWORD); + const ::flatbuffers::Vector *roomPassword() const { + return GetPointer *>(VT_ROOMPASSWORD); } - const flatbuffers::Vector> *groupConfig() const { - return GetPointer> *>(VT_GROUPCONFIG); + const ::flatbuffers::Vector<::flatbuffers::Offset> *groupConfig() const { + return GetPointer> *>(VT_GROUPCONFIG); } uint64_t passwordSlotMask() const { return GetField(VT_PASSWORDSLOTMASK, 0); } - const flatbuffers::Vector> *allowedUser() const { - return GetPointer> *>(VT_ALLOWEDUSER); + const ::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>> *allowedUser() const { + return GetPointer> *>(VT_ALLOWEDUSER); } - const flatbuffers::Vector> *blockedUser() const { - return GetPointer> *>(VT_BLOCKEDUSER); + const ::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>> *blockedUser() const { + return GetPointer> *>(VT_BLOCKEDUSER); } - const flatbuffers::Vector *joinRoomGroupLabel() const { - return GetPointer *>(VT_JOINROOMGROUPLABEL); + const ::flatbuffers::Vector *joinRoomGroupLabel() const { + return GetPointer *>(VT_JOINROOMGROUPLABEL); } - const flatbuffers::Vector> *roomMemberBinAttrInternal() const { - return GetPointer> *>(VT_ROOMMEMBERBINATTRINTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomMemberBinAttrInternal() const { + return GetPointer> *>(VT_ROOMMEMBERBINATTRINTERNAL); } uint8_t teamId() const { return GetField(VT_TEAMID, 0); @@ -1899,7 +1902,7 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl const OptParam *sigOptParam() const { return GetPointer(VT_SIGOPTPARAM); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_WORLDID, 4) && VerifyField(verifier, VT_LOBBYID, 8) && @@ -1943,8 +1946,8 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl struct CreateJoinRoomRequestBuilder { typedef CreateJoinRoomRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_worldId(uint32_t worldId) { fbb_.AddElement(CreateJoinRoomRequest::VT_WORLDID, worldId, 0); } @@ -1957,75 +1960,75 @@ struct CreateJoinRoomRequestBuilder { void add_flagAttr(uint32_t flagAttr) { fbb_.AddElement(CreateJoinRoomRequest::VT_FLAGATTR, flagAttr, 0); } - void add_roomBinAttrInternal(flatbuffers::Offset>> roomBinAttrInternal) { + void add_roomBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomBinAttrInternal) { fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMBINATTRINTERNAL, roomBinAttrInternal); } - void add_roomSearchableIntAttrExternal(flatbuffers::Offset>> roomSearchableIntAttrExternal) { + void add_roomSearchableIntAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomSearchableIntAttrExternal) { fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMSEARCHABLEINTATTREXTERNAL, roomSearchableIntAttrExternal); } - void add_roomSearchableBinAttrExternal(flatbuffers::Offset>> roomSearchableBinAttrExternal) { + void add_roomSearchableBinAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomSearchableBinAttrExternal) { fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMSEARCHABLEBINATTREXTERNAL, roomSearchableBinAttrExternal); } - void add_roomBinAttrExternal(flatbuffers::Offset>> roomBinAttrExternal) { + void add_roomBinAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomBinAttrExternal) { fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMBINATTREXTERNAL, roomBinAttrExternal); } - void add_roomPassword(flatbuffers::Offset> roomPassword) { + void add_roomPassword(::flatbuffers::Offset<::flatbuffers::Vector> roomPassword) { fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMPASSWORD, roomPassword); } - void add_groupConfig(flatbuffers::Offset>> groupConfig) { + void add_groupConfig(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> groupConfig) { fbb_.AddOffset(CreateJoinRoomRequest::VT_GROUPCONFIG, groupConfig); } void add_passwordSlotMask(uint64_t passwordSlotMask) { fbb_.AddElement(CreateJoinRoomRequest::VT_PASSWORDSLOTMASK, passwordSlotMask, 0); } - void add_allowedUser(flatbuffers::Offset>> allowedUser) { + void add_allowedUser(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> allowedUser) { fbb_.AddOffset(CreateJoinRoomRequest::VT_ALLOWEDUSER, allowedUser); } - void add_blockedUser(flatbuffers::Offset>> blockedUser) { + void add_blockedUser(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> blockedUser) { fbb_.AddOffset(CreateJoinRoomRequest::VT_BLOCKEDUSER, blockedUser); } - void add_joinRoomGroupLabel(flatbuffers::Offset> joinRoomGroupLabel) { + void add_joinRoomGroupLabel(::flatbuffers::Offset<::flatbuffers::Vector> joinRoomGroupLabel) { fbb_.AddOffset(CreateJoinRoomRequest::VT_JOINROOMGROUPLABEL, joinRoomGroupLabel); } - void add_roomMemberBinAttrInternal(flatbuffers::Offset>> roomMemberBinAttrInternal) { + void add_roomMemberBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomMemberBinAttrInternal) { fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMMEMBERBINATTRINTERNAL, roomMemberBinAttrInternal); } void add_teamId(uint8_t teamId) { fbb_.AddElement(CreateJoinRoomRequest::VT_TEAMID, teamId, 0); } - void add_sigOptParam(flatbuffers::Offset sigOptParam) { + void add_sigOptParam(::flatbuffers::Offset sigOptParam) { fbb_.AddOffset(CreateJoinRoomRequest::VT_SIGOPTPARAM, sigOptParam); } - explicit CreateJoinRoomRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit CreateJoinRoomRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateCreateJoinRoomRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateCreateJoinRoomRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t worldId = 0, uint64_t lobbyId = 0, uint32_t maxSlot = 0, uint32_t flagAttr = 0, - flatbuffers::Offset>> roomBinAttrInternal = 0, - flatbuffers::Offset>> roomSearchableIntAttrExternal = 0, - flatbuffers::Offset>> roomSearchableBinAttrExternal = 0, - flatbuffers::Offset>> roomBinAttrExternal = 0, - flatbuffers::Offset> roomPassword = 0, - flatbuffers::Offset>> groupConfig = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomBinAttrInternal = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomSearchableIntAttrExternal = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomSearchableBinAttrExternal = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomBinAttrExternal = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> roomPassword = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> groupConfig = 0, uint64_t passwordSlotMask = 0, - flatbuffers::Offset>> allowedUser = 0, - flatbuffers::Offset>> blockedUser = 0, - flatbuffers::Offset> joinRoomGroupLabel = 0, - flatbuffers::Offset>> roomMemberBinAttrInternal = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> allowedUser = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> blockedUser = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> joinRoomGroupLabel = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomMemberBinAttrInternal = 0, uint8_t teamId = 0, - flatbuffers::Offset sigOptParam = 0) { + ::flatbuffers::Offset sigOptParam = 0) { CreateJoinRoomRequestBuilder builder_(_fbb); builder_.add_passwordSlotMask(passwordSlotMask); builder_.add_lobbyId(lobbyId); @@ -2047,35 +2050,35 @@ inline flatbuffers::Offset CreateCreateJoinRoomRequest( return builder_.Finish(); } -inline flatbuffers::Offset CreateCreateJoinRoomRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateCreateJoinRoomRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t worldId = 0, uint64_t lobbyId = 0, uint32_t maxSlot = 0, uint32_t flagAttr = 0, - const std::vector> *roomBinAttrInternal = nullptr, - const std::vector> *roomSearchableIntAttrExternal = nullptr, - const std::vector> *roomSearchableBinAttrExternal = nullptr, - const std::vector> *roomBinAttrExternal = nullptr, + const std::vector<::flatbuffers::Offset> *roomBinAttrInternal = nullptr, + const std::vector<::flatbuffers::Offset> *roomSearchableIntAttrExternal = nullptr, + const std::vector<::flatbuffers::Offset> *roomSearchableBinAttrExternal = nullptr, + const std::vector<::flatbuffers::Offset> *roomBinAttrExternal = nullptr, const std::vector *roomPassword = nullptr, - const std::vector> *groupConfig = nullptr, + const std::vector<::flatbuffers::Offset> *groupConfig = nullptr, uint64_t passwordSlotMask = 0, - const std::vector> *allowedUser = nullptr, - const std::vector> *blockedUser = nullptr, + const std::vector<::flatbuffers::Offset<::flatbuffers::String>> *allowedUser = nullptr, + const std::vector<::flatbuffers::Offset<::flatbuffers::String>> *blockedUser = nullptr, const std::vector *joinRoomGroupLabel = nullptr, - const std::vector> *roomMemberBinAttrInternal = nullptr, + const std::vector<::flatbuffers::Offset> *roomMemberBinAttrInternal = nullptr, uint8_t teamId = 0, - flatbuffers::Offset sigOptParam = 0) { - auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector>(*roomBinAttrInternal) : 0; - auto roomSearchableIntAttrExternal__ = roomSearchableIntAttrExternal ? _fbb.CreateVector>(*roomSearchableIntAttrExternal) : 0; - auto roomSearchableBinAttrExternal__ = roomSearchableBinAttrExternal ? _fbb.CreateVector>(*roomSearchableBinAttrExternal) : 0; - auto roomBinAttrExternal__ = roomBinAttrExternal ? _fbb.CreateVector>(*roomBinAttrExternal) : 0; + ::flatbuffers::Offset sigOptParam = 0) { + auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomBinAttrInternal) : 0; + auto roomSearchableIntAttrExternal__ = roomSearchableIntAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomSearchableIntAttrExternal) : 0; + auto roomSearchableBinAttrExternal__ = roomSearchableBinAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomSearchableBinAttrExternal) : 0; + auto roomBinAttrExternal__ = roomBinAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomBinAttrExternal) : 0; auto roomPassword__ = roomPassword ? _fbb.CreateVector(*roomPassword) : 0; - auto groupConfig__ = groupConfig ? _fbb.CreateVector>(*groupConfig) : 0; - auto allowedUser__ = allowedUser ? _fbb.CreateVector>(*allowedUser) : 0; - auto blockedUser__ = blockedUser ? _fbb.CreateVector>(*blockedUser) : 0; + auto groupConfig__ = groupConfig ? _fbb.CreateVector<::flatbuffers::Offset>(*groupConfig) : 0; + auto allowedUser__ = allowedUser ? _fbb.CreateVector<::flatbuffers::Offset<::flatbuffers::String>>(*allowedUser) : 0; + auto blockedUser__ = blockedUser ? _fbb.CreateVector<::flatbuffers::Offset<::flatbuffers::String>>(*blockedUser) : 0; auto joinRoomGroupLabel__ = joinRoomGroupLabel ? _fbb.CreateVector(*joinRoomGroupLabel) : 0; - auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector>(*roomMemberBinAttrInternal) : 0; + auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomMemberBinAttrInternal) : 0; return CreateCreateJoinRoomRequest( _fbb, worldId, @@ -2097,7 +2100,7 @@ inline flatbuffers::Offset CreateCreateJoinRoomRequestDir sigOptParam); } -struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef JoinRoomRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ROOMID = 4, @@ -2110,14 +2113,14 @@ struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint64_t roomId() const { return GetField(VT_ROOMID, 0); } - const flatbuffers::Vector *roomPassword() const { - return GetPointer *>(VT_ROOMPASSWORD); + const ::flatbuffers::Vector *roomPassword() const { + return GetPointer *>(VT_ROOMPASSWORD); } - const flatbuffers::Vector *joinRoomGroupLabel() const { - return GetPointer *>(VT_JOINROOMGROUPLABEL); + const ::flatbuffers::Vector *joinRoomGroupLabel() const { + return GetPointer *>(VT_JOINROOMGROUPLABEL); } - const flatbuffers::Vector> *roomMemberBinAttrInternal() const { - return GetPointer> *>(VT_ROOMMEMBERBINATTRINTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomMemberBinAttrInternal() const { + return GetPointer> *>(VT_ROOMMEMBERBINATTRINTERNAL); } const PresenceOptionData *optData() const { return GetPointer(VT_OPTDATA); @@ -2125,7 +2128,7 @@ struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint8_t teamId() const { return GetField(VT_TEAMID, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_ROOMID, 8) && VerifyOffset(verifier, VT_ROOMPASSWORD) && @@ -2144,44 +2147,44 @@ struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct JoinRoomRequestBuilder { typedef JoinRoomRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_roomId(uint64_t roomId) { fbb_.AddElement(JoinRoomRequest::VT_ROOMID, roomId, 0); } - void add_roomPassword(flatbuffers::Offset> roomPassword) { + void add_roomPassword(::flatbuffers::Offset<::flatbuffers::Vector> roomPassword) { fbb_.AddOffset(JoinRoomRequest::VT_ROOMPASSWORD, roomPassword); } - void add_joinRoomGroupLabel(flatbuffers::Offset> joinRoomGroupLabel) { + void add_joinRoomGroupLabel(::flatbuffers::Offset<::flatbuffers::Vector> joinRoomGroupLabel) { fbb_.AddOffset(JoinRoomRequest::VT_JOINROOMGROUPLABEL, joinRoomGroupLabel); } - void add_roomMemberBinAttrInternal(flatbuffers::Offset>> roomMemberBinAttrInternal) { + void add_roomMemberBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomMemberBinAttrInternal) { fbb_.AddOffset(JoinRoomRequest::VT_ROOMMEMBERBINATTRINTERNAL, roomMemberBinAttrInternal); } - void add_optData(flatbuffers::Offset optData) { + void add_optData(::flatbuffers::Offset optData) { fbb_.AddOffset(JoinRoomRequest::VT_OPTDATA, optData); } void add_teamId(uint8_t teamId) { fbb_.AddElement(JoinRoomRequest::VT_TEAMID, teamId, 0); } - explicit JoinRoomRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit JoinRoomRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateJoinRoomRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateJoinRoomRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, - flatbuffers::Offset> roomPassword = 0, - flatbuffers::Offset> joinRoomGroupLabel = 0, - flatbuffers::Offset>> roomMemberBinAttrInternal = 0, - flatbuffers::Offset optData = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> roomPassword = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> joinRoomGroupLabel = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomMemberBinAttrInternal = 0, + ::flatbuffers::Offset optData = 0, uint8_t teamId = 0) { JoinRoomRequestBuilder builder_(_fbb); builder_.add_roomId(roomId); @@ -2193,17 +2196,17 @@ inline flatbuffers::Offset CreateJoinRoomRequest( return builder_.Finish(); } -inline flatbuffers::Offset CreateJoinRoomRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateJoinRoomRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, const std::vector *roomPassword = nullptr, const std::vector *joinRoomGroupLabel = nullptr, - const std::vector> *roomMemberBinAttrInternal = nullptr, - flatbuffers::Offset optData = 0, + const std::vector<::flatbuffers::Offset> *roomMemberBinAttrInternal = nullptr, + ::flatbuffers::Offset optData = 0, uint8_t teamId = 0) { auto roomPassword__ = roomPassword ? _fbb.CreateVector(*roomPassword) : 0; auto joinRoomGroupLabel__ = joinRoomGroupLabel ? _fbb.CreateVector(*joinRoomGroupLabel) : 0; - auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector>(*roomMemberBinAttrInternal) : 0; + auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomMemberBinAttrInternal) : 0; return CreateJoinRoomRequest( _fbb, roomId, @@ -2214,7 +2217,7 @@ inline flatbuffers::Offset CreateJoinRoomRequestDirect( teamId); } -struct LeaveRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct LeaveRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef LeaveRoomRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ROOMID = 4, @@ -2226,7 +2229,7 @@ struct LeaveRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const PresenceOptionData *optData() const { return GetPointer(VT_OPTDATA); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_ROOMID, 8) && VerifyOffset(verifier, VT_OPTDATA) && @@ -2237,48 +2240,48 @@ struct LeaveRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct LeaveRoomRequestBuilder { typedef LeaveRoomRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_roomId(uint64_t roomId) { fbb_.AddElement(LeaveRoomRequest::VT_ROOMID, roomId, 0); } - void add_optData(flatbuffers::Offset optData) { + void add_optData(::flatbuffers::Offset optData) { fbb_.AddOffset(LeaveRoomRequest::VT_OPTDATA, optData); } - explicit LeaveRoomRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit LeaveRoomRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateLeaveRoomRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateLeaveRoomRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, - flatbuffers::Offset optData = 0) { + ::flatbuffers::Offset optData = 0) { LeaveRoomRequestBuilder builder_(_fbb); builder_.add_roomId(roomId); builder_.add_optData(optData); return builder_.Finish(); } -struct GetRoomDataExternalListRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct GetRoomDataExternalListRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef GetRoomDataExternalListRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ROOMIDS = 4, VT_ATTRIDS = 6 }; - const flatbuffers::Vector *roomIds() const { - return GetPointer *>(VT_ROOMIDS); + const ::flatbuffers::Vector *roomIds() const { + return GetPointer *>(VT_ROOMIDS); } - const flatbuffers::Vector *attrIds() const { - return GetPointer *>(VT_ATTRIDS); + const ::flatbuffers::Vector *attrIds() const { + return GetPointer *>(VT_ATTRIDS); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_ROOMIDS) && verifier.VerifyVector(roomIds()) && @@ -2290,37 +2293,37 @@ struct GetRoomDataExternalListRequest FLATBUFFERS_FINAL_CLASS : private flatbuff struct GetRoomDataExternalListRequestBuilder { typedef GetRoomDataExternalListRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_roomIds(flatbuffers::Offset> roomIds) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_roomIds(::flatbuffers::Offset<::flatbuffers::Vector> roomIds) { fbb_.AddOffset(GetRoomDataExternalListRequest::VT_ROOMIDS, roomIds); } - void add_attrIds(flatbuffers::Offset> attrIds) { + void add_attrIds(::flatbuffers::Offset<::flatbuffers::Vector> attrIds) { fbb_.AddOffset(GetRoomDataExternalListRequest::VT_ATTRIDS, attrIds); } - explicit GetRoomDataExternalListRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit GetRoomDataExternalListRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateGetRoomDataExternalListRequest( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset> roomIds = 0, - flatbuffers::Offset> attrIds = 0) { +inline ::flatbuffers::Offset CreateGetRoomDataExternalListRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector> roomIds = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> attrIds = 0) { GetRoomDataExternalListRequestBuilder builder_(_fbb); builder_.add_attrIds(attrIds); builder_.add_roomIds(roomIds); return builder_.Finish(); } -inline flatbuffers::Offset CreateGetRoomDataExternalListRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateGetRoomDataExternalListRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const std::vector *roomIds = nullptr, const std::vector *attrIds = nullptr) { auto roomIds__ = roomIds ? _fbb.CreateVector(*roomIds) : 0; @@ -2331,15 +2334,15 @@ inline flatbuffers::Offset CreateGetRoomDataExte attrIds__); } -struct GetRoomDataExternalListResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct GetRoomDataExternalListResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef GetRoomDataExternalListResponseBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ROOMS = 4 }; - const flatbuffers::Vector> *rooms() const { - return GetPointer> *>(VT_ROOMS); + const ::flatbuffers::Vector<::flatbuffers::Offset> *rooms() const { + return GetPointer> *>(VT_ROOMS); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_ROOMS) && verifier.VerifyVector(rooms()) && @@ -2350,40 +2353,40 @@ struct GetRoomDataExternalListResponse FLATBUFFERS_FINAL_CLASS : private flatbuf struct GetRoomDataExternalListResponseBuilder { typedef GetRoomDataExternalListResponse Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_rooms(flatbuffers::Offset>> rooms) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_rooms(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> rooms) { fbb_.AddOffset(GetRoomDataExternalListResponse::VT_ROOMS, rooms); } - explicit GetRoomDataExternalListResponseBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit GetRoomDataExternalListResponseBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateGetRoomDataExternalListResponse( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset>> rooms = 0) { +inline ::flatbuffers::Offset CreateGetRoomDataExternalListResponse( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> rooms = 0) { GetRoomDataExternalListResponseBuilder builder_(_fbb); builder_.add_rooms(rooms); return builder_.Finish(); } -inline flatbuffers::Offset CreateGetRoomDataExternalListResponseDirect( - flatbuffers::FlatBufferBuilder &_fbb, - const std::vector> *rooms = nullptr) { - auto rooms__ = rooms ? _fbb.CreateVector>(*rooms) : 0; +inline ::flatbuffers::Offset CreateGetRoomDataExternalListResponseDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + const std::vector<::flatbuffers::Offset> *rooms = nullptr) { + auto rooms__ = rooms ? _fbb.CreateVector<::flatbuffers::Offset>(*rooms) : 0; return CreateGetRoomDataExternalListResponse( _fbb, rooms__); } -struct SetRoomDataExternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct SetRoomDataExternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef SetRoomDataExternalRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ROOMID = 4, @@ -2394,16 +2397,16 @@ struct SetRoomDataExternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers: uint64_t roomId() const { return GetField(VT_ROOMID, 0); } - const flatbuffers::Vector> *roomSearchableIntAttrExternal() const { - return GetPointer> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomSearchableIntAttrExternal() const { + return GetPointer> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL); } - const flatbuffers::Vector> *roomSearchableBinAttrExternal() const { - return GetPointer> *>(VT_ROOMSEARCHABLEBINATTREXTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomSearchableBinAttrExternal() const { + return GetPointer> *>(VT_ROOMSEARCHABLEBINATTREXTERNAL); } - const flatbuffers::Vector> *roomBinAttrExternal() const { - return GetPointer> *>(VT_ROOMBINATTREXTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomBinAttrExternal() const { + return GetPointer> *>(VT_ROOMBINATTREXTERNAL); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_ROOMID, 8) && VerifyOffset(verifier, VT_ROOMSEARCHABLEINTATTREXTERNAL) && @@ -2421,37 +2424,37 @@ struct SetRoomDataExternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers: struct SetRoomDataExternalRequestBuilder { typedef SetRoomDataExternalRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_roomId(uint64_t roomId) { fbb_.AddElement(SetRoomDataExternalRequest::VT_ROOMID, roomId, 0); } - void add_roomSearchableIntAttrExternal(flatbuffers::Offset>> roomSearchableIntAttrExternal) { + void add_roomSearchableIntAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomSearchableIntAttrExternal) { fbb_.AddOffset(SetRoomDataExternalRequest::VT_ROOMSEARCHABLEINTATTREXTERNAL, roomSearchableIntAttrExternal); } - void add_roomSearchableBinAttrExternal(flatbuffers::Offset>> roomSearchableBinAttrExternal) { + void add_roomSearchableBinAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomSearchableBinAttrExternal) { fbb_.AddOffset(SetRoomDataExternalRequest::VT_ROOMSEARCHABLEBINATTREXTERNAL, roomSearchableBinAttrExternal); } - void add_roomBinAttrExternal(flatbuffers::Offset>> roomBinAttrExternal) { + void add_roomBinAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomBinAttrExternal) { fbb_.AddOffset(SetRoomDataExternalRequest::VT_ROOMBINATTREXTERNAL, roomBinAttrExternal); } - explicit SetRoomDataExternalRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit SetRoomDataExternalRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateSetRoomDataExternalRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSetRoomDataExternalRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, - flatbuffers::Offset>> roomSearchableIntAttrExternal = 0, - flatbuffers::Offset>> roomSearchableBinAttrExternal = 0, - flatbuffers::Offset>> roomBinAttrExternal = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomSearchableIntAttrExternal = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomSearchableBinAttrExternal = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomBinAttrExternal = 0) { SetRoomDataExternalRequestBuilder builder_(_fbb); builder_.add_roomId(roomId); builder_.add_roomBinAttrExternal(roomBinAttrExternal); @@ -2460,15 +2463,15 @@ inline flatbuffers::Offset CreateSetRoomDataExternal return builder_.Finish(); } -inline flatbuffers::Offset CreateSetRoomDataExternalRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSetRoomDataExternalRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, - const std::vector> *roomSearchableIntAttrExternal = nullptr, - const std::vector> *roomSearchableBinAttrExternal = nullptr, - const std::vector> *roomBinAttrExternal = nullptr) { - auto roomSearchableIntAttrExternal__ = roomSearchableIntAttrExternal ? _fbb.CreateVector>(*roomSearchableIntAttrExternal) : 0; - auto roomSearchableBinAttrExternal__ = roomSearchableBinAttrExternal ? _fbb.CreateVector>(*roomSearchableBinAttrExternal) : 0; - auto roomBinAttrExternal__ = roomBinAttrExternal ? _fbb.CreateVector>(*roomBinAttrExternal) : 0; + const std::vector<::flatbuffers::Offset> *roomSearchableIntAttrExternal = nullptr, + const std::vector<::flatbuffers::Offset> *roomSearchableBinAttrExternal = nullptr, + const std::vector<::flatbuffers::Offset> *roomBinAttrExternal = nullptr) { + auto roomSearchableIntAttrExternal__ = roomSearchableIntAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomSearchableIntAttrExternal) : 0; + auto roomSearchableBinAttrExternal__ = roomSearchableBinAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomSearchableBinAttrExternal) : 0; + auto roomBinAttrExternal__ = roomBinAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomBinAttrExternal) : 0; return CreateSetRoomDataExternalRequest( _fbb, roomId, @@ -2477,7 +2480,7 @@ inline flatbuffers::Offset CreateSetRoomDataExternal roomBinAttrExternal__); } -struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef SetRoomDataInternalRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ROOMID = 4, @@ -2497,19 +2500,19 @@ struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers: uint32_t flagAttr() const { return GetField(VT_FLAGATTR, 0); } - const flatbuffers::Vector> *roomBinAttrInternal() const { - return GetPointer> *>(VT_ROOMBINATTRINTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomBinAttrInternal() const { + return GetPointer> *>(VT_ROOMBINATTRINTERNAL); } - const flatbuffers::Vector> *passwordConfig() const { - return GetPointer> *>(VT_PASSWORDCONFIG); + const ::flatbuffers::Vector<::flatbuffers::Offset> *passwordConfig() const { + return GetPointer> *>(VT_PASSWORDCONFIG); } uint64_t passwordSlotMask() const { return GetField(VT_PASSWORDSLOTMASK, 0); } - const flatbuffers::Vector *ownerPrivilegeRank() const { - return GetPointer *>(VT_OWNERPRIVILEGERANK); + const ::flatbuffers::Vector *ownerPrivilegeRank() const { + return GetPointer *>(VT_OWNERPRIVILEGERANK); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_ROOMID, 8) && VerifyField(verifier, VT_FLAGFILTER, 4) && @@ -2529,8 +2532,8 @@ struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers: struct SetRoomDataInternalRequestBuilder { typedef SetRoomDataInternalRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_roomId(uint64_t roomId) { fbb_.AddElement(SetRoomDataInternalRequest::VT_ROOMID, roomId, 0); } @@ -2540,38 +2543,38 @@ struct SetRoomDataInternalRequestBuilder { void add_flagAttr(uint32_t flagAttr) { fbb_.AddElement(SetRoomDataInternalRequest::VT_FLAGATTR, flagAttr, 0); } - void add_roomBinAttrInternal(flatbuffers::Offset>> roomBinAttrInternal) { + void add_roomBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomBinAttrInternal) { fbb_.AddOffset(SetRoomDataInternalRequest::VT_ROOMBINATTRINTERNAL, roomBinAttrInternal); } - void add_passwordConfig(flatbuffers::Offset>> passwordConfig) { + void add_passwordConfig(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> passwordConfig) { fbb_.AddOffset(SetRoomDataInternalRequest::VT_PASSWORDCONFIG, passwordConfig); } void add_passwordSlotMask(uint64_t passwordSlotMask) { fbb_.AddElement(SetRoomDataInternalRequest::VT_PASSWORDSLOTMASK, passwordSlotMask, 0); } - void add_ownerPrivilegeRank(flatbuffers::Offset> ownerPrivilegeRank) { + void add_ownerPrivilegeRank(::flatbuffers::Offset<::flatbuffers::Vector> ownerPrivilegeRank) { fbb_.AddOffset(SetRoomDataInternalRequest::VT_OWNERPRIVILEGERANK, ownerPrivilegeRank); } - explicit SetRoomDataInternalRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit SetRoomDataInternalRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateSetRoomDataInternalRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSetRoomDataInternalRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, uint32_t flagFilter = 0, uint32_t flagAttr = 0, - flatbuffers::Offset>> roomBinAttrInternal = 0, - flatbuffers::Offset>> passwordConfig = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomBinAttrInternal = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> passwordConfig = 0, uint64_t passwordSlotMask = 0, - flatbuffers::Offset> ownerPrivilegeRank = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector> ownerPrivilegeRank = 0) { SetRoomDataInternalRequestBuilder builder_(_fbb); builder_.add_passwordSlotMask(passwordSlotMask); builder_.add_roomId(roomId); @@ -2583,17 +2586,17 @@ inline flatbuffers::Offset CreateSetRoomDataInternal return builder_.Finish(); } -inline flatbuffers::Offset CreateSetRoomDataInternalRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSetRoomDataInternalRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, uint32_t flagFilter = 0, uint32_t flagAttr = 0, - const std::vector> *roomBinAttrInternal = nullptr, - const std::vector> *passwordConfig = nullptr, + const std::vector<::flatbuffers::Offset> *roomBinAttrInternal = nullptr, + const std::vector<::flatbuffers::Offset> *passwordConfig = nullptr, uint64_t passwordSlotMask = 0, const std::vector *ownerPrivilegeRank = nullptr) { - auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector>(*roomBinAttrInternal) : 0; - auto passwordConfig__ = passwordConfig ? _fbb.CreateVector>(*passwordConfig) : 0; + auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomBinAttrInternal) : 0; + auto passwordConfig__ = passwordConfig ? _fbb.CreateVector<::flatbuffers::Offset>(*passwordConfig) : 0; auto ownerPrivilegeRank__ = ownerPrivilegeRank ? _fbb.CreateVector(*ownerPrivilegeRank) : 0; return CreateSetRoomDataInternalRequest( _fbb, @@ -2606,7 +2609,7 @@ inline flatbuffers::Offset CreateSetRoomDataInternal ownerPrivilegeRank__); } -struct SetRoomMemberDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct SetRoomMemberDataInternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef SetRoomMemberDataInternalRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ROOMID = 4, @@ -2623,10 +2626,10 @@ struct SetRoomMemberDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbu uint8_t teamId() const { return GetField(VT_TEAMID, 0); } - const flatbuffers::Vector> *roomMemberBinAttrInternal() const { - return GetPointer> *>(VT_ROOMMEMBERBINATTRINTERNAL); + const ::flatbuffers::Vector<::flatbuffers::Offset> *roomMemberBinAttrInternal() const { + return GetPointer> *>(VT_ROOMMEMBERBINATTRINTERNAL); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_ROOMID, 8) && VerifyField(verifier, VT_MEMBERID, 2) && @@ -2640,8 +2643,8 @@ struct SetRoomMemberDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbu struct SetRoomMemberDataInternalRequestBuilder { typedef SetRoomMemberDataInternalRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_roomId(uint64_t roomId) { fbb_.AddElement(SetRoomMemberDataInternalRequest::VT_ROOMID, roomId, 0); } @@ -2651,26 +2654,26 @@ struct SetRoomMemberDataInternalRequestBuilder { void add_teamId(uint8_t teamId) { fbb_.AddElement(SetRoomMemberDataInternalRequest::VT_TEAMID, teamId, 0); } - void add_roomMemberBinAttrInternal(flatbuffers::Offset>> roomMemberBinAttrInternal) { + void add_roomMemberBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomMemberBinAttrInternal) { fbb_.AddOffset(SetRoomMemberDataInternalRequest::VT_ROOMMEMBERBINATTRINTERNAL, roomMemberBinAttrInternal); } - explicit SetRoomMemberDataInternalRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit SetRoomMemberDataInternalRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateSetRoomMemberDataInternalRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSetRoomMemberDataInternalRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, uint16_t memberId = 0, uint8_t teamId = 0, - flatbuffers::Offset>> roomMemberBinAttrInternal = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> roomMemberBinAttrInternal = 0) { SetRoomMemberDataInternalRequestBuilder builder_(_fbb); builder_.add_roomId(roomId); builder_.add_roomMemberBinAttrInternal(roomMemberBinAttrInternal); @@ -2679,13 +2682,13 @@ inline flatbuffers::Offset CreateSetRoomMember return builder_.Finish(); } -inline flatbuffers::Offset CreateSetRoomMemberDataInternalRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSetRoomMemberDataInternalRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, uint16_t memberId = 0, uint8_t teamId = 0, - const std::vector> *roomMemberBinAttrInternal = nullptr) { - auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector>(*roomMemberBinAttrInternal) : 0; + const std::vector<::flatbuffers::Offset> *roomMemberBinAttrInternal = nullptr) { + auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset>(*roomMemberBinAttrInternal) : 0; return CreateSetRoomMemberDataInternalRequest( _fbb, roomId, @@ -2694,7 +2697,7 @@ inline flatbuffers::Offset CreateSetRoomMember roomMemberBinAttrInternal__); } -struct GetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct GetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef GetRoomDataInternalRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ROOMID = 4, @@ -2703,10 +2706,10 @@ struct GetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers: uint64_t roomId() const { return GetField(VT_ROOMID, 0); } - const flatbuffers::Vector *attrId() const { - return GetPointer *>(VT_ATTRID); + const ::flatbuffers::Vector *attrId() const { + return GetPointer *>(VT_ATTRID); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_ROOMID, 8) && VerifyOffset(verifier, VT_ATTRID) && @@ -2717,37 +2720,37 @@ struct GetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers: struct GetRoomDataInternalRequestBuilder { typedef GetRoomDataInternalRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_roomId(uint64_t roomId) { fbb_.AddElement(GetRoomDataInternalRequest::VT_ROOMID, roomId, 0); } - void add_attrId(flatbuffers::Offset> attrId) { + void add_attrId(::flatbuffers::Offset<::flatbuffers::Vector> attrId) { fbb_.AddOffset(GetRoomDataInternalRequest::VT_ATTRID, attrId); } - explicit GetRoomDataInternalRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit GetRoomDataInternalRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateGetRoomDataInternalRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateGetRoomDataInternalRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, - flatbuffers::Offset> attrId = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector> attrId = 0) { GetRoomDataInternalRequestBuilder builder_(_fbb); builder_.add_roomId(roomId); builder_.add_attrId(attrId); return builder_.Finish(); } -inline flatbuffers::Offset CreateGetRoomDataInternalRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateGetRoomDataInternalRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, const std::vector *attrId = nullptr) { auto attrId__ = attrId ? _fbb.CreateVector(*attrId) : 0; @@ -2757,7 +2760,7 @@ inline flatbuffers::Offset CreateGetRoomDataInternal attrId__); } -struct RoomMemberUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct RoomMemberUpdateInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef RoomMemberUpdateInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ROOMMEMBERDATAINTERNAL = 4, @@ -2773,7 +2776,7 @@ struct RoomMemberUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table const PresenceOptionData *optData() const { return GetPointer(VT_OPTDATA); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_ROOMMEMBERDATAINTERNAL) && verifier.VerifyTable(roomMemberDataInternal()) && @@ -2786,33 +2789,33 @@ struct RoomMemberUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table struct RoomMemberUpdateInfoBuilder { typedef RoomMemberUpdateInfo Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_roomMemberDataInternal(flatbuffers::Offset roomMemberDataInternal) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_roomMemberDataInternal(::flatbuffers::Offset roomMemberDataInternal) { fbb_.AddOffset(RoomMemberUpdateInfo::VT_ROOMMEMBERDATAINTERNAL, roomMemberDataInternal); } void add_eventCause(uint8_t eventCause) { fbb_.AddElement(RoomMemberUpdateInfo::VT_EVENTCAUSE, eventCause, 0); } - void add_optData(flatbuffers::Offset optData) { + void add_optData(::flatbuffers::Offset optData) { fbb_.AddOffset(RoomMemberUpdateInfo::VT_OPTDATA, optData); } - explicit RoomMemberUpdateInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit RoomMemberUpdateInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateRoomMemberUpdateInfo( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset roomMemberDataInternal = 0, +inline ::flatbuffers::Offset CreateRoomMemberUpdateInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset roomMemberDataInternal = 0, uint8_t eventCause = 0, - flatbuffers::Offset optData = 0) { + ::flatbuffers::Offset optData = 0) { RoomMemberUpdateInfoBuilder builder_(_fbb); builder_.add_optData(optData); builder_.add_roomMemberDataInternal(roomMemberDataInternal); @@ -2820,7 +2823,7 @@ inline flatbuffers::Offset CreateRoomMemberUpdateInfo( return builder_.Finish(); } -struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef RoomUpdateInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_EVENTCAUSE = 4, @@ -2836,7 +2839,7 @@ struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const PresenceOptionData *optData() const { return GetPointer(VT_OPTDATA); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_EVENTCAUSE, 1) && VerifyField(verifier, VT_ERRORCODE, 4) && @@ -2848,33 +2851,33 @@ struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct RoomUpdateInfoBuilder { typedef RoomUpdateInfo Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_eventCause(uint8_t eventCause) { fbb_.AddElement(RoomUpdateInfo::VT_EVENTCAUSE, eventCause, 0); } void add_errorCode(int32_t errorCode) { fbb_.AddElement(RoomUpdateInfo::VT_ERRORCODE, errorCode, 0); } - void add_optData(flatbuffers::Offset optData) { + void add_optData(::flatbuffers::Offset optData) { fbb_.AddOffset(RoomUpdateInfo::VT_OPTDATA, optData); } - explicit RoomUpdateInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit RoomUpdateInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateRoomUpdateInfo( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRoomUpdateInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, uint8_t eventCause = 0, int32_t errorCode = 0, - flatbuffers::Offset optData = 0) { + ::flatbuffers::Offset optData = 0) { RoomUpdateInfoBuilder builder_(_fbb); builder_.add_optData(optData); builder_.add_errorCode(errorCode); @@ -2882,7 +2885,7 @@ inline flatbuffers::Offset CreateRoomUpdateInfo( return builder_.Finish(); } -struct RoomDataInternalUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct RoomDataInternalUpdateInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef RoomDataInternalUpdateInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_NEWROOMDATAINTERNAL = 4, @@ -2900,13 +2903,13 @@ struct RoomDataInternalUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers: uint64_t prevRoomPasswordSlotMask() const { return GetField(VT_PREVROOMPASSWORDSLOTMASK, 0); } - const flatbuffers::Vector *newRoomGroup() const { - return GetPointer *>(VT_NEWROOMGROUP); + const ::flatbuffers::Vector *newRoomGroup() const { + return GetPointer *>(VT_NEWROOMGROUP); } - const flatbuffers::Vector *newRoomBinAttrInternal() const { - return GetPointer *>(VT_NEWROOMBINATTRINTERNAL); + const ::flatbuffers::Vector *newRoomBinAttrInternal() const { + return GetPointer *>(VT_NEWROOMBINATTRINTERNAL); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_NEWROOMDATAINTERNAL) && verifier.VerifyTable(newRoomDataInternal()) && @@ -2922,9 +2925,9 @@ struct RoomDataInternalUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers: struct RoomDataInternalUpdateInfoBuilder { typedef RoomDataInternalUpdateInfo Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_newRoomDataInternal(flatbuffers::Offset newRoomDataInternal) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_newRoomDataInternal(::flatbuffers::Offset newRoomDataInternal) { fbb_.AddOffset(RoomDataInternalUpdateInfo::VT_NEWROOMDATAINTERNAL, newRoomDataInternal); } void add_prevFlagAttr(uint32_t prevFlagAttr) { @@ -2933,30 +2936,30 @@ struct RoomDataInternalUpdateInfoBuilder { void add_prevRoomPasswordSlotMask(uint64_t prevRoomPasswordSlotMask) { fbb_.AddElement(RoomDataInternalUpdateInfo::VT_PREVROOMPASSWORDSLOTMASK, prevRoomPasswordSlotMask, 0); } - void add_newRoomGroup(flatbuffers::Offset> newRoomGroup) { + void add_newRoomGroup(::flatbuffers::Offset<::flatbuffers::Vector> newRoomGroup) { fbb_.AddOffset(RoomDataInternalUpdateInfo::VT_NEWROOMGROUP, newRoomGroup); } - void add_newRoomBinAttrInternal(flatbuffers::Offset> newRoomBinAttrInternal) { + void add_newRoomBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector> newRoomBinAttrInternal) { fbb_.AddOffset(RoomDataInternalUpdateInfo::VT_NEWROOMBINATTRINTERNAL, newRoomBinAttrInternal); } - explicit RoomDataInternalUpdateInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit RoomDataInternalUpdateInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateRoomDataInternalUpdateInfo( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset newRoomDataInternal = 0, +inline ::flatbuffers::Offset CreateRoomDataInternalUpdateInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset newRoomDataInternal = 0, uint32_t prevFlagAttr = 0, uint64_t prevRoomPasswordSlotMask = 0, - flatbuffers::Offset> newRoomGroup = 0, - flatbuffers::Offset> newRoomBinAttrInternal = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector> newRoomGroup = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> newRoomBinAttrInternal = 0) { RoomDataInternalUpdateInfoBuilder builder_(_fbb); builder_.add_prevRoomPasswordSlotMask(prevRoomPasswordSlotMask); builder_.add_newRoomBinAttrInternal(newRoomBinAttrInternal); @@ -2966,9 +2969,9 @@ inline flatbuffers::Offset CreateRoomDataInternalUpd return builder_.Finish(); } -inline flatbuffers::Offset CreateRoomDataInternalUpdateInfoDirect( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset newRoomDataInternal = 0, +inline ::flatbuffers::Offset CreateRoomDataInternalUpdateInfoDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset newRoomDataInternal = 0, uint32_t prevFlagAttr = 0, uint64_t prevRoomPasswordSlotMask = 0, const std::vector *newRoomGroup = nullptr, @@ -2984,7 +2987,7 @@ inline flatbuffers::Offset CreateRoomDataInternalUpd newRoomBinAttrInternal__); } -struct RoomMemberDataInternalUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct RoomMemberDataInternalUpdateInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef RoomMemberDataInternalUpdateInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_NEWROOMMEMBERDATAINTERNAL = 4, @@ -3001,10 +3004,10 @@ struct RoomMemberDataInternalUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbu uint8_t prevTeamId() const { return GetField(VT_PREVTEAMID, 0); } - const flatbuffers::Vector *newRoomMemberBinAttrInternal() const { - return GetPointer *>(VT_NEWROOMMEMBERBINATTRINTERNAL); + const ::flatbuffers::Vector *newRoomMemberBinAttrInternal() const { + return GetPointer *>(VT_NEWROOMMEMBERBINATTRINTERNAL); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_NEWROOMMEMBERDATAINTERNAL) && verifier.VerifyTable(newRoomMemberDataInternal()) && @@ -3018,9 +3021,9 @@ struct RoomMemberDataInternalUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbu struct RoomMemberDataInternalUpdateInfoBuilder { typedef RoomMemberDataInternalUpdateInfo Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_newRoomMemberDataInternal(flatbuffers::Offset newRoomMemberDataInternal) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_newRoomMemberDataInternal(::flatbuffers::Offset newRoomMemberDataInternal) { fbb_.AddOffset(RoomMemberDataInternalUpdateInfo::VT_NEWROOMMEMBERDATAINTERNAL, newRoomMemberDataInternal); } void add_prevFlagAttr(uint32_t prevFlagAttr) { @@ -3029,26 +3032,26 @@ struct RoomMemberDataInternalUpdateInfoBuilder { void add_prevTeamId(uint8_t prevTeamId) { fbb_.AddElement(RoomMemberDataInternalUpdateInfo::VT_PREVTEAMID, prevTeamId, 0); } - void add_newRoomMemberBinAttrInternal(flatbuffers::Offset> newRoomMemberBinAttrInternal) { + void add_newRoomMemberBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector> newRoomMemberBinAttrInternal) { fbb_.AddOffset(RoomMemberDataInternalUpdateInfo::VT_NEWROOMMEMBERBINATTRINTERNAL, newRoomMemberBinAttrInternal); } - explicit RoomMemberDataInternalUpdateInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit RoomMemberDataInternalUpdateInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateRoomMemberDataInternalUpdateInfo( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset newRoomMemberDataInternal = 0, +inline ::flatbuffers::Offset CreateRoomMemberDataInternalUpdateInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset newRoomMemberDataInternal = 0, uint32_t prevFlagAttr = 0, uint8_t prevTeamId = 0, - flatbuffers::Offset> newRoomMemberBinAttrInternal = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector> newRoomMemberBinAttrInternal = 0) { RoomMemberDataInternalUpdateInfoBuilder builder_(_fbb); builder_.add_newRoomMemberBinAttrInternal(newRoomMemberBinAttrInternal); builder_.add_prevFlagAttr(prevFlagAttr); @@ -3057,9 +3060,9 @@ inline flatbuffers::Offset CreateRoomMemberDat return builder_.Finish(); } -inline flatbuffers::Offset CreateRoomMemberDataInternalUpdateInfoDirect( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset newRoomMemberDataInternal = 0, +inline ::flatbuffers::Offset CreateRoomMemberDataInternalUpdateInfoDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset newRoomMemberDataInternal = 0, uint32_t prevFlagAttr = 0, uint8_t prevTeamId = 0, const std::vector *newRoomMemberBinAttrInternal = nullptr) { @@ -3072,7 +3075,7 @@ inline flatbuffers::Offset CreateRoomMemberDat newRoomMemberBinAttrInternal__); } -struct GetPingInfoResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct GetPingInfoResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef GetPingInfoResponseBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_SERVERID = 4, @@ -3092,7 +3095,7 @@ struct GetPingInfoResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table uint32_t rtt() const { return GetField(VT_RTT, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SERVERID, 2) && VerifyField(verifier, VT_WORLDID, 4) && @@ -3104,8 +3107,8 @@ struct GetPingInfoResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table struct GetPingInfoResponseBuilder { typedef GetPingInfoResponse Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_serverId(uint16_t serverId) { fbb_.AddElement(GetPingInfoResponse::VT_SERVERID, serverId, 0); } @@ -3118,19 +3121,19 @@ struct GetPingInfoResponseBuilder { void add_rtt(uint32_t rtt) { fbb_.AddElement(GetPingInfoResponse::VT_RTT, rtt, 0); } - explicit GetPingInfoResponseBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit GetPingInfoResponseBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateGetPingInfoResponse( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateGetPingInfoResponse( + ::flatbuffers::FlatBufferBuilder &_fbb, uint16_t serverId = 0, uint32_t worldId = 0, uint64_t roomId = 0, @@ -3143,7 +3146,7 @@ inline flatbuffers::Offset CreateGetPingInfoResponse( return builder_.Finish(); } -struct SendRoomMessageRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct SendRoomMessageRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef SendRoomMessageRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_ROOMID = 4, @@ -3158,16 +3161,16 @@ struct SendRoomMessageRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab uint8_t castType() const { return GetField(VT_CASTTYPE, 0); } - const flatbuffers::Vector *dst() const { - return GetPointer *>(VT_DST); + const ::flatbuffers::Vector *dst() const { + return GetPointer *>(VT_DST); } - const flatbuffers::Vector *msg() const { - return GetPointer *>(VT_MSG); + const ::flatbuffers::Vector *msg() const { + return GetPointer *>(VT_MSG); } uint8_t option() const { return GetField(VT_OPTION, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_ROOMID, 8) && VerifyField(verifier, VT_CASTTYPE, 1) && @@ -3182,40 +3185,40 @@ struct SendRoomMessageRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab struct SendRoomMessageRequestBuilder { typedef SendRoomMessageRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_roomId(uint64_t roomId) { fbb_.AddElement(SendRoomMessageRequest::VT_ROOMID, roomId, 0); } void add_castType(uint8_t castType) { fbb_.AddElement(SendRoomMessageRequest::VT_CASTTYPE, castType, 0); } - void add_dst(flatbuffers::Offset> dst) { + void add_dst(::flatbuffers::Offset<::flatbuffers::Vector> dst) { fbb_.AddOffset(SendRoomMessageRequest::VT_DST, dst); } - void add_msg(flatbuffers::Offset> msg) { + void add_msg(::flatbuffers::Offset<::flatbuffers::Vector> msg) { fbb_.AddOffset(SendRoomMessageRequest::VT_MSG, msg); } void add_option(uint8_t option) { fbb_.AddElement(SendRoomMessageRequest::VT_OPTION, option, 0); } - explicit SendRoomMessageRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit SendRoomMessageRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateSendRoomMessageRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSendRoomMessageRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, uint8_t castType = 0, - flatbuffers::Offset> dst = 0, - flatbuffers::Offset> msg = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> dst = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> msg = 0, uint8_t option = 0) { SendRoomMessageRequestBuilder builder_(_fbb); builder_.add_roomId(roomId); @@ -3226,8 +3229,8 @@ inline flatbuffers::Offset CreateSendRoomMessageRequest( return builder_.Finish(); } -inline flatbuffers::Offset CreateSendRoomMessageRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSendRoomMessageRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, uint8_t castType = 0, const std::vector *dst = nullptr, @@ -3244,7 +3247,7 @@ inline flatbuffers::Offset CreateSendRoomMessageRequestD option); } -struct RoomMessageInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct RoomMessageInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef RoomMessageInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_FILTERED = 4, @@ -3259,16 +3262,16 @@ struct RoomMessageInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint8_t castType() const { return GetField(VT_CASTTYPE, 0); } - const flatbuffers::Vector *dst() const { - return GetPointer *>(VT_DST); + const ::flatbuffers::Vector *dst() const { + return GetPointer *>(VT_DST); } const UserInfo2 *srcMember() const { return GetPointer(VT_SRCMEMBER); } - const flatbuffers::Vector *msg() const { - return GetPointer *>(VT_MSG); + const ::flatbuffers::Vector *msg() const { + return GetPointer *>(VT_MSG); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_FILTERED, 1) && VerifyField(verifier, VT_CASTTYPE, 1) && @@ -3284,41 +3287,41 @@ struct RoomMessageInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct RoomMessageInfoBuilder { typedef RoomMessageInfo Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_filtered(bool filtered) { fbb_.AddElement(RoomMessageInfo::VT_FILTERED, static_cast(filtered), 0); } void add_castType(uint8_t castType) { fbb_.AddElement(RoomMessageInfo::VT_CASTTYPE, castType, 0); } - void add_dst(flatbuffers::Offset> dst) { + void add_dst(::flatbuffers::Offset<::flatbuffers::Vector> dst) { fbb_.AddOffset(RoomMessageInfo::VT_DST, dst); } - void add_srcMember(flatbuffers::Offset srcMember) { + void add_srcMember(::flatbuffers::Offset srcMember) { fbb_.AddOffset(RoomMessageInfo::VT_SRCMEMBER, srcMember); } - void add_msg(flatbuffers::Offset> msg) { + void add_msg(::flatbuffers::Offset<::flatbuffers::Vector> msg) { fbb_.AddOffset(RoomMessageInfo::VT_MSG, msg); } - explicit RoomMessageInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit RoomMessageInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateRoomMessageInfo( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRoomMessageInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, bool filtered = false, uint8_t castType = 0, - flatbuffers::Offset> dst = 0, - flatbuffers::Offset srcMember = 0, - flatbuffers::Offset> msg = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector> dst = 0, + ::flatbuffers::Offset srcMember = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> msg = 0) { RoomMessageInfoBuilder builder_(_fbb); builder_.add_msg(msg); builder_.add_srcMember(srcMember); @@ -3328,12 +3331,12 @@ inline flatbuffers::Offset CreateRoomMessageInfo( return builder_.Finish(); } -inline flatbuffers::Offset CreateRoomMessageInfoDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRoomMessageInfoDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, bool filtered = false, uint8_t castType = 0, const std::vector *dst = nullptr, - flatbuffers::Offset srcMember = 0, + ::flatbuffers::Offset srcMember = 0, const std::vector *msg = nullptr) { auto dst__ = dst ? _fbb.CreateVector(*dst) : 0; auto msg__ = msg ? _fbb.CreateVector(*msg) : 0; @@ -3346,7 +3349,7 @@ inline flatbuffers::Offset CreateRoomMessageInfoDirect( msg__); } -struct MessageDetails FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct MessageDetails FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef MessageDetailsBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_COMMUNICATIONID = 4, @@ -3358,8 +3361,8 @@ struct MessageDetails FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_BODY = 16, VT_DATA = 18 }; - const flatbuffers::String *communicationId() const { - return GetPointer(VT_COMMUNICATIONID); + const ::flatbuffers::String *communicationId() const { + return GetPointer(VT_COMMUNICATIONID); } uint64_t msgId() const { return GetField(VT_MSGID, 0); @@ -3373,16 +3376,16 @@ struct MessageDetails FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint32_t msgFeatures() const { return GetField(VT_MSGFEATURES, 0); } - const flatbuffers::String *subject() const { - return GetPointer(VT_SUBJECT); + const ::flatbuffers::String *subject() const { + return GetPointer(VT_SUBJECT); } - const flatbuffers::String *body() const { - return GetPointer(VT_BODY); + const ::flatbuffers::String *body() const { + return GetPointer(VT_BODY); } - const flatbuffers::Vector *data() const { - return GetPointer *>(VT_DATA); + const ::flatbuffers::Vector *data() const { + return GetPointer *>(VT_DATA); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_COMMUNICATIONID) && verifier.VerifyString(communicationId()) && @@ -3402,9 +3405,9 @@ struct MessageDetails FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct MessageDetailsBuilder { typedef MessageDetails Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_communicationId(flatbuffers::Offset communicationId) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_communicationId(::flatbuffers::Offset<::flatbuffers::String> communicationId) { fbb_.AddOffset(MessageDetails::VT_COMMUNICATIONID, communicationId); } void add_msgId(uint64_t msgId) { @@ -3419,36 +3422,36 @@ struct MessageDetailsBuilder { void add_msgFeatures(uint32_t msgFeatures) { fbb_.AddElement(MessageDetails::VT_MSGFEATURES, msgFeatures, 0); } - void add_subject(flatbuffers::Offset subject) { + void add_subject(::flatbuffers::Offset<::flatbuffers::String> subject) { fbb_.AddOffset(MessageDetails::VT_SUBJECT, subject); } - void add_body(flatbuffers::Offset body) { + void add_body(::flatbuffers::Offset<::flatbuffers::String> body) { fbb_.AddOffset(MessageDetails::VT_BODY, body); } - void add_data(flatbuffers::Offset> data) { + void add_data(::flatbuffers::Offset<::flatbuffers::Vector> data) { fbb_.AddOffset(MessageDetails::VT_DATA, data); } - explicit MessageDetailsBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit MessageDetailsBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateMessageDetails( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset communicationId = 0, +inline ::flatbuffers::Offset CreateMessageDetails( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> communicationId = 0, uint64_t msgId = 0, uint16_t mainType = 0, uint16_t subType = 0, uint32_t msgFeatures = 0, - flatbuffers::Offset subject = 0, - flatbuffers::Offset body = 0, - flatbuffers::Offset> data = 0) { + ::flatbuffers::Offset<::flatbuffers::String> subject = 0, + ::flatbuffers::Offset<::flatbuffers::String> body = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> data = 0) { MessageDetailsBuilder builder_(_fbb); builder_.add_msgId(msgId); builder_.add_data(data); @@ -3461,8 +3464,8 @@ inline flatbuffers::Offset CreateMessageDetails( return builder_.Finish(); } -inline flatbuffers::Offset CreateMessageDetailsDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateMessageDetailsDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *communicationId = nullptr, uint64_t msgId = 0, uint16_t mainType = 0, @@ -3487,22 +3490,24 @@ inline flatbuffers::Offset CreateMessageDetailsDirect( data__); } -struct SendMessageRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct SendMessageRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef SendMessageRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_MESSAGE = 4, VT_NPIDS = 6 }; - const flatbuffers::Vector *message() const { - return GetPointer *>(VT_MESSAGE); + const ::flatbuffers::Vector *message() const { + return GetPointer *>(VT_MESSAGE); } const MessageDetails *message_nested_root() const { - return flatbuffers::GetRoot(message()->Data()); + const auto _f = message(); + return _f ? ::flatbuffers::GetRoot(_f->Data()) + : nullptr; } - const flatbuffers::Vector> *npids() const { - return GetPointer> *>(VT_NPIDS); + const ::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>> *npids() const { + return GetPointer> *>(VT_NPIDS); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_MESSAGE) && verifier.VerifyVector(message()) && @@ -3516,48 +3521,48 @@ struct SendMessageRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct SendMessageRequestBuilder { typedef SendMessageRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_message(flatbuffers::Offset> message) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_message(::flatbuffers::Offset<::flatbuffers::Vector> message) { fbb_.AddOffset(SendMessageRequest::VT_MESSAGE, message); } - void add_npids(flatbuffers::Offset>> npids) { + void add_npids(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> npids) { fbb_.AddOffset(SendMessageRequest::VT_NPIDS, npids); } - explicit SendMessageRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit SendMessageRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateSendMessageRequest( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset> message = 0, - flatbuffers::Offset>> npids = 0) { +inline ::flatbuffers::Offset CreateSendMessageRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector> message = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> npids = 0) { SendMessageRequestBuilder builder_(_fbb); builder_.add_npids(npids); builder_.add_message(message); return builder_.Finish(); } -inline flatbuffers::Offset CreateSendMessageRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSendMessageRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const std::vector *message = nullptr, - const std::vector> *npids = nullptr) { + const std::vector<::flatbuffers::Offset<::flatbuffers::String>> *npids = nullptr) { auto message__ = message ? _fbb.CreateVector(*message) : 0; - auto npids__ = npids ? _fbb.CreateVector>(*npids) : 0; + auto npids__ = npids ? _fbb.CreateVector<::flatbuffers::Offset<::flatbuffers::String>>(*npids) : 0; return CreateSendMessageRequest( _fbb, message__, npids__); } -struct BoardInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct BoardInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef BoardInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_RANKLIMIT = 4, @@ -3581,7 +3586,7 @@ struct BoardInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint32_t uploadSizeLimit() const { return GetField(VT_UPLOADSIZELIMIT, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_RANKLIMIT, 4) && VerifyField(verifier, VT_UPDATEMODE, 4) && @@ -3594,8 +3599,8 @@ struct BoardInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct BoardInfoBuilder { typedef BoardInfo Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_rankLimit(uint32_t rankLimit) { fbb_.AddElement(BoardInfo::VT_RANKLIMIT, rankLimit, 0); } @@ -3611,19 +3616,19 @@ struct BoardInfoBuilder { void add_uploadSizeLimit(uint32_t uploadSizeLimit) { fbb_.AddElement(BoardInfo::VT_UPLOADSIZELIMIT, uploadSizeLimit, 0); } - explicit BoardInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit BoardInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateBoardInfo( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateBoardInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t rankLimit = 0, uint32_t updateMode = 0, uint32_t sortMode = 0, @@ -3638,7 +3643,7 @@ inline flatbuffers::Offset CreateBoardInfo( return builder_.Finish(); } -struct RecordScoreRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct RecordScoreRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef RecordScoreRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_BOARDID = 4, @@ -3656,13 +3661,13 @@ struct RecordScoreRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { int64_t score() const { return GetField(VT_SCORE, 0); } - const flatbuffers::String *comment() const { - return GetPointer(VT_COMMENT); + const ::flatbuffers::String *comment() const { + return GetPointer(VT_COMMENT); } - const flatbuffers::Vector *data() const { - return GetPointer *>(VT_DATA); + const ::flatbuffers::Vector *data() const { + return GetPointer *>(VT_DATA); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_BOARDID, 4) && VerifyField(verifier, VT_PCID, 4) && @@ -3677,8 +3682,8 @@ struct RecordScoreRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct RecordScoreRequestBuilder { typedef RecordScoreRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_boardId(uint32_t boardId) { fbb_.AddElement(RecordScoreRequest::VT_BOARDID, boardId, 0); } @@ -3688,30 +3693,30 @@ struct RecordScoreRequestBuilder { void add_score(int64_t score) { fbb_.AddElement(RecordScoreRequest::VT_SCORE, score, 0); } - void add_comment(flatbuffers::Offset comment) { + void add_comment(::flatbuffers::Offset<::flatbuffers::String> comment) { fbb_.AddOffset(RecordScoreRequest::VT_COMMENT, comment); } - void add_data(flatbuffers::Offset> data) { + void add_data(::flatbuffers::Offset<::flatbuffers::Vector> data) { fbb_.AddOffset(RecordScoreRequest::VT_DATA, data); } - explicit RecordScoreRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit RecordScoreRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateRecordScoreRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRecordScoreRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t boardId = 0, int32_t pcId = 0, int64_t score = 0, - flatbuffers::Offset comment = 0, - flatbuffers::Offset> data = 0) { + ::flatbuffers::Offset<::flatbuffers::String> comment = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> data = 0) { RecordScoreRequestBuilder builder_(_fbb); builder_.add_score(score); builder_.add_data(data); @@ -3721,8 +3726,8 @@ inline flatbuffers::Offset CreateRecordScoreRequest( return builder_.Finish(); } -inline flatbuffers::Offset CreateRecordScoreRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRecordScoreRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t boardId = 0, int32_t pcId = 0, int64_t score = 0, @@ -3739,7 +3744,7 @@ inline flatbuffers::Offset CreateRecordScoreRequestDirect( data__); } -struct GetScoreRangeRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct GetScoreRangeRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef GetScoreRangeRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_BOARDID = 4, @@ -3763,7 +3768,7 @@ struct GetScoreRangeRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table bool withGameInfo() const { return GetField(VT_WITHGAMEINFO, 0) != 0; } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_BOARDID, 4) && VerifyField(verifier, VT_STARTRANK, 4) && @@ -3776,8 +3781,8 @@ struct GetScoreRangeRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table struct GetScoreRangeRequestBuilder { typedef GetScoreRangeRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_boardId(uint32_t boardId) { fbb_.AddElement(GetScoreRangeRequest::VT_BOARDID, boardId, 0); } @@ -3793,19 +3798,19 @@ struct GetScoreRangeRequestBuilder { void add_withGameInfo(bool withGameInfo) { fbb_.AddElement(GetScoreRangeRequest::VT_WITHGAMEINFO, static_cast(withGameInfo), 0); } - explicit GetScoreRangeRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit GetScoreRangeRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateGetScoreRangeRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateGetScoreRangeRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t boardId = 0, uint32_t startRank = 0, uint32_t numRanks = 0, @@ -3820,19 +3825,19 @@ inline flatbuffers::Offset CreateGetScoreRangeRequest( return builder_.Finish(); } -struct ScoreNpIdPcId FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct ScoreNpIdPcId FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef ScoreNpIdPcIdBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_NPID = 4, VT_PCID = 6 }; - const flatbuffers::String *npid() const { - return GetPointer(VT_NPID); + const ::flatbuffers::String *npid() const { + return GetPointer(VT_NPID); } int32_t pcId() const { return GetField(VT_PCID, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_NPID) && verifier.VerifyString(npid()) && @@ -3843,28 +3848,28 @@ struct ScoreNpIdPcId FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct ScoreNpIdPcIdBuilder { typedef ScoreNpIdPcId Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_npid(flatbuffers::Offset npid) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_npid(::flatbuffers::Offset<::flatbuffers::String> npid) { fbb_.AddOffset(ScoreNpIdPcId::VT_NPID, npid); } void add_pcId(int32_t pcId) { fbb_.AddElement(ScoreNpIdPcId::VT_PCID, pcId, 0); } - explicit ScoreNpIdPcIdBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit ScoreNpIdPcIdBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateScoreNpIdPcId( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset npid = 0, +inline ::flatbuffers::Offset CreateScoreNpIdPcId( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> npid = 0, int32_t pcId = 0) { ScoreNpIdPcIdBuilder builder_(_fbb); builder_.add_pcId(pcId); @@ -3872,8 +3877,8 @@ inline flatbuffers::Offset CreateScoreNpIdPcId( return builder_.Finish(); } -inline flatbuffers::Offset CreateScoreNpIdPcIdDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateScoreNpIdPcIdDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *npid = nullptr, int32_t pcId = 0) { auto npid__ = npid ? _fbb.CreateString(npid) : 0; @@ -3883,7 +3888,7 @@ inline flatbuffers::Offset CreateScoreNpIdPcIdDirect( pcId); } -struct GetScoreNpIdRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct GetScoreNpIdRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef GetScoreNpIdRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_BOARDID = 4, @@ -3894,8 +3899,8 @@ struct GetScoreNpIdRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table uint32_t boardId() const { return GetField(VT_BOARDID, 0); } - const flatbuffers::Vector> *npids() const { - return GetPointer> *>(VT_NPIDS); + const ::flatbuffers::Vector<::flatbuffers::Offset> *npids() const { + return GetPointer> *>(VT_NPIDS); } bool withComment() const { return GetField(VT_WITHCOMMENT, 0) != 0; @@ -3903,7 +3908,7 @@ struct GetScoreNpIdRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table bool withGameInfo() const { return GetField(VT_WITHGAMEINFO, 0) != 0; } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_BOARDID, 4) && VerifyOffset(verifier, VT_NPIDS) && @@ -3917,12 +3922,12 @@ struct GetScoreNpIdRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table struct GetScoreNpIdRequestBuilder { typedef GetScoreNpIdRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_boardId(uint32_t boardId) { fbb_.AddElement(GetScoreNpIdRequest::VT_BOARDID, boardId, 0); } - void add_npids(flatbuffers::Offset>> npids) { + void add_npids(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> npids) { fbb_.AddOffset(GetScoreNpIdRequest::VT_NPIDS, npids); } void add_withComment(bool withComment) { @@ -3931,21 +3936,21 @@ struct GetScoreNpIdRequestBuilder { void add_withGameInfo(bool withGameInfo) { fbb_.AddElement(GetScoreNpIdRequest::VT_WITHGAMEINFO, static_cast(withGameInfo), 0); } - explicit GetScoreNpIdRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit GetScoreNpIdRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateGetScoreNpIdRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateGetScoreNpIdRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t boardId = 0, - flatbuffers::Offset>> npids = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> npids = 0, bool withComment = false, bool withGameInfo = false) { GetScoreNpIdRequestBuilder builder_(_fbb); @@ -3956,13 +3961,13 @@ inline flatbuffers::Offset CreateGetScoreNpIdRequest( return builder_.Finish(); } -inline flatbuffers::Offset CreateGetScoreNpIdRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateGetScoreNpIdRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t boardId = 0, - const std::vector> *npids = nullptr, + const std::vector<::flatbuffers::Offset> *npids = nullptr, bool withComment = false, bool withGameInfo = false) { - auto npids__ = npids ? _fbb.CreateVector>(*npids) : 0; + auto npids__ = npids ? _fbb.CreateVector<::flatbuffers::Offset>(*npids) : 0; return CreateGetScoreNpIdRequest( _fbb, boardId, @@ -3971,7 +3976,7 @@ inline flatbuffers::Offset CreateGetScoreNpIdRequestDirect( withGameInfo); } -struct GetScoreFriendsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct GetScoreFriendsRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef GetScoreFriendsRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_BOARDID = 4, @@ -3995,7 +4000,7 @@ struct GetScoreFriendsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab bool withGameInfo() const { return GetField(VT_WITHGAMEINFO, 0) != 0; } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_BOARDID, 4) && VerifyField(verifier, VT_INCLUDE_SELF, 1) && @@ -4008,8 +4013,8 @@ struct GetScoreFriendsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab struct GetScoreFriendsRequestBuilder { typedef GetScoreFriendsRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_boardId(uint32_t boardId) { fbb_.AddElement(GetScoreFriendsRequest::VT_BOARDID, boardId, 0); } @@ -4025,19 +4030,19 @@ struct GetScoreFriendsRequestBuilder { void add_withGameInfo(bool withGameInfo) { fbb_.AddElement(GetScoreFriendsRequest::VT_WITHGAMEINFO, static_cast(withGameInfo), 0); } - explicit GetScoreFriendsRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit GetScoreFriendsRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateGetScoreFriendsRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateGetScoreFriendsRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t boardId = 0, bool include_self = false, uint32_t max = 0, @@ -4052,7 +4057,7 @@ inline flatbuffers::Offset CreateGetScoreFriendsRequest( return builder_.Finish(); } -struct ScoreRankData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct ScoreRankData FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef ScoreRankDataBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_NPID = 4, @@ -4063,11 +4068,11 @@ struct ScoreRankData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_HASGAMEDATA = 14, VT_RECORDDATE = 16 }; - const flatbuffers::String *npId() const { - return GetPointer(VT_NPID); + const ::flatbuffers::String *npId() const { + return GetPointer(VT_NPID); } - const flatbuffers::String *onlineName() const { - return GetPointer(VT_ONLINENAME); + const ::flatbuffers::String *onlineName() const { + return GetPointer(VT_ONLINENAME); } int32_t pcId() const { return GetField(VT_PCID, 0); @@ -4084,7 +4089,7 @@ struct ScoreRankData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint64_t recordDate() const { return GetField(VT_RECORDDATE, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_NPID) && verifier.VerifyString(npId()) && @@ -4101,12 +4106,12 @@ struct ScoreRankData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct ScoreRankDataBuilder { typedef ScoreRankData Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_npId(flatbuffers::Offset npId) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_npId(::flatbuffers::Offset<::flatbuffers::String> npId) { fbb_.AddOffset(ScoreRankData::VT_NPID, npId); } - void add_onlineName(flatbuffers::Offset onlineName) { + void add_onlineName(::flatbuffers::Offset<::flatbuffers::String> onlineName) { fbb_.AddOffset(ScoreRankData::VT_ONLINENAME, onlineName); } void add_pcId(int32_t pcId) { @@ -4124,21 +4129,21 @@ struct ScoreRankDataBuilder { void add_recordDate(uint64_t recordDate) { fbb_.AddElement(ScoreRankData::VT_RECORDDATE, recordDate, 0); } - explicit ScoreRankDataBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit ScoreRankDataBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateScoreRankData( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset npId = 0, - flatbuffers::Offset onlineName = 0, +inline ::flatbuffers::Offset CreateScoreRankData( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> npId = 0, + ::flatbuffers::Offset<::flatbuffers::String> onlineName = 0, int32_t pcId = 0, uint32_t rank = 0, int64_t score = 0, @@ -4155,8 +4160,8 @@ inline flatbuffers::Offset CreateScoreRankData( return builder_.Finish(); } -inline flatbuffers::Offset CreateScoreRankDataDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateScoreRankDataDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *npId = nullptr, const char *onlineName = nullptr, int32_t pcId = 0, @@ -4177,15 +4182,15 @@ inline flatbuffers::Offset CreateScoreRankDataDirect( recordDate); } -struct ScoreInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct ScoreInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef ScoreInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_DATA = 4 }; - const flatbuffers::Vector *data() const { - return GetPointer *>(VT_DATA); + const ::flatbuffers::Vector *data() const { + return GetPointer *>(VT_DATA); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_DATA) && verifier.VerifyVector(data()) && @@ -4195,32 +4200,32 @@ struct ScoreInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct ScoreInfoBuilder { typedef ScoreInfo Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_data(flatbuffers::Offset> data) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_data(::flatbuffers::Offset<::flatbuffers::Vector> data) { fbb_.AddOffset(ScoreInfo::VT_DATA, data); } - explicit ScoreInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit ScoreInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateScoreInfo( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset> data = 0) { +inline ::flatbuffers::Offset CreateScoreInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector> data = 0) { ScoreInfoBuilder builder_(_fbb); builder_.add_data(data); return builder_.Finish(); } -inline flatbuffers::Offset CreateScoreInfoDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateScoreInfoDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const std::vector *data = nullptr) { auto data__ = data ? _fbb.CreateVector(*data) : 0; return CreateScoreInfo( @@ -4228,7 +4233,7 @@ inline flatbuffers::Offset CreateScoreInfoDirect( data__); } -struct GetScoreResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct GetScoreResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef GetScoreResponseBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_RANKARRAY = 4, @@ -4237,14 +4242,14 @@ struct GetScoreResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_LASTSORTDATE = 10, VT_TOTALRECORD = 12 }; - const flatbuffers::Vector> *rankArray() const { - return GetPointer> *>(VT_RANKARRAY); + const ::flatbuffers::Vector<::flatbuffers::Offset> *rankArray() const { + return GetPointer> *>(VT_RANKARRAY); } - const flatbuffers::Vector> *commentArray() const { - return GetPointer> *>(VT_COMMENTARRAY); + const ::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>> *commentArray() const { + return GetPointer> *>(VT_COMMENTARRAY); } - const flatbuffers::Vector> *infoArray() const { - return GetPointer> *>(VT_INFOARRAY); + const ::flatbuffers::Vector<::flatbuffers::Offset> *infoArray() const { + return GetPointer> *>(VT_INFOARRAY); } uint64_t lastSortDate() const { return GetField(VT_LASTSORTDATE, 0); @@ -4252,7 +4257,7 @@ struct GetScoreResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint32_t totalRecord() const { return GetField(VT_TOTALRECORD, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_RANKARRAY) && verifier.VerifyVector(rankArray()) && @@ -4271,15 +4276,15 @@ struct GetScoreResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct GetScoreResponseBuilder { typedef GetScoreResponse Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_rankArray(flatbuffers::Offset>> rankArray) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_rankArray(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> rankArray) { fbb_.AddOffset(GetScoreResponse::VT_RANKARRAY, rankArray); } - void add_commentArray(flatbuffers::Offset>> commentArray) { + void add_commentArray(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> commentArray) { fbb_.AddOffset(GetScoreResponse::VT_COMMENTARRAY, commentArray); } - void add_infoArray(flatbuffers::Offset>> infoArray) { + void add_infoArray(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> infoArray) { fbb_.AddOffset(GetScoreResponse::VT_INFOARRAY, infoArray); } void add_lastSortDate(uint64_t lastSortDate) { @@ -4288,22 +4293,22 @@ struct GetScoreResponseBuilder { void add_totalRecord(uint32_t totalRecord) { fbb_.AddElement(GetScoreResponse::VT_TOTALRECORD, totalRecord, 0); } - explicit GetScoreResponseBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit GetScoreResponseBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateGetScoreResponse( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset>> rankArray = 0, - flatbuffers::Offset>> commentArray = 0, - flatbuffers::Offset>> infoArray = 0, +inline ::flatbuffers::Offset CreateGetScoreResponse( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> rankArray = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> commentArray = 0, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> infoArray = 0, uint64_t lastSortDate = 0, uint32_t totalRecord = 0) { GetScoreResponseBuilder builder_(_fbb); @@ -4315,16 +4320,16 @@ inline flatbuffers::Offset CreateGetScoreResponse( return builder_.Finish(); } -inline flatbuffers::Offset CreateGetScoreResponseDirect( - flatbuffers::FlatBufferBuilder &_fbb, - const std::vector> *rankArray = nullptr, - const std::vector> *commentArray = nullptr, - const std::vector> *infoArray = nullptr, +inline ::flatbuffers::Offset CreateGetScoreResponseDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + const std::vector<::flatbuffers::Offset> *rankArray = nullptr, + const std::vector<::flatbuffers::Offset<::flatbuffers::String>> *commentArray = nullptr, + const std::vector<::flatbuffers::Offset> *infoArray = nullptr, uint64_t lastSortDate = 0, uint32_t totalRecord = 0) { - auto rankArray__ = rankArray ? _fbb.CreateVector>(*rankArray) : 0; - auto commentArray__ = commentArray ? _fbb.CreateVector>(*commentArray) : 0; - auto infoArray__ = infoArray ? _fbb.CreateVector>(*infoArray) : 0; + auto rankArray__ = rankArray ? _fbb.CreateVector<::flatbuffers::Offset>(*rankArray) : 0; + auto commentArray__ = commentArray ? _fbb.CreateVector<::flatbuffers::Offset<::flatbuffers::String>>(*commentArray) : 0; + auto infoArray__ = infoArray ? _fbb.CreateVector<::flatbuffers::Offset>(*infoArray) : 0; return CreateGetScoreResponse( _fbb, rankArray__, @@ -4334,7 +4339,7 @@ inline flatbuffers::Offset CreateGetScoreResponseDirect( totalRecord); } -struct RecordScoreGameDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct RecordScoreGameDataRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef RecordScoreGameDataRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_BOARDID = 4, @@ -4350,7 +4355,7 @@ struct RecordScoreGameDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers: int64_t score() const { return GetField(VT_SCORE, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_BOARDID, 4) && VerifyField(verifier, VT_PCID, 4) && @@ -4361,8 +4366,8 @@ struct RecordScoreGameDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers: struct RecordScoreGameDataRequestBuilder { typedef RecordScoreGameDataRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_boardId(uint32_t boardId) { fbb_.AddElement(RecordScoreGameDataRequest::VT_BOARDID, boardId, 0); } @@ -4372,19 +4377,19 @@ struct RecordScoreGameDataRequestBuilder { void add_score(int64_t score) { fbb_.AddElement(RecordScoreGameDataRequest::VT_SCORE, score, 0); } - explicit RecordScoreGameDataRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit RecordScoreGameDataRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateRecordScoreGameDataRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateRecordScoreGameDataRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t boardId = 0, int32_t pcId = 0, int64_t score = 0) { @@ -4395,7 +4400,7 @@ inline flatbuffers::Offset CreateRecordScoreGameData return builder_.Finish(); } -struct GetScoreGameDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct GetScoreGameDataRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef GetScoreGameDataRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_BOARDID = 4, @@ -4405,13 +4410,13 @@ struct GetScoreGameDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Ta uint32_t boardId() const { return GetField(VT_BOARDID, 0); } - const flatbuffers::String *npId() const { - return GetPointer(VT_NPID); + const ::flatbuffers::String *npId() const { + return GetPointer(VT_NPID); } int32_t pcId() const { return GetField(VT_PCID, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_BOARDID, 4) && VerifyOffset(verifier, VT_NPID) && @@ -4423,32 +4428,32 @@ struct GetScoreGameDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Ta struct GetScoreGameDataRequestBuilder { typedef GetScoreGameDataRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_boardId(uint32_t boardId) { fbb_.AddElement(GetScoreGameDataRequest::VT_BOARDID, boardId, 0); } - void add_npId(flatbuffers::Offset npId) { + void add_npId(::flatbuffers::Offset<::flatbuffers::String> npId) { fbb_.AddOffset(GetScoreGameDataRequest::VT_NPID, npId); } void add_pcId(int32_t pcId) { fbb_.AddElement(GetScoreGameDataRequest::VT_PCID, pcId, 0); } - explicit GetScoreGameDataRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit GetScoreGameDataRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateGetScoreGameDataRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateGetScoreGameDataRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t boardId = 0, - flatbuffers::Offset npId = 0, + ::flatbuffers::Offset<::flatbuffers::String> npId = 0, int32_t pcId = 0) { GetScoreGameDataRequestBuilder builder_(_fbb); builder_.add_pcId(pcId); @@ -4457,8 +4462,8 @@ inline flatbuffers::Offset CreateGetScoreGameDataReques return builder_.Finish(); } -inline flatbuffers::Offset CreateGetScoreGameDataRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateGetScoreGameDataRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t boardId = 0, const char *npId = nullptr, int32_t pcId = 0) { @@ -4470,7 +4475,7 @@ inline flatbuffers::Offset CreateGetScoreGameDataReques pcId); } -struct TusUser FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusUser FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusUserBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_VUSER = 4, @@ -4479,10 +4484,10 @@ struct TusUser FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { bool vuser() const { return GetField(VT_VUSER, 0) != 0; } - const flatbuffers::String *npid() const { - return GetPointer(VT_NPID); + const ::flatbuffers::String *npid() const { + return GetPointer(VT_NPID); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_VUSER, 1) && VerifyOffset(verifier, VT_NPID) && @@ -4493,37 +4498,37 @@ struct TusUser FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct TusUserBuilder { typedef TusUser Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_vuser(bool vuser) { fbb_.AddElement(TusUser::VT_VUSER, static_cast(vuser), 0); } - void add_npid(flatbuffers::Offset npid) { + void add_npid(::flatbuffers::Offset<::flatbuffers::String> npid) { fbb_.AddOffset(TusUser::VT_NPID, npid); } - explicit TusUserBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusUserBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusUser( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateTusUser( + ::flatbuffers::FlatBufferBuilder &_fbb, bool vuser = false, - flatbuffers::Offset npid = 0) { + ::flatbuffers::Offset<::flatbuffers::String> npid = 0) { TusUserBuilder builder_(_fbb); builder_.add_npid(npid); builder_.add_vuser(vuser); return builder_.Finish(); } -inline flatbuffers::Offset CreateTusUserDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateTusUserDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, bool vuser = false, const char *npid = nullptr) { auto npid__ = npid ? _fbb.CreateString(npid) : 0; @@ -4533,7 +4538,7 @@ inline flatbuffers::Offset CreateTusUserDirect( npid__); } -struct TusVariable FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusVariable FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusVariableBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_OWNERID = 4, @@ -4543,8 +4548,8 @@ struct TusVariable FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_VARIABLE = 12, VT_OLDVARIABLE = 14 }; - const flatbuffers::String *ownerId() const { - return GetPointer(VT_OWNERID); + const ::flatbuffers::String *ownerId() const { + return GetPointer(VT_OWNERID); } bool hasData() const { return GetField(VT_HASDATA, 0) != 0; @@ -4552,8 +4557,8 @@ struct TusVariable FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint64_t lastChangedDate() const { return GetField(VT_LASTCHANGEDDATE, 0); } - const flatbuffers::String *lastChangedAuthorId() const { - return GetPointer(VT_LASTCHANGEDAUTHORID); + const ::flatbuffers::String *lastChangedAuthorId() const { + return GetPointer(VT_LASTCHANGEDAUTHORID); } int64_t variable() const { return GetField(VT_VARIABLE, 0); @@ -4561,7 +4566,7 @@ struct TusVariable FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { int64_t oldVariable() const { return GetField(VT_OLDVARIABLE, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_OWNERID) && verifier.VerifyString(ownerId()) && @@ -4577,9 +4582,9 @@ struct TusVariable FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct TusVariableBuilder { typedef TusVariable Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_ownerId(flatbuffers::Offset ownerId) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_ownerId(::flatbuffers::Offset<::flatbuffers::String> ownerId) { fbb_.AddOffset(TusVariable::VT_OWNERID, ownerId); } void add_hasData(bool hasData) { @@ -4588,7 +4593,7 @@ struct TusVariableBuilder { void add_lastChangedDate(uint64_t lastChangedDate) { fbb_.AddElement(TusVariable::VT_LASTCHANGEDDATE, lastChangedDate, 0); } - void add_lastChangedAuthorId(flatbuffers::Offset lastChangedAuthorId) { + void add_lastChangedAuthorId(::flatbuffers::Offset<::flatbuffers::String> lastChangedAuthorId) { fbb_.AddOffset(TusVariable::VT_LASTCHANGEDAUTHORID, lastChangedAuthorId); } void add_variable(int64_t variable) { @@ -4597,23 +4602,23 @@ struct TusVariableBuilder { void add_oldVariable(int64_t oldVariable) { fbb_.AddElement(TusVariable::VT_OLDVARIABLE, oldVariable, 0); } - explicit TusVariableBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusVariableBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusVariable( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset ownerId = 0, +inline ::flatbuffers::Offset CreateTusVariable( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> ownerId = 0, bool hasData = false, uint64_t lastChangedDate = 0, - flatbuffers::Offset lastChangedAuthorId = 0, + ::flatbuffers::Offset<::flatbuffers::String> lastChangedAuthorId = 0, int64_t variable = 0, int64_t oldVariable = 0) { TusVariableBuilder builder_(_fbb); @@ -4626,8 +4631,8 @@ inline flatbuffers::Offset CreateTusVariable( return builder_.Finish(); } -inline flatbuffers::Offset CreateTusVariableDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateTusVariableDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *ownerId = nullptr, bool hasData = false, uint64_t lastChangedDate = 0, @@ -4646,15 +4651,15 @@ inline flatbuffers::Offset CreateTusVariableDirect( oldVariable); } -struct TusVarResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusVarResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusVarResponseBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_VARS = 4 }; - const flatbuffers::Vector> *vars() const { - return GetPointer> *>(VT_VARS); + const ::flatbuffers::Vector<::flatbuffers::Offset> *vars() const { + return GetPointer> *>(VT_VARS); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_VARS) && verifier.VerifyVector(vars()) && @@ -4665,40 +4670,40 @@ struct TusVarResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct TusVarResponseBuilder { typedef TusVarResponse Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_vars(flatbuffers::Offset>> vars) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_vars(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> vars) { fbb_.AddOffset(TusVarResponse::VT_VARS, vars); } - explicit TusVarResponseBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusVarResponseBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusVarResponse( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset>> vars = 0) { +inline ::flatbuffers::Offset CreateTusVarResponse( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> vars = 0) { TusVarResponseBuilder builder_(_fbb); builder_.add_vars(vars); return builder_.Finish(); } -inline flatbuffers::Offset CreateTusVarResponseDirect( - flatbuffers::FlatBufferBuilder &_fbb, - const std::vector> *vars = nullptr) { - auto vars__ = vars ? _fbb.CreateVector>(*vars) : 0; +inline ::flatbuffers::Offset CreateTusVarResponseDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + const std::vector<::flatbuffers::Offset> *vars = nullptr) { + auto vars__ = vars ? _fbb.CreateVector<::flatbuffers::Offset>(*vars) : 0; return CreateTusVarResponse( _fbb, vars__); } -struct TusSetMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusSetMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusSetMultiSlotVariableRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_USER = 4, @@ -4708,13 +4713,13 @@ struct TusSetMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuff const TusUser *user() const { return GetPointer(VT_USER); } - const flatbuffers::Vector *slotIdArray() const { - return GetPointer *>(VT_SLOTIDARRAY); + const ::flatbuffers::Vector *slotIdArray() const { + return GetPointer *>(VT_SLOTIDARRAY); } - const flatbuffers::Vector *variableArray() const { - return GetPointer *>(VT_VARIABLEARRAY); + const ::flatbuffers::Vector *variableArray() const { + return GetPointer *>(VT_VARIABLEARRAY); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_USER) && verifier.VerifyTable(user()) && @@ -4728,33 +4733,33 @@ struct TusSetMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuff struct TusSetMultiSlotVariableRequestBuilder { typedef TusSetMultiSlotVariableRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_user(flatbuffers::Offset user) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_user(::flatbuffers::Offset user) { fbb_.AddOffset(TusSetMultiSlotVariableRequest::VT_USER, user); } - void add_slotIdArray(flatbuffers::Offset> slotIdArray) { + void add_slotIdArray(::flatbuffers::Offset<::flatbuffers::Vector> slotIdArray) { fbb_.AddOffset(TusSetMultiSlotVariableRequest::VT_SLOTIDARRAY, slotIdArray); } - void add_variableArray(flatbuffers::Offset> variableArray) { + void add_variableArray(::flatbuffers::Offset<::flatbuffers::Vector> variableArray) { fbb_.AddOffset(TusSetMultiSlotVariableRequest::VT_VARIABLEARRAY, variableArray); } - explicit TusSetMultiSlotVariableRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusSetMultiSlotVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusSetMultiSlotVariableRequest( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, - flatbuffers::Offset> slotIdArray = 0, - flatbuffers::Offset> variableArray = 0) { +inline ::flatbuffers::Offset CreateTusSetMultiSlotVariableRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> slotIdArray = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> variableArray = 0) { TusSetMultiSlotVariableRequestBuilder builder_(_fbb); builder_.add_variableArray(variableArray); builder_.add_slotIdArray(slotIdArray); @@ -4762,9 +4767,9 @@ inline flatbuffers::Offset CreateTusSetMultiSlot return builder_.Finish(); } -inline flatbuffers::Offset CreateTusSetMultiSlotVariableRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, +inline ::flatbuffers::Offset CreateTusSetMultiSlotVariableRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, const std::vector *slotIdArray = nullptr, const std::vector *variableArray = nullptr) { auto slotIdArray__ = slotIdArray ? _fbb.CreateVector(*slotIdArray) : 0; @@ -4776,7 +4781,7 @@ inline flatbuffers::Offset CreateTusSetMultiSlot variableArray__); } -struct TusGetMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusGetMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusGetMultiSlotVariableRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_USER = 4, @@ -4785,10 +4790,10 @@ struct TusGetMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuff const TusUser *user() const { return GetPointer(VT_USER); } - const flatbuffers::Vector *slotIdArray() const { - return GetPointer *>(VT_SLOTIDARRAY); + const ::flatbuffers::Vector *slotIdArray() const { + return GetPointer *>(VT_SLOTIDARRAY); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_USER) && verifier.VerifyTable(user()) && @@ -4800,38 +4805,38 @@ struct TusGetMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuff struct TusGetMultiSlotVariableRequestBuilder { typedef TusGetMultiSlotVariableRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_user(flatbuffers::Offset user) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_user(::flatbuffers::Offset user) { fbb_.AddOffset(TusGetMultiSlotVariableRequest::VT_USER, user); } - void add_slotIdArray(flatbuffers::Offset> slotIdArray) { + void add_slotIdArray(::flatbuffers::Offset<::flatbuffers::Vector> slotIdArray) { fbb_.AddOffset(TusGetMultiSlotVariableRequest::VT_SLOTIDARRAY, slotIdArray); } - explicit TusGetMultiSlotVariableRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusGetMultiSlotVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusGetMultiSlotVariableRequest( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, - flatbuffers::Offset> slotIdArray = 0) { +inline ::flatbuffers::Offset CreateTusGetMultiSlotVariableRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> slotIdArray = 0) { TusGetMultiSlotVariableRequestBuilder builder_(_fbb); builder_.add_slotIdArray(slotIdArray); builder_.add_user(user); return builder_.Finish(); } -inline flatbuffers::Offset CreateTusGetMultiSlotVariableRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, +inline ::flatbuffers::Offset CreateTusGetMultiSlotVariableRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, const std::vector *slotIdArray = nullptr) { auto slotIdArray__ = slotIdArray ? _fbb.CreateVector(*slotIdArray) : 0; return CreateTusGetMultiSlotVariableRequest( @@ -4840,19 +4845,19 @@ inline flatbuffers::Offset CreateTusGetMultiSlot slotIdArray__); } -struct TusGetMultiUserVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusGetMultiUserVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusGetMultiUserVariableRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_USERS = 4, VT_SLOTID = 6 }; - const flatbuffers::Vector> *users() const { - return GetPointer> *>(VT_USERS); + const ::flatbuffers::Vector<::flatbuffers::Offset> *users() const { + return GetPointer> *>(VT_USERS); } int32_t slotId() const { return GetField(VT_SLOTID, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_USERS) && verifier.VerifyVector(users()) && @@ -4864,28 +4869,28 @@ struct TusGetMultiUserVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuff struct TusGetMultiUserVariableRequestBuilder { typedef TusGetMultiUserVariableRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_users(flatbuffers::Offset>> users) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_users(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> users) { fbb_.AddOffset(TusGetMultiUserVariableRequest::VT_USERS, users); } void add_slotId(int32_t slotId) { fbb_.AddElement(TusGetMultiUserVariableRequest::VT_SLOTID, slotId, 0); } - explicit TusGetMultiUserVariableRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusGetMultiUserVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusGetMultiUserVariableRequest( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset>> users = 0, +inline ::flatbuffers::Offset CreateTusGetMultiUserVariableRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> users = 0, int32_t slotId = 0) { TusGetMultiUserVariableRequestBuilder builder_(_fbb); builder_.add_slotId(slotId); @@ -4893,18 +4898,18 @@ inline flatbuffers::Offset CreateTusGetMultiUser return builder_.Finish(); } -inline flatbuffers::Offset CreateTusGetMultiUserVariableRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, - const std::vector> *users = nullptr, +inline ::flatbuffers::Offset CreateTusGetMultiUserVariableRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + const std::vector<::flatbuffers::Offset> *users = nullptr, int32_t slotId = 0) { - auto users__ = users ? _fbb.CreateVector>(*users) : 0; + auto users__ = users ? _fbb.CreateVector<::flatbuffers::Offset>(*users) : 0; return CreateTusGetMultiUserVariableRequest( _fbb, users__, slotId); } -struct TusGetFriendsVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusGetFriendsVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusGetFriendsVariableRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_SLOTID = 4, @@ -4924,7 +4929,7 @@ struct TusGetFriendsVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuffer uint32_t arrayNum() const { return GetField(VT_ARRAYNUM, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SLOTID, 4) && VerifyField(verifier, VT_INCLUDESELF, 1) && @@ -4936,8 +4941,8 @@ struct TusGetFriendsVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuffer struct TusGetFriendsVariableRequestBuilder { typedef TusGetFriendsVariableRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_slotId(int32_t slotId) { fbb_.AddElement(TusGetFriendsVariableRequest::VT_SLOTID, slotId, 0); } @@ -4950,19 +4955,19 @@ struct TusGetFriendsVariableRequestBuilder { void add_arrayNum(uint32_t arrayNum) { fbb_.AddElement(TusGetFriendsVariableRequest::VT_ARRAYNUM, arrayNum, 0); } - explicit TusGetFriendsVariableRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusGetFriendsVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusGetFriendsVariableRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateTusGetFriendsVariableRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, int32_t slotId = 0, bool includeSelf = false, int32_t sortType = 0, @@ -4975,7 +4980,7 @@ inline flatbuffers::Offset CreateTusGetFriendsVari return builder_.Finish(); } -struct TusAddAndGetVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusAddAndGetVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusAddAndGetVariableRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_USER = 4, @@ -4993,13 +4998,13 @@ struct TusAddAndGetVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers int64_t inVariable() const { return GetField(VT_INVARIABLE, 0); } - const flatbuffers::Vector *isLastChangedDate() const { - return GetPointer *>(VT_ISLASTCHANGEDDATE); + const ::flatbuffers::Vector *isLastChangedDate() const { + return GetPointer *>(VT_ISLASTCHANGEDDATE); } - const flatbuffers::String *isLastChangedAuthorId() const { - return GetPointer(VT_ISLASTCHANGEDAUTHORID); + const ::flatbuffers::String *isLastChangedAuthorId() const { + return GetPointer(VT_ISLASTCHANGEDAUTHORID); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_USER) && verifier.VerifyTable(user()) && @@ -5015,9 +5020,9 @@ struct TusAddAndGetVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers struct TusAddAndGetVariableRequestBuilder { typedef TusAddAndGetVariableRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_user(flatbuffers::Offset user) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_user(::flatbuffers::Offset user) { fbb_.AddOffset(TusAddAndGetVariableRequest::VT_USER, user); } void add_slotId(int32_t slotId) { @@ -5026,30 +5031,30 @@ struct TusAddAndGetVariableRequestBuilder { void add_inVariable(int64_t inVariable) { fbb_.AddElement(TusAddAndGetVariableRequest::VT_INVARIABLE, inVariable, 0); } - void add_isLastChangedDate(flatbuffers::Offset> isLastChangedDate) { + void add_isLastChangedDate(::flatbuffers::Offset<::flatbuffers::Vector> isLastChangedDate) { fbb_.AddOffset(TusAddAndGetVariableRequest::VT_ISLASTCHANGEDDATE, isLastChangedDate); } - void add_isLastChangedAuthorId(flatbuffers::Offset isLastChangedAuthorId) { + void add_isLastChangedAuthorId(::flatbuffers::Offset<::flatbuffers::String> isLastChangedAuthorId) { fbb_.AddOffset(TusAddAndGetVariableRequest::VT_ISLASTCHANGEDAUTHORID, isLastChangedAuthorId); } - explicit TusAddAndGetVariableRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusAddAndGetVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusAddAndGetVariableRequest( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, +inline ::flatbuffers::Offset CreateTusAddAndGetVariableRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, int32_t slotId = 0, int64_t inVariable = 0, - flatbuffers::Offset> isLastChangedDate = 0, - flatbuffers::Offset isLastChangedAuthorId = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector> isLastChangedDate = 0, + ::flatbuffers::Offset<::flatbuffers::String> isLastChangedAuthorId = 0) { TusAddAndGetVariableRequestBuilder builder_(_fbb); builder_.add_inVariable(inVariable); builder_.add_isLastChangedAuthorId(isLastChangedAuthorId); @@ -5059,9 +5064,9 @@ inline flatbuffers::Offset CreateTusAddAndGetVariab return builder_.Finish(); } -inline flatbuffers::Offset CreateTusAddAndGetVariableRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, +inline ::flatbuffers::Offset CreateTusAddAndGetVariableRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, int32_t slotId = 0, int64_t inVariable = 0, const std::vector *isLastChangedDate = nullptr, @@ -5077,7 +5082,7 @@ inline flatbuffers::Offset CreateTusAddAndGetVariab isLastChangedAuthorId__); } -struct TusTryAndSetVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusTryAndSetVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusTryAndSetVariableRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_USER = 4, @@ -5100,16 +5105,16 @@ struct TusTryAndSetVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers int64_t variable() const { return GetField(VT_VARIABLE, 0); } - const flatbuffers::Vector *isLastChangedDate() const { - return GetPointer *>(VT_ISLASTCHANGEDDATE); + const ::flatbuffers::Vector *isLastChangedDate() const { + return GetPointer *>(VT_ISLASTCHANGEDDATE); } - const flatbuffers::String *isLastChangedAuthorId() const { - return GetPointer(VT_ISLASTCHANGEDAUTHORID); + const ::flatbuffers::String *isLastChangedAuthorId() const { + return GetPointer(VT_ISLASTCHANGEDAUTHORID); } - const flatbuffers::Vector *compareValue() const { - return GetPointer *>(VT_COMPAREVALUE); + const ::flatbuffers::Vector *compareValue() const { + return GetPointer *>(VT_COMPAREVALUE); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_USER) && verifier.VerifyTable(user()) && @@ -5128,9 +5133,9 @@ struct TusTryAndSetVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers struct TusTryAndSetVariableRequestBuilder { typedef TusTryAndSetVariableRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_user(flatbuffers::Offset user) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_user(::flatbuffers::Offset user) { fbb_.AddOffset(TusTryAndSetVariableRequest::VT_USER, user); } void add_slotId(int32_t slotId) { @@ -5142,35 +5147,35 @@ struct TusTryAndSetVariableRequestBuilder { void add_variable(int64_t variable) { fbb_.AddElement(TusTryAndSetVariableRequest::VT_VARIABLE, variable, 0); } - void add_isLastChangedDate(flatbuffers::Offset> isLastChangedDate) { + void add_isLastChangedDate(::flatbuffers::Offset<::flatbuffers::Vector> isLastChangedDate) { fbb_.AddOffset(TusTryAndSetVariableRequest::VT_ISLASTCHANGEDDATE, isLastChangedDate); } - void add_isLastChangedAuthorId(flatbuffers::Offset isLastChangedAuthorId) { + void add_isLastChangedAuthorId(::flatbuffers::Offset<::flatbuffers::String> isLastChangedAuthorId) { fbb_.AddOffset(TusTryAndSetVariableRequest::VT_ISLASTCHANGEDAUTHORID, isLastChangedAuthorId); } - void add_compareValue(flatbuffers::Offset> compareValue) { + void add_compareValue(::flatbuffers::Offset<::flatbuffers::Vector> compareValue) { fbb_.AddOffset(TusTryAndSetVariableRequest::VT_COMPAREVALUE, compareValue); } - explicit TusTryAndSetVariableRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusTryAndSetVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusTryAndSetVariableRequest( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, +inline ::flatbuffers::Offset CreateTusTryAndSetVariableRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, int32_t slotId = 0, int32_t opeType = 0, int64_t variable = 0, - flatbuffers::Offset> isLastChangedDate = 0, - flatbuffers::Offset isLastChangedAuthorId = 0, - flatbuffers::Offset> compareValue = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector> isLastChangedDate = 0, + ::flatbuffers::Offset<::flatbuffers::String> isLastChangedAuthorId = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> compareValue = 0) { TusTryAndSetVariableRequestBuilder builder_(_fbb); builder_.add_variable(variable); builder_.add_compareValue(compareValue); @@ -5182,9 +5187,9 @@ inline flatbuffers::Offset CreateTusTryAndSetVariab return builder_.Finish(); } -inline flatbuffers::Offset CreateTusTryAndSetVariableRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, +inline ::flatbuffers::Offset CreateTusTryAndSetVariableRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, int32_t slotId = 0, int32_t opeType = 0, int64_t variable = 0, @@ -5205,7 +5210,7 @@ inline flatbuffers::Offset CreateTusTryAndSetVariab compareValue__); } -struct TusDeleteMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusDeleteMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusDeleteMultiSlotVariableRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_USER = 4, @@ -5214,10 +5219,10 @@ struct TusDeleteMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private flatb const TusUser *user() const { return GetPointer(VT_USER); } - const flatbuffers::Vector *slotIdArray() const { - return GetPointer *>(VT_SLOTIDARRAY); + const ::flatbuffers::Vector *slotIdArray() const { + return GetPointer *>(VT_SLOTIDARRAY); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_USER) && verifier.VerifyTable(user()) && @@ -5229,38 +5234,38 @@ struct TusDeleteMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private flatb struct TusDeleteMultiSlotVariableRequestBuilder { typedef TusDeleteMultiSlotVariableRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_user(flatbuffers::Offset user) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_user(::flatbuffers::Offset user) { fbb_.AddOffset(TusDeleteMultiSlotVariableRequest::VT_USER, user); } - void add_slotIdArray(flatbuffers::Offset> slotIdArray) { + void add_slotIdArray(::flatbuffers::Offset<::flatbuffers::Vector> slotIdArray) { fbb_.AddOffset(TusDeleteMultiSlotVariableRequest::VT_SLOTIDARRAY, slotIdArray); } - explicit TusDeleteMultiSlotVariableRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusDeleteMultiSlotVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusDeleteMultiSlotVariableRequest( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, - flatbuffers::Offset> slotIdArray = 0) { +inline ::flatbuffers::Offset CreateTusDeleteMultiSlotVariableRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> slotIdArray = 0) { TusDeleteMultiSlotVariableRequestBuilder builder_(_fbb); builder_.add_slotIdArray(slotIdArray); builder_.add_user(user); return builder_.Finish(); } -inline flatbuffers::Offset CreateTusDeleteMultiSlotVariableRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, +inline ::flatbuffers::Offset CreateTusDeleteMultiSlotVariableRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, const std::vector *slotIdArray = nullptr) { auto slotIdArray__ = slotIdArray ? _fbb.CreateVector(*slotIdArray) : 0; return CreateTusDeleteMultiSlotVariableRequest( @@ -5269,7 +5274,7 @@ inline flatbuffers::Offset CreateTusDeleteMul slotIdArray__); } -struct TusSetDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusSetDataRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusSetDataRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_USER = 4, @@ -5285,19 +5290,19 @@ struct TusSetDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { int32_t slotId() const { return GetField(VT_SLOTID, 0); } - const flatbuffers::Vector *data() const { - return GetPointer *>(VT_DATA); + const ::flatbuffers::Vector *data() const { + return GetPointer *>(VT_DATA); } - const flatbuffers::Vector *info() const { - return GetPointer *>(VT_INFO); + const ::flatbuffers::Vector *info() const { + return GetPointer *>(VT_INFO); } - const flatbuffers::Vector *isLastChangedDate() const { - return GetPointer *>(VT_ISLASTCHANGEDDATE); + const ::flatbuffers::Vector *isLastChangedDate() const { + return GetPointer *>(VT_ISLASTCHANGEDDATE); } - const flatbuffers::String *isLastChangedAuthorId() const { - return GetPointer(VT_ISLASTCHANGEDAUTHORID); + const ::flatbuffers::String *isLastChangedAuthorId() const { + return GetPointer(VT_ISLASTCHANGEDAUTHORID); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_USER) && verifier.VerifyTable(user()) && @@ -5316,45 +5321,45 @@ struct TusSetDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct TusSetDataRequestBuilder { typedef TusSetDataRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_user(flatbuffers::Offset user) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_user(::flatbuffers::Offset user) { fbb_.AddOffset(TusSetDataRequest::VT_USER, user); } void add_slotId(int32_t slotId) { fbb_.AddElement(TusSetDataRequest::VT_SLOTID, slotId, 0); } - void add_data(flatbuffers::Offset> data) { + void add_data(::flatbuffers::Offset<::flatbuffers::Vector> data) { fbb_.AddOffset(TusSetDataRequest::VT_DATA, data); } - void add_info(flatbuffers::Offset> info) { + void add_info(::flatbuffers::Offset<::flatbuffers::Vector> info) { fbb_.AddOffset(TusSetDataRequest::VT_INFO, info); } - void add_isLastChangedDate(flatbuffers::Offset> isLastChangedDate) { + void add_isLastChangedDate(::flatbuffers::Offset<::flatbuffers::Vector> isLastChangedDate) { fbb_.AddOffset(TusSetDataRequest::VT_ISLASTCHANGEDDATE, isLastChangedDate); } - void add_isLastChangedAuthorId(flatbuffers::Offset isLastChangedAuthorId) { + void add_isLastChangedAuthorId(::flatbuffers::Offset<::flatbuffers::String> isLastChangedAuthorId) { fbb_.AddOffset(TusSetDataRequest::VT_ISLASTCHANGEDAUTHORID, isLastChangedAuthorId); } - explicit TusSetDataRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusSetDataRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusSetDataRequest( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, +inline ::flatbuffers::Offset CreateTusSetDataRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, int32_t slotId = 0, - flatbuffers::Offset> data = 0, - flatbuffers::Offset> info = 0, - flatbuffers::Offset> isLastChangedDate = 0, - flatbuffers::Offset isLastChangedAuthorId = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector> data = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> info = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> isLastChangedDate = 0, + ::flatbuffers::Offset<::flatbuffers::String> isLastChangedAuthorId = 0) { TusSetDataRequestBuilder builder_(_fbb); builder_.add_isLastChangedAuthorId(isLastChangedAuthorId); builder_.add_isLastChangedDate(isLastChangedDate); @@ -5365,9 +5370,9 @@ inline flatbuffers::Offset CreateTusSetDataRequest( return builder_.Finish(); } -inline flatbuffers::Offset CreateTusSetDataRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, +inline ::flatbuffers::Offset CreateTusSetDataRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, int32_t slotId = 0, const std::vector *data = nullptr, const std::vector *info = nullptr, @@ -5387,7 +5392,7 @@ inline flatbuffers::Offset CreateTusSetDataRequestDirect( isLastChangedAuthorId__); } -struct TusDataStatus FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusDataStatus FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusDataStatusBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_OWNERID = 4, @@ -5396,8 +5401,8 @@ struct TusDataStatus FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_LASTCHANGEDAUTHORID = 10, VT_INFO = 12 }; - const flatbuffers::String *ownerId() const { - return GetPointer(VT_OWNERID); + const ::flatbuffers::String *ownerId() const { + return GetPointer(VT_OWNERID); } bool hasData() const { return GetField(VT_HASDATA, 0) != 0; @@ -5405,13 +5410,13 @@ struct TusDataStatus FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint64_t lastChangedDate() const { return GetField(VT_LASTCHANGEDDATE, 0); } - const flatbuffers::String *lastChangedAuthorId() const { - return GetPointer(VT_LASTCHANGEDAUTHORID); + const ::flatbuffers::String *lastChangedAuthorId() const { + return GetPointer(VT_LASTCHANGEDAUTHORID); } - const flatbuffers::Vector *info() const { - return GetPointer *>(VT_INFO); + const ::flatbuffers::Vector *info() const { + return GetPointer *>(VT_INFO); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_OWNERID) && verifier.VerifyString(ownerId()) && @@ -5427,9 +5432,9 @@ struct TusDataStatus FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct TusDataStatusBuilder { typedef TusDataStatus Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_ownerId(flatbuffers::Offset ownerId) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_ownerId(::flatbuffers::Offset<::flatbuffers::String> ownerId) { fbb_.AddOffset(TusDataStatus::VT_OWNERID, ownerId); } void add_hasData(bool hasData) { @@ -5438,30 +5443,30 @@ struct TusDataStatusBuilder { void add_lastChangedDate(uint64_t lastChangedDate) { fbb_.AddElement(TusDataStatus::VT_LASTCHANGEDDATE, lastChangedDate, 0); } - void add_lastChangedAuthorId(flatbuffers::Offset lastChangedAuthorId) { + void add_lastChangedAuthorId(::flatbuffers::Offset<::flatbuffers::String> lastChangedAuthorId) { fbb_.AddOffset(TusDataStatus::VT_LASTCHANGEDAUTHORID, lastChangedAuthorId); } - void add_info(flatbuffers::Offset> info) { + void add_info(::flatbuffers::Offset<::flatbuffers::Vector> info) { fbb_.AddOffset(TusDataStatus::VT_INFO, info); } - explicit TusDataStatusBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusDataStatusBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusDataStatus( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset ownerId = 0, +inline ::flatbuffers::Offset CreateTusDataStatus( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> ownerId = 0, bool hasData = false, uint64_t lastChangedDate = 0, - flatbuffers::Offset lastChangedAuthorId = 0, - flatbuffers::Offset> info = 0) { + ::flatbuffers::Offset<::flatbuffers::String> lastChangedAuthorId = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> info = 0) { TusDataStatusBuilder builder_(_fbb); builder_.add_lastChangedDate(lastChangedDate); builder_.add_info(info); @@ -5471,8 +5476,8 @@ inline flatbuffers::Offset CreateTusDataStatus( return builder_.Finish(); } -inline flatbuffers::Offset CreateTusDataStatusDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateTusDataStatusDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *ownerId = nullptr, bool hasData = false, uint64_t lastChangedDate = 0, @@ -5490,7 +5495,7 @@ inline flatbuffers::Offset CreateTusDataStatusDirect( info__); } -struct TusData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusData FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusDataBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_STATUS = 4, @@ -5499,10 +5504,10 @@ struct TusData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const TusDataStatus *status() const { return GetPointer(VT_STATUS); } - const flatbuffers::Vector *data() const { - return GetPointer *>(VT_DATA); + const ::flatbuffers::Vector *data() const { + return GetPointer *>(VT_DATA); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_STATUS) && verifier.VerifyTable(status()) && @@ -5514,38 +5519,38 @@ struct TusData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct TusDataBuilder { typedef TusData Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_status(flatbuffers::Offset status) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_status(::flatbuffers::Offset status) { fbb_.AddOffset(TusData::VT_STATUS, status); } - void add_data(flatbuffers::Offset> data) { + void add_data(::flatbuffers::Offset<::flatbuffers::Vector> data) { fbb_.AddOffset(TusData::VT_DATA, data); } - explicit TusDataBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusDataBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusData( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset status = 0, - flatbuffers::Offset> data = 0) { +inline ::flatbuffers::Offset CreateTusData( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset status = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> data = 0) { TusDataBuilder builder_(_fbb); builder_.add_data(data); builder_.add_status(status); return builder_.Finish(); } -inline flatbuffers::Offset CreateTusDataDirect( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset status = 0, +inline ::flatbuffers::Offset CreateTusDataDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset status = 0, const std::vector *data = nullptr) { auto data__ = data ? _fbb.CreateVector(*data) : 0; return CreateTusData( @@ -5554,15 +5559,15 @@ inline flatbuffers::Offset CreateTusDataDirect( data__); } -struct TusDataStatusResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusDataStatusResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusDataStatusResponseBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_STATUS = 4 }; - const flatbuffers::Vector> *status() const { - return GetPointer> *>(VT_STATUS); + const ::flatbuffers::Vector<::flatbuffers::Offset> *status() const { + return GetPointer> *>(VT_STATUS); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_STATUS) && verifier.VerifyVector(status()) && @@ -5573,40 +5578,40 @@ struct TusDataStatusResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl struct TusDataStatusResponseBuilder { typedef TusDataStatusResponse Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_status(flatbuffers::Offset>> status) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_status(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> status) { fbb_.AddOffset(TusDataStatusResponse::VT_STATUS, status); } - explicit TusDataStatusResponseBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusDataStatusResponseBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusDataStatusResponse( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset>> status = 0) { +inline ::flatbuffers::Offset CreateTusDataStatusResponse( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> status = 0) { TusDataStatusResponseBuilder builder_(_fbb); builder_.add_status(status); return builder_.Finish(); } -inline flatbuffers::Offset CreateTusDataStatusResponseDirect( - flatbuffers::FlatBufferBuilder &_fbb, - const std::vector> *status = nullptr) { - auto status__ = status ? _fbb.CreateVector>(*status) : 0; +inline ::flatbuffers::Offset CreateTusDataStatusResponseDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + const std::vector<::flatbuffers::Offset> *status = nullptr) { + auto status__ = status ? _fbb.CreateVector<::flatbuffers::Offset>(*status) : 0; return CreateTusDataStatusResponse( _fbb, status__); } -struct TusGetDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusGetDataRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusGetDataRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_USER = 4, @@ -5618,7 +5623,7 @@ struct TusGetDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { int32_t slotId() const { return GetField(VT_SLOTID, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_USER) && verifier.VerifyTable(user()) && @@ -5629,28 +5634,28 @@ struct TusGetDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct TusGetDataRequestBuilder { typedef TusGetDataRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_user(flatbuffers::Offset user) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_user(::flatbuffers::Offset user) { fbb_.AddOffset(TusGetDataRequest::VT_USER, user); } void add_slotId(int32_t slotId) { fbb_.AddElement(TusGetDataRequest::VT_SLOTID, slotId, 0); } - explicit TusGetDataRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusGetDataRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusGetDataRequest( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, +inline ::flatbuffers::Offset CreateTusGetDataRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, int32_t slotId = 0) { TusGetDataRequestBuilder builder_(_fbb); builder_.add_slotId(slotId); @@ -5658,7 +5663,7 @@ inline flatbuffers::Offset CreateTusGetDataRequest( return builder_.Finish(); } -struct TusGetMultiSlotDataStatusRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusGetMultiSlotDataStatusRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusGetMultiSlotDataStatusRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_USER = 4, @@ -5667,10 +5672,10 @@ struct TusGetMultiSlotDataStatusRequest FLATBUFFERS_FINAL_CLASS : private flatbu const TusUser *user() const { return GetPointer(VT_USER); } - const flatbuffers::Vector *slotIdArray() const { - return GetPointer *>(VT_SLOTIDARRAY); + const ::flatbuffers::Vector *slotIdArray() const { + return GetPointer *>(VT_SLOTIDARRAY); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_USER) && verifier.VerifyTable(user()) && @@ -5682,38 +5687,38 @@ struct TusGetMultiSlotDataStatusRequest FLATBUFFERS_FINAL_CLASS : private flatbu struct TusGetMultiSlotDataStatusRequestBuilder { typedef TusGetMultiSlotDataStatusRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_user(flatbuffers::Offset user) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_user(::flatbuffers::Offset user) { fbb_.AddOffset(TusGetMultiSlotDataStatusRequest::VT_USER, user); } - void add_slotIdArray(flatbuffers::Offset> slotIdArray) { + void add_slotIdArray(::flatbuffers::Offset<::flatbuffers::Vector> slotIdArray) { fbb_.AddOffset(TusGetMultiSlotDataStatusRequest::VT_SLOTIDARRAY, slotIdArray); } - explicit TusGetMultiSlotDataStatusRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusGetMultiSlotDataStatusRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusGetMultiSlotDataStatusRequest( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, - flatbuffers::Offset> slotIdArray = 0) { +inline ::flatbuffers::Offset CreateTusGetMultiSlotDataStatusRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> slotIdArray = 0) { TusGetMultiSlotDataStatusRequestBuilder builder_(_fbb); builder_.add_slotIdArray(slotIdArray); builder_.add_user(user); return builder_.Finish(); } -inline flatbuffers::Offset CreateTusGetMultiSlotDataStatusRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, +inline ::flatbuffers::Offset CreateTusGetMultiSlotDataStatusRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, const std::vector *slotIdArray = nullptr) { auto slotIdArray__ = slotIdArray ? _fbb.CreateVector(*slotIdArray) : 0; return CreateTusGetMultiSlotDataStatusRequest( @@ -5722,19 +5727,19 @@ inline flatbuffers::Offset CreateTusGetMultiSl slotIdArray__); } -struct TusGetMultiUserDataStatusRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusGetMultiUserDataStatusRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusGetMultiUserDataStatusRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_USERS = 4, VT_SLOTID = 6 }; - const flatbuffers::Vector> *users() const { - return GetPointer> *>(VT_USERS); + const ::flatbuffers::Vector<::flatbuffers::Offset> *users() const { + return GetPointer> *>(VT_USERS); } int32_t slotId() const { return GetField(VT_SLOTID, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_USERS) && verifier.VerifyVector(users()) && @@ -5746,28 +5751,28 @@ struct TusGetMultiUserDataStatusRequest FLATBUFFERS_FINAL_CLASS : private flatbu struct TusGetMultiUserDataStatusRequestBuilder { typedef TusGetMultiUserDataStatusRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_users(flatbuffers::Offset>> users) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_users(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> users) { fbb_.AddOffset(TusGetMultiUserDataStatusRequest::VT_USERS, users); } void add_slotId(int32_t slotId) { fbb_.AddElement(TusGetMultiUserDataStatusRequest::VT_SLOTID, slotId, 0); } - explicit TusGetMultiUserDataStatusRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusGetMultiUserDataStatusRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusGetMultiUserDataStatusRequest( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset>> users = 0, +inline ::flatbuffers::Offset CreateTusGetMultiUserDataStatusRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> users = 0, int32_t slotId = 0) { TusGetMultiUserDataStatusRequestBuilder builder_(_fbb); builder_.add_slotId(slotId); @@ -5775,18 +5780,18 @@ inline flatbuffers::Offset CreateTusGetMultiUs return builder_.Finish(); } -inline flatbuffers::Offset CreateTusGetMultiUserDataStatusRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, - const std::vector> *users = nullptr, +inline ::flatbuffers::Offset CreateTusGetMultiUserDataStatusRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + const std::vector<::flatbuffers::Offset> *users = nullptr, int32_t slotId = 0) { - auto users__ = users ? _fbb.CreateVector>(*users) : 0; + auto users__ = users ? _fbb.CreateVector<::flatbuffers::Offset>(*users) : 0; return CreateTusGetMultiUserDataStatusRequest( _fbb, users__, slotId); } -struct TusGetFriendsDataStatusRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusGetFriendsDataStatusRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusGetFriendsDataStatusRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_SLOTID = 4, @@ -5806,7 +5811,7 @@ struct TusGetFriendsDataStatusRequest FLATBUFFERS_FINAL_CLASS : private flatbuff uint32_t arrayNum() const { return GetField(VT_ARRAYNUM, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SLOTID, 4) && VerifyField(verifier, VT_INCLUDESELF, 1) && @@ -5818,8 +5823,8 @@ struct TusGetFriendsDataStatusRequest FLATBUFFERS_FINAL_CLASS : private flatbuff struct TusGetFriendsDataStatusRequestBuilder { typedef TusGetFriendsDataStatusRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_slotId(int32_t slotId) { fbb_.AddElement(TusGetFriendsDataStatusRequest::VT_SLOTID, slotId, 0); } @@ -5832,19 +5837,19 @@ struct TusGetFriendsDataStatusRequestBuilder { void add_arrayNum(uint32_t arrayNum) { fbb_.AddElement(TusGetFriendsDataStatusRequest::VT_ARRAYNUM, arrayNum, 0); } - explicit TusGetFriendsDataStatusRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusGetFriendsDataStatusRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusGetFriendsDataStatusRequest( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateTusGetFriendsDataStatusRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, int32_t slotId = 0, bool includeSelf = false, int32_t sortType = 0, @@ -5857,7 +5862,7 @@ inline flatbuffers::Offset CreateTusGetFriendsDa return builder_.Finish(); } -struct TusDeleteMultiSlotDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct TusDeleteMultiSlotDataRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef TusDeleteMultiSlotDataRequestBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_USER = 4, @@ -5866,10 +5871,10 @@ struct TusDeleteMultiSlotDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffe const TusUser *user() const { return GetPointer(VT_USER); } - const flatbuffers::Vector *slotIdArray() const { - return GetPointer *>(VT_SLOTIDARRAY); + const ::flatbuffers::Vector *slotIdArray() const { + return GetPointer *>(VT_SLOTIDARRAY); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_USER) && verifier.VerifyTable(user()) && @@ -5881,38 +5886,38 @@ struct TusDeleteMultiSlotDataRequest FLATBUFFERS_FINAL_CLASS : private flatbuffe struct TusDeleteMultiSlotDataRequestBuilder { typedef TusDeleteMultiSlotDataRequest Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_user(flatbuffers::Offset user) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_user(::flatbuffers::Offset user) { fbb_.AddOffset(TusDeleteMultiSlotDataRequest::VT_USER, user); } - void add_slotIdArray(flatbuffers::Offset> slotIdArray) { + void add_slotIdArray(::flatbuffers::Offset<::flatbuffers::Vector> slotIdArray) { fbb_.AddOffset(TusDeleteMultiSlotDataRequest::VT_SLOTIDARRAY, slotIdArray); } - explicit TusDeleteMultiSlotDataRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit TusDeleteMultiSlotDataRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateTusDeleteMultiSlotDataRequest( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, - flatbuffers::Offset> slotIdArray = 0) { +inline ::flatbuffers::Offset CreateTusDeleteMultiSlotDataRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> slotIdArray = 0) { TusDeleteMultiSlotDataRequestBuilder builder_(_fbb); builder_.add_slotIdArray(slotIdArray); builder_.add_user(user); return builder_.Finish(); } -inline flatbuffers::Offset CreateTusDeleteMultiSlotDataRequestDirect( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset user = 0, +inline ::flatbuffers::Offset CreateTusDeleteMultiSlotDataRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset user = 0, const std::vector *slotIdArray = nullptr) { auto slotIdArray__ = slotIdArray ? _fbb.CreateVector(*slotIdArray) : 0; return CreateTusDeleteMultiSlotDataRequest( @@ -5921,4 +5926,97 @@ inline flatbuffers::Offset CreateTusDeleteMultiSl slotIdArray__); } +struct SetPresenceRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { + typedef SetPresenceRequestBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_TITLE = 4, + VT_STATUS = 6, + VT_COMMENT = 8, + VT_DATA = 10 + }; + const ::flatbuffers::String *title() const { + return GetPointer(VT_TITLE); + } + const ::flatbuffers::String *status() const { + return GetPointer(VT_STATUS); + } + const ::flatbuffers::String *comment() const { + return GetPointer(VT_COMMENT); + } + const ::flatbuffers::Vector *data() const { + return GetPointer *>(VT_DATA); + } + bool Verify(::flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && + VerifyOffset(verifier, VT_TITLE) && + verifier.VerifyString(title()) && + VerifyOffset(verifier, VT_STATUS) && + verifier.VerifyString(status()) && + VerifyOffset(verifier, VT_COMMENT) && + verifier.VerifyString(comment()) && + VerifyOffset(verifier, VT_DATA) && + verifier.VerifyVector(data()) && + verifier.EndTable(); + } +}; + +struct SetPresenceRequestBuilder { + typedef SetPresenceRequest Table; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_title(::flatbuffers::Offset<::flatbuffers::String> title) { + fbb_.AddOffset(SetPresenceRequest::VT_TITLE, title); + } + void add_status(::flatbuffers::Offset<::flatbuffers::String> status) { + fbb_.AddOffset(SetPresenceRequest::VT_STATUS, status); + } + void add_comment(::flatbuffers::Offset<::flatbuffers::String> comment) { + fbb_.AddOffset(SetPresenceRequest::VT_COMMENT, comment); + } + void add_data(::flatbuffers::Offset<::flatbuffers::Vector> data) { + fbb_.AddOffset(SetPresenceRequest::VT_DATA, data); + } + explicit SetPresenceRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + ::flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = ::flatbuffers::Offset(end); + return o; + } +}; + +inline ::flatbuffers::Offset CreateSetPresenceRequest( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> title = 0, + ::flatbuffers::Offset<::flatbuffers::String> status = 0, + ::flatbuffers::Offset<::flatbuffers::String> comment = 0, + ::flatbuffers::Offset<::flatbuffers::Vector> data = 0) { + SetPresenceRequestBuilder builder_(_fbb); + builder_.add_data(data); + builder_.add_comment(comment); + builder_.add_status(status); + builder_.add_title(title); + return builder_.Finish(); +} + +inline ::flatbuffers::Offset CreateSetPresenceRequestDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + const char *title = nullptr, + const char *status = nullptr, + const char *comment = nullptr, + const std::vector *data = nullptr) { + auto title__ = title ? _fbb.CreateString(title) : 0; + auto status__ = status ? _fbb.CreateString(status) : 0; + auto comment__ = comment ? _fbb.CreateString(comment) : 0; + auto data__ = data ? _fbb.CreateVector(*data) : 0; + return CreateSetPresenceRequest( + _fbb, + title__, + status__, + comment__, + data__); +} + #endif // FLATBUFFERS_GENERATED_NP2STRUCTS_H_ diff --git a/rpcs3/Emu/NP/np_handler.cpp b/rpcs3/Emu/NP/np_handler.cpp index 38fe75cd9e..457e60ab86 100644 --- a/rpcs3/Emu/NP/np_handler.cpp +++ b/rpcs3/Emu/NP/np_handler.cpp @@ -793,10 +793,79 @@ namespace np return size_copied; } + void np_handler::register_basic_handler(vm::cptr context, vm::ptr handler, vm::ptr arg, bool context_sensitive) + { + { + std::lock_guard lock(basic_handler.mutex); + memcpy(&basic_handler.context, context.get_ptr(), sizeof(basic_handler.context)); + basic_handler.handler_func = handler; + basic_handler.handler_arg = arg; + basic_handler.context_sensitive = context_sensitive; + basic_handler_registered = true; + + presence_self.pr_com_id = *context; + presence_self.pr_title = fmt::truncate(Emu.GetTitle(), SCE_NP_BASIC_PRESENCE_TITLE_SIZE_MAX - 1); + } + + if (g_cfg.net.psn_status != np_psn_status::psn_rpcn || !is_psn_active) + { + return; + } + + std::lock_guard lock(mutex_rpcn); + + if (!rpcn) + { + return; + } + + auto current_presences = rpcn->get_presence_states(); + + for (auto& [npid, pr_info] : current_presences) + { + // Only communicates info about online users with presence + if (!pr_info.online || pr_info.pr_com_id.data[0] == 0) + { + continue; + } + + basic_event to_add{}; + strcpy_trunc(to_add.from.userId.handle.data, npid); + strcpy_trunc(to_add.from.name.data, npid); + if (std::memcmp(pr_info.pr_com_id.data, basic_handler.context.data, sizeof(pr_info.pr_com_id.data)) == 0) + { + to_add.event = SCE_NP_BASIC_EVENT_PRESENCE; + to_add.data = std::move(pr_info.pr_data); + } + else + { + if (basic_handler.context_sensitive) + { + to_add.event = SCE_NP_BASIC_EVENT_OUT_OF_CONTEXT; + } + else + { + to_add.event = SCE_NP_BASIC_EVENT_OFFLINE; + } + } + + queue_basic_event(to_add); + send_basic_event(to_add.event, 0, 0); + } + } + + SceNpCommunicationId np_handler::get_basic_handler_context() + { + std::lock_guard lock(basic_handler.mutex); + return basic_handler.context; + } + bool np_handler::send_basic_event(s32 event, s32 retCode, u32 reqId) { - if (basic_handler.registered) + if (basic_handler_registered) { + std::lock_guard lock(basic_handler.mutex); + sysutil_register_cb([handler_func = this->basic_handler.handler_func, handler_arg = this->basic_handler.handler_arg, event, retCode, reqId](ppu_thread& cb_ppu) -> s32 { handler_func(cb_ppu, event, retCode, reqId, handler_arg); @@ -983,8 +1052,39 @@ namespace np } } + auto presence_updates = rpcn->get_presence_updates(); + if (basic_handler_registered) + { + for (auto& [npid, pr_info] : presence_updates) + { + basic_event to_add{}; + strcpy_trunc(to_add.from.userId.handle.data, npid); + strcpy_trunc(to_add.from.name.data, npid); + + if (std::memcmp(pr_info.pr_com_id.data, basic_handler.context.data, sizeof(pr_info.pr_com_id.data)) == 0) + { + to_add.event = SCE_NP_BASIC_EVENT_PRESENCE; + to_add.data = std::move(pr_info.pr_data); + } + else + { + if (basic_handler.context_sensitive && !pr_info.pr_com_id.data[0] == 0) + { + to_add.event = SCE_NP_BASIC_EVENT_OUT_OF_CONTEXT; + } + else + { + to_add.event = SCE_NP_BASIC_EVENT_OFFLINE; + } + } + + queue_basic_event(to_add); + send_basic_event(to_add.event, 0, 0); + } + } + auto messages = rpcn->get_new_messages(); - if (basic_handler.registered) + if (basic_handler_registered) { for (const auto msg_id : messages) { @@ -1027,7 +1127,7 @@ namespace np } } - if (!replies.empty() || !notifications.empty()) + if (!replies.empty() || !notifications.empty() || !presence_updates.empty()) { sleep = false; } @@ -1109,16 +1209,7 @@ namespace np u32 np_handler::add_players_to_history(vm::cptr /*npids*/, u32 /*count*/) { const u32 req_id = get_req_id(REQUEST_ID_HIGH::MISC); - - if (basic_handler.handler_func) - { - sysutil_register_cb([req_id, cb = basic_handler.handler_func, cb_arg = basic_handler.handler_arg](ppu_thread& cb_ppu) -> s32 - { - cb(cb_ppu, SCE_NP_BASIC_EVENT_ADD_PLAYERS_HISTORY_RESULT, 0, req_id, cb_arg); - return 0; - }); - } - + send_basic_event(SCE_NP_BASIC_EVENT_ADD_PLAYERS_HISTORY_RESULT, 0, req_id); return req_id; } @@ -1147,6 +1238,102 @@ namespace np return {CELL_OK, npid_friend}; } + void np_handler::set_presence(std::optional status, std::optional> data) + { + bool send_update = false; + + if (status) + { + if (status != presence_self.pr_status) + { + presence_self.pr_status = *status; + send_update = true; + } + } + + if (data) + { + if (data != presence_self.pr_data) + { + presence_self.pr_data = *data; + send_update = true; + } + } + + if (send_update && is_psn_active) + { + std::lock_guard lock(mutex_rpcn); + + if (!rpcn) + { + return; + } + + rpcn->send_presence(presence_self.pr_com_id, presence_self.pr_title, presence_self.pr_status, presence_self.pr_comment, presence_self.pr_data); + } + } + + template + error_code np_handler::get_friend_presence_by_index(u32 index, SceNpUserInfo* user, T* pres) + { + if (!is_psn_active || g_cfg.net.psn_status != np_psn_status::psn_rpcn) + { + return SCE_NP_BASIC_ERROR_NOT_CONNECTED; + } + + std::lock_guard lock(mutex_rpcn); + + if (!rpcn) + { + return SCE_NP_BASIC_ERROR_NOT_CONNECTED; + } + + auto friend_infos = rpcn->get_friend_presence_by_index(index); + if (!friend_infos) + { + return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT; + } + + const bool same_context = (std::memcmp(friend_infos->second.pr_com_id.data, basic_handler.context.data, sizeof(friend_infos->second.pr_com_id.data)) == 0); + strings_to_userinfo(friend_infos->first, friend_infos->first, "", *user); + onlinedata_to_presencedetails(friend_infos->second, same_context, *pres); + + return CELL_OK; + } + + template error_code np_handler::get_friend_presence_by_index(u32 index, SceNpUserInfo* user, SceNpBasicPresenceDetails* pres); + template error_code np_handler::get_friend_presence_by_index(u32 index, SceNpUserInfo* user, SceNpBasicPresenceDetails2* pres); + + template + error_code np_handler::get_friend_presence_by_npid(const SceNpId& npid, T* pres) + { + if (!is_psn_active || g_cfg.net.psn_status != np_psn_status::psn_rpcn) + { + return SCE_NP_BASIC_ERROR_NOT_CONNECTED; + } + + std::lock_guard lock(mutex_rpcn); + + if (!rpcn) + { + return SCE_NP_BASIC_ERROR_NOT_CONNECTED; + } + + auto friend_infos = rpcn->get_friend_presence_by_npid(std::string(reinterpret_cast(&npid.handle.data[0]))); + if (!friend_infos) + { + return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT; + } + + const bool same_context = (std::memcmp(friend_infos->second.pr_com_id.data, basic_handler.context.data, sizeof(friend_infos->second.pr_com_id.data)) == 0); + onlinedata_to_presencedetails(friend_infos->second, same_context, *pres); + + return CELL_OK; + } + + template error_code np_handler::get_friend_presence_by_npid(const SceNpId& npid, SceNpBasicPresenceDetails* pres); + template error_code np_handler::get_friend_presence_by_npid(const SceNpId& npid, SceNpBasicPresenceDetails2* pres); + std::pair> np_handler::local_get_npid(u64 room_id, u16 member_id) { return np_cache.get_npid(room_id, member_id); diff --git a/rpcs3/Emu/NP/np_handler.h b/rpcs3/Emu/NP/np_handler.h index e4d73e6414..aadb759430 100644 --- a/rpcs3/Emu/NP/np_handler.h +++ b/rpcs3/Emu/NP/np_handler.h @@ -120,16 +120,10 @@ namespace np vm::ptr manager_cb{}; // Connection status and tickets vm::ptr manager_cb_arg{}; - // Basic event handler; - struct - { - SceNpCommunicationId context{}; - vm::ptr handler_func; - vm::ptr handler_arg; - bool registered = false; - bool context_sensitive = false; - } basic_handler; + atomic_t basic_handler_registered = false; + void register_basic_handler(vm::cptr context, vm::ptr handler, vm::ptr arg, bool context_sensitive); + SceNpCommunicationId get_basic_handler_context(); void queue_basic_event(basic_event to_queue); bool send_basic_event(s32 event, s32 retCode, u32 reqId); error_code get_basic_event(vm::ptr event, vm::ptr from, vm::ptr data, vm::ptr size); @@ -206,6 +200,13 @@ namespace np u32 get_num_friends(); u32 get_num_blocks(); std::pair> get_friend_by_index(u32 index); + void set_presence(std::optional status, std::optional> data); + + template + error_code get_friend_presence_by_index(u32 index, SceNpUserInfo* user, T* pres); + + template + error_code get_friend_presence_by_npid(const SceNpId& npid, T* pres); // Misc stuff void req_ticket(u32 version, const SceNpId* npid, const char* service_id, const u8* cookie, u32 cookie_size, const char* entitlement_id, u32 consumed_count); @@ -350,6 +351,16 @@ namespace np bool m_inited_np_handler_dependencies = false; private: + // Basic event handler; + struct + { + shared_mutex mutex; + SceNpCommunicationId context{}; + vm::ptr handler_func; + vm::ptr handler_arg; + bool context_sensitive = false; + } basic_handler; + bool is_connected = false; bool is_psn_active = false; @@ -414,5 +425,15 @@ namespace np // UPNP upnp_handler upnp; + + // Presence + struct + { + SceNpCommunicationId pr_com_id; + std::string pr_title; + std::string pr_status; + std::string pr_comment; + std::vector pr_data; + } presence_self; }; } // namespace np diff --git a/rpcs3/Emu/NP/np_helpers.cpp b/rpcs3/Emu/NP/np_helpers.cpp index 3bd3af7c38..ab4f95b197 100644 --- a/rpcs3/Emu/NP/np_helpers.cpp +++ b/rpcs3/Emu/NP/np_helpers.cpp @@ -22,6 +22,34 @@ namespace np return fmt::format("%02X:%02X:%02X:%02X:%02X:%02X", ether[0], ether[1], ether[2], ether[3], ether[4], ether[5]); } + void strings_to_userinfo(std::string_view npid, std::string_view online_name, std::string_view avatar_url, SceNpUserInfo& user_info) + { + memset(&user_info, 0, sizeof(user_info)); + strcpy_trunc(user_info.userId.handle.data, npid); + strcpy_trunc(user_info.name.data, online_name); + strcpy_trunc(user_info.icon.data, avatar_url); + } + + template + void onlinedata_to_presencedetails(const rpcn::friend_online_data& data, bool same_context, T& details) + { + memset(&details, 0, sizeof(T)); + details.state = data.online ? (same_context ? SCE_NP_BASIC_PRESENCE_STATE_IN_CONTEXT : SCE_NP_BASIC_PRESENCE_STATE_OUT_OF_CONTEXT) : SCE_NP_BASIC_PRESENCE_STATE_OFFLINE; + strcpy_trunc(details.title, data.pr_title); + strcpy_trunc(details.status, data.pr_status); + strcpy_trunc(details.comment, data.pr_comment); + details.size = std::min(::size32(data.pr_data), SCE_NP_BASIC_MAX_PRESENCE_SIZE); + std::memcpy(details.data, data.pr_data.data(), details.size); + + if constexpr (std::is_same_v) + { + details.struct_size = sizeof(SceNpBasicPresenceDetails2); + } + } + + template void onlinedata_to_presencedetails(const rpcn::friend_online_data& data, bool same_context, SceNpBasicPresenceDetails& details); + template void onlinedata_to_presencedetails(const rpcn::friend_online_data& data, bool same_context, SceNpBasicPresenceDetails2& details); + void string_to_npid(std::string_view str, SceNpId& npid) { memset(&npid, 0, sizeof(npid)); diff --git a/rpcs3/Emu/NP/np_helpers.h b/rpcs3/Emu/NP/np_helpers.h index a0cd17f822..749e2a59bd 100644 --- a/rpcs3/Emu/NP/np_helpers.h +++ b/rpcs3/Emu/NP/np_helpers.h @@ -3,6 +3,7 @@ #include "util/types.hpp" #include "Emu/Cell/Modules/sceNp.h" #include "Emu/Cell/Modules/sceNp2.h" +#include "rpcn_client.h" namespace np { @@ -13,6 +14,10 @@ namespace np void string_to_online_name(std::string_view str, SceNpOnlineName& online_name); void string_to_avatar_url(std::string_view str, SceNpAvatarUrl& avatar_url); void string_to_communication_id(std::string_view str, SceNpCommunicationId& comm_id); + void strings_to_userinfo(std::string_view npid, std::string_view online_name, std::string_view avatar_url, SceNpUserInfo& user_info); + + template + void onlinedata_to_presencedetails(const rpcn::friend_online_data& data, bool same_context, T& details); bool is_valid_npid(const SceNpId& npid); bool is_same_npid(const SceNpId& npid_1, const SceNpId& npid_2); diff --git a/rpcs3/Emu/NP/rpcn_client.cpp b/rpcs3/Emu/NP/rpcn_client.cpp index fdd6bb0db0..8d650b1137 100644 --- a/rpcs3/Emu/NP/rpcn_client.cpp +++ b/rpcs3/Emu/NP/rpcn_client.cpp @@ -47,6 +47,11 @@ LOG_CHANNEL(rpcn_log, "rpcn"); int get_native_error(); +void vec_stream::dump() const +{ + rpcn_log.error("vec_stream dump:\n%s", fmt::buf_to_hexstring(vec.data(), vec.size())); +} + namespace rpcn { localized_string_id rpcn_state_to_localized_string_id(rpcn::rpcn_state state) @@ -74,9 +79,8 @@ namespace rpcn return get_localized_string(rpcn_state_to_localized_string_id(state)); } - constexpr u32 RPCN_PROTOCOL_VERSION = 20; + constexpr u32 RPCN_PROTOCOL_VERSION = 21; constexpr usz RPCN_HEADER_SIZE = 15; - constexpr usz COMMUNICATION_ID_SIZE = 9; bool is_error(ErrorType err) { @@ -293,8 +297,28 @@ namespace rpcn { if (msg.size() == 6) { - addr_sig = read_from_ptr>(&msg[0]); - port_sig = read_from_ptr>(&msg[4]); + const u32 new_addr_sig = read_from_ptr>(&msg[0]); + const u32 new_port_sig = read_from_ptr>(&msg[4]); + const u32 old_addr_sig = addr_sig; + const u32 old_port_sig = port_sig; + + if (new_addr_sig != old_addr_sig) + { + addr_sig = new_addr_sig; + if (old_addr_sig == 0) + { + addr_sig.notify_one(); + } + } + + if (new_port_sig != old_port_sig) + { + port_sig = new_port_sig; + if (old_port_sig == 0) + { + port_sig.notify_one(); + } + } last_pong_time = now; } @@ -351,7 +375,7 @@ namespace rpcn case recvn_result::recvn_timeout: return error_and_disconnect("Failed to read a packet header on socket"); case recvn_result::recvn_nodata: return true; case recvn_result::recvn_success: break; - case recvn_result::recvn_terminate: return error_and_disconnect("Recvn was forcefully aborted"); + case recvn_result::recvn_terminate: return error_and_disconnect_notice("Recvn was forcefully aborted"); } const u8 packet_type = header[0]; @@ -384,7 +408,8 @@ namespace rpcn command == CommandType::AddFriend || command == CommandType::RemoveFriend || command == CommandType::AddBlock || command == CommandType::RemoveBlock || command == CommandType::SendMessage || command == CommandType::SendToken || - command == CommandType::SendResetToken || command == CommandType::ResetPassword || command == CommandType::GetNetworkTime) + command == CommandType::SendResetToken || command == CommandType::ResetPassword || + command == CommandType::GetNetworkTime || command == CommandType::SetPresence) { std::lock_guard lock(mutex_replies_sync); replies_sync.insert(std::make_pair(packet_id, std::make_pair(command, std::move(data)))); @@ -412,6 +437,7 @@ namespace rpcn case NotificationType::FriendLost: case NotificationType::FriendQuery: case NotificationType::FriendStatus: + case NotificationType::FriendPresenceChanged: { handle_friend_notification(command, std::move(data)); break; @@ -918,14 +944,27 @@ namespace rpcn avatar_url = reply.get_string(false); user_id = reply.get(); - auto get_usernames_and_status = [](vec_stream& stream, std::map>& friends) + auto get_usernames_and_status = [](vec_stream& stream, std::map& friends) { u32 num_friends = stream.get(); for (u32 i = 0; i < num_friends; i++) { std::string friend_name = stream.get_string(false); - bool online = !!(stream.get()); - friends.insert(std::make_pair(std::move(friend_name), std::make_pair(online, 0))); + bool online = !!(stream.get()); + + SceNpCommunicationId pr_com_id = stream.get_com_id(); + std::string pr_title = fmt::truncate(stream.get_string(true), SCE_NP_BASIC_PRESENCE_TITLE_SIZE_MAX - 1); + std::string pr_status = fmt::truncate(stream.get_string(true), SCE_NP_BASIC_PRESENCE_EXTENDED_STATUS_SIZE_MAX - 1); + std::string pr_comment = fmt::truncate(stream.get_string(true), SCE_NP_BASIC_PRESENCE_COMMENT_SIZE_MAX - 1); + std::vector pr_data = stream.get_rawdata(); + + if (pr_data.size() > SCE_NP_BASIC_MAX_PRESENCE_SIZE) + { + pr_data.resize(SCE_NP_BASIC_MAX_PRESENCE_SIZE); + } + + friend_online_data infos(online, std::move(pr_com_id), std::move(pr_title), std::move(pr_status), std::move(pr_comment), std::move(pr_data)); + friends.insert(std::make_pair(std::move(friend_name), std::move(infos))); } }; @@ -1170,39 +1209,39 @@ namespace rpcn std::vector>> rpcn_client::get_notifications() { - std::vector>> notifs; - - { - std::lock_guard lock(mutex_notifs); - notifs = std::move(notifications); - notifications.clear(); - } - + std::lock_guard lock(mutex_notifs); + std::vector>> notifs = std::move(notifications); + notifications.clear(); return notifs; } std::unordered_map>> rpcn_client::get_replies() { - std::unordered_map>> ret_replies; - - { - std::lock_guard lock(mutex_replies); - ret_replies = std::move(replies); - replies.clear(); - } - + std::lock_guard lock(mutex_replies); + std::unordered_map>> ret_replies = std::move(replies); + replies.clear(); return ret_replies; } + std::unordered_map rpcn_client::get_presence_updates() + { + std::lock_guard lock(mutex_presence_updates); + std::unordered_map ret_updates = std::move(presence_updates); + presence_updates.clear(); + return ret_updates; + } + + std::map rpcn_client::get_presence_states() + { + std::lock_guard lock(mutex_friends); + return friend_infos.friends; + } + std::vector rpcn_client::get_new_messages() { - std::vector ret_new_messages; - { - std::lock_guard lock(mutex_messages); - ret_new_messages = std::move(new_messages); - new_messages.clear(); - } - + std::lock_guard lock(mutex_messages); + std::vector ret_new_messages = std::move(new_messages); + new_messages.clear(); return ret_new_messages; } @@ -1415,17 +1454,9 @@ namespace rpcn auto req_finished = CreateCreateJoinRoomRequest(builder, req->worldId, req->lobbyId, req->maxSlot, req->flagAttr, final_binattrinternal_vec, final_searchintattrexternal_vec, final_searchbinattrexternal_vec, final_binattrexternal_vec, final_roompassword, final_groupconfigs_vec, final_passwordSlotMask, final_allowedusers_vec, final_blockedusers_vec, final_grouplabel, final_memberbinattrinternal_vec, req->teamId, final_optparam); - builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::CreateRoom, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::CreateRoom, req_id); } bool rpcn_client::join_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2JoinRoomRequest* req) @@ -1452,17 +1483,9 @@ namespace rpcn flatbuffers::Offset final_optdata = CreatePresenceOptionData(builder, builder.CreateVector(req->optData.data, 16), req->optData.length); auto req_finished = CreateJoinRoomRequest(builder, req->roomId, final_roompassword, final_grouplabel, final_memberbinattrinternal_vec, final_optdata, req->teamId); - builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::JoinRoom, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::JoinRoom, req_id); } bool rpcn_client::leave_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2LeaveRoomRequest* req) @@ -1471,15 +1494,8 @@ namespace rpcn flatbuffers::Offset final_optdata = CreatePresenceOptionData(builder, builder.CreateVector(req->optData.data, 16), req->optData.length); auto req_finished = CreateLeaveRoomRequest(builder, req->roomId, final_optdata); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::LeaveRoom, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::LeaveRoom, req_id); } bool rpcn_client::search_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SearchRoomRequest* req) @@ -1538,15 +1554,8 @@ namespace rpcn auto req_finished = s_req.Finish(); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + bufsize + sizeof(u32)); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::SearchRoom, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::SearchRoom, req_id); } bool rpcn_client::get_roomdata_external_list(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2GetRoomDataExternalListRequest* req) @@ -1564,17 +1573,9 @@ namespace rpcn } auto req_finished = CreateGetRoomDataExternalListRequestDirect(builder, &roomIds, &attrIds); - builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + bufsize + sizeof(u32)); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::GetRoomDataExternalList, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::GetRoomDataExternalList, req_id); } bool rpcn_client::set_roomdata_external(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetRoomDataExternalRequest* req) @@ -1614,17 +1615,9 @@ namespace rpcn final_binattrexternal_vec = builder.CreateVector(davec); } auto req_finished = CreateSetRoomDataExternalRequest(builder, req->roomId, final_searchintattrexternal_vec, final_searchbinattrexternal_vec, final_binattrexternal_vec); - builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + bufsize + sizeof(u32)); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::SetRoomDataExternal, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::SetRoomDataExternal, req_id); } bool rpcn_client::get_roomdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2GetRoomDataInternalRequest* req) @@ -1643,17 +1636,9 @@ namespace rpcn } auto req_finished = CreateGetRoomDataInternalRequest(builder, req->roomId, final_attr_ids_vec); - builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + bufsize + sizeof(u32)); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::GetRoomDataInternal, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::GetRoomDataInternal, req_id); } bool rpcn_client::set_roomdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetRoomDataInternalRequest* req) @@ -1698,17 +1683,9 @@ namespace rpcn auto req_finished = CreateSetRoomDataInternalRequest(builder, req->roomId, req->flagFilter, req->flagAttr, final_binattrinternal_vec, final_grouppasswordconfig_vec, final_passwordSlotMask, final_ownerprivilege_vec); - builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + bufsize + sizeof(u32)); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::SetRoomDataInternal, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::SetRoomDataInternal, req_id); } bool rpcn_client::set_roommemberdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetRoomMemberDataInternalRequest* req) @@ -1727,17 +1704,9 @@ namespace rpcn } auto req_finished = CreateSetRoomMemberDataInternalRequest(builder, req->roomId, req->memberId, req->teamId, final_binattrinternal_vec); - builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + bufsize + sizeof(u32)); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::SetRoomMemberDataInternal, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::SetRoomMemberDataInternal, req_id); } bool rpcn_client::ping_room_owner(u32 req_id, const SceNpCommunicationId& communication_id, u64 room_id) @@ -1777,17 +1746,9 @@ namespace rpcn } auto req_finished = CreateSendRoomMessageRequest(builder, req->roomId, req->castType, builder.CreateVector(dst.data(), dst.size()), builder.CreateVector(reinterpret_cast(req->msg.get_ptr()), req->msgLen), req->option); - builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::SendRoomMessage, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::SendRoomMessage, req_id); } bool rpcn_client::req_sign_infos(u32 req_id, const std::string& npid) @@ -1840,9 +1801,7 @@ namespace rpcn reinterpret_cast&>(data[0]) = static_cast(bufsize); memcpy(data.data() + sizeof(u32), buf, bufsize); - u64 req_id = rpcn_request_counter.fetch_add(1); - - return forge_send(CommandType::SendMessage, req_id, data); + return forge_send(CommandType::SendMessage, rpcn_request_counter.fetch_add(1), data); } bool rpcn_client::get_board_infos(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id) @@ -1859,34 +1818,18 @@ namespace rpcn flatbuffers::FlatBufferBuilder builder(1024); auto req_finished = CreateRecordScoreRequestDirect(builder, board_id, char_id, score, comment ? (*comment).c_str() : nullptr, score_data ? &*score_data : nullptr); - builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::RecordScore, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::RecordScore, req_id); } bool rpcn_client::get_score_range(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id, u32 start_rank, u32 num_rank, bool with_comment, bool with_gameinfo) { flatbuffers::FlatBufferBuilder builder(1024); auto req_finished = CreateGetScoreRangeRequest(builder, board_id, start_rank, num_rank, with_comment, with_gameinfo); - builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::GetScoreRange, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::GetScoreRange, req_id); } bool rpcn_client::get_score_npid(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id, const std::vector>& npids, bool with_comment, bool with_gameinfo) @@ -1903,15 +1846,8 @@ namespace rpcn auto req_finished = CreateGetScoreNpIdRequest(builder, board_id, builder.CreateVector(davec), with_comment, with_gameinfo); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::GetScoreNpid, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::GetScoreNpid, req_id); } bool rpcn_client::get_score_friend(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id, bool include_self, bool with_comment, bool with_gameinfo, u32 max_entries) @@ -1920,15 +1856,7 @@ namespace rpcn auto req_finished = CreateGetScoreFriendsRequest(builder, board_id, include_self, max_entries, with_comment, with_gameinfo); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::GetScoreFriends, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::GetScoreFriends, req_id); } bool rpcn_client::record_score_data(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScorePcId pc_id, SceNpScoreBoardId board_id, s64 score, const std::vector& score_data) @@ -1956,15 +1884,7 @@ namespace rpcn auto req_finished = CreateGetScoreGameDataRequest(builder, board_id, builder.CreateString(reinterpret_cast(npid.handle.data)), pc_id); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::GetScoreData, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::GetScoreData, req_id); } bool rpcn_client::tus_set_multislot_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr slotIdArray, vm::cptr variableArray, s32 arrayNum, bool vuser) @@ -1976,15 +1896,7 @@ namespace rpcn auto req_finished = CreateTusSetMultiSlotVariableRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), builder.CreateVector(slotid_array), builder.CreateVector(variable_array)); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::TusSetMultiSlotVariable, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::TusSetMultiSlotVariable, req_id); } bool rpcn_client::tus_get_multislot_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr slotIdArray, s32 arrayNum, bool vuser) @@ -1995,15 +1907,7 @@ namespace rpcn auto req_finished = CreateTusGetMultiSlotVariableRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), builder.CreateVector(slotid_array)); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::TusGetMultiSlotVariable, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::TusGetMultiSlotVariable, req_id); } bool rpcn_client::tus_get_multiuser_variable(u32 req_id, const SceNpCommunicationId& communication_id, const std::vector& targetNpIdArray, SceNpTusSlotId slotId, s32 arrayNum, bool vuser) @@ -2019,15 +1923,7 @@ namespace rpcn auto req_finished = CreateTusGetMultiUserVariableRequest(builder, builder.CreateVector(davec), slotId); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::TusGetMultiUserVariable, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::TusGetMultiUserVariable, req_id); } bool rpcn_client::tus_get_friends_variable(u32 req_id, const SceNpCommunicationId& communication_id, SceNpTusSlotId slotId, bool includeSelf, s32 sortType, s32 arrayNum) @@ -2036,15 +1932,7 @@ namespace rpcn auto req_finished = CreateTusGetFriendsVariableRequest(builder, slotId, includeSelf, sortType, arrayNum); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::TusGetFriendsVariable, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::TusGetFriendsVariable, req_id); } bool rpcn_client::tus_add_and_get_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr option, bool vuser) @@ -2072,15 +1960,7 @@ namespace rpcn auto req_finished = CreateTusAddAndGetVariableRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), slotId, inVariable, isLastChangedDate, isLastChangedAuthorId); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::TusAddAndGetVariable, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::TusAddAndGetVariable, req_id); } bool rpcn_client::tus_try_and_set_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr option, bool vuser) @@ -2116,15 +1996,7 @@ namespace rpcn auto req_finished = CreateTusTryAndSetVariableRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), slotId, opeType, variable, isLastChangedDate, isLastChangedAuthorId, compareValue); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::TusTryAndSetVariable, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::TusTryAndSetVariable, req_id); } bool rpcn_client::tus_delete_multislot_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr slotIdArray, s32 arrayNum, bool vuser) @@ -2135,15 +2007,7 @@ namespace rpcn auto req_finished = CreateTusDeleteMultiSlotVariableRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), builder.CreateVector(slotid_array)); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::TusDeleteMultiSlotVariable, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::TusDeleteMultiSlotVariable, req_id); } bool rpcn_client::tus_set_data(u32 req_id, SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, const std::vector& tus_data, vm::cptr info, vm::ptr option, bool vuser) @@ -2178,15 +2042,7 @@ namespace rpcn auto req_finished = CreateTusSetDataRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), slotId, builder.CreateVector(tus_data), fb_info, isLastChangedDate, isLastChangedAuthorId); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::TusSetData, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::TusSetData, req_id); } bool rpcn_client::tus_get_data(u32 req_id, SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, bool vuser) @@ -2195,15 +2051,7 @@ namespace rpcn auto req_finished = CreateTusGetDataRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), slotId); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::TusGetData, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::TusGetData, req_id); } bool rpcn_client::tus_get_multislot_data_status(u32 req_id, SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr slotIdArray, s32 arrayNum, bool vuser) @@ -2214,15 +2062,7 @@ namespace rpcn auto req_finished = CreateTusGetMultiSlotDataStatusRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), builder.CreateVector(slotid_array)); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::TusGetMultiSlotDataStatus, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::TusGetMultiSlotDataStatus, req_id); } bool rpcn_client::tus_get_multiuser_data_status(u32 req_id, SceNpCommunicationId& communication_id, const std::vector& targetNpIdArray, SceNpTusSlotId slotId, s32 arrayNum, bool vuser) @@ -2238,15 +2078,7 @@ namespace rpcn auto req_finished = CreateTusGetMultiUserDataStatusRequest(builder, builder.CreateVector(davec), slotId); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::TusGetMultiUserDataStatus, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::TusGetMultiUserDataStatus, req_id); } bool rpcn_client::tus_get_friends_data_status(u32 req_id, SceNpCommunicationId& communication_id, SceNpTusSlotId slotId, bool includeSelf, s32 sortType, s32 arrayNum) @@ -2255,15 +2087,7 @@ namespace rpcn auto req_finished = CreateTusGetFriendsDataStatusRequest(builder, slotId, includeSelf, sortType, arrayNum); builder.Finish(req_finished); - const u8* buf = builder.GetBufferPointer(); - const usz bufsize = builder.GetSize(); - std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); - memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - - return forge_send(CommandType::TusGetFriendsDataStatus, req_id, data); + return forge_request_with_com_id(builder, communication_id, CommandType::TusGetFriendsDataStatus, req_id); } bool rpcn_client::tus_delete_multislot_data(u32 req_id, SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr slotIdArray, s32 arrayNum, bool vuser) @@ -2274,15 +2098,29 @@ namespace rpcn auto req_finished = CreateTusDeleteMultiSlotDataRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), builder.CreateVector(slotid_array)); builder.Finish(req_finished); + return forge_request_with_com_id(builder, communication_id, CommandType::TusDeleteMultiSlotData, req_id); + } + + bool rpcn_client::send_presence(const SceNpCommunicationId& pr_com_id, const std::string& pr_title, const std::string& pr_status, const std::string& pr_comment, const std::vector& pr_data) + { + flatbuffers::FlatBufferBuilder builder(1024); + auto req_finished = CreateSetPresenceRequest(builder, builder.CreateString(pr_title), builder.CreateString(pr_status), builder.CreateString(pr_comment), builder.CreateVector(pr_data)); + builder.Finish(req_finished); + + return forge_request_with_com_id(builder, pr_com_id, CommandType::SetPresence, rpcn_request_counter.fetch_add(1)); + } + + bool rpcn_client::forge_request_with_com_id(const flatbuffers::FlatBufferBuilder& builder, const SceNpCommunicationId& com_id, CommandType command, u64 packet_id) + { const u8* buf = builder.GetBufferPointer(); const usz bufsize = builder.GetSize(); std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize); - memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE); + memcpy(data.data(), com_id.data, COMMUNICATION_ID_SIZE); reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize); - return forge_send(CommandType::TusDeleteMultiSlotData, req_id, data); + return forge_send(command, packet_id, data); } std::vector rpcn_client::forge_request(u16 command, u64 packet_id, const std::vector& data) const @@ -2306,6 +2144,13 @@ namespace rpcn return false; } + bool rpcn_client::error_and_disconnect_notice(const std::string& error_msg) + { + connected = false; + rpcn_log.notice("%s", error_msg); + return false; + } + rpcn_state rpcn_client::wait_for_connection() { { @@ -2402,12 +2247,12 @@ namespace rpcn } friend_infos.requests_received.insert(username); - call_callbacks(ntype, username, 0); + call_callbacks(ntype, username, false); break; } case NotificationType::FriendNew: // Add a friend to the friendlist(either accepted a friend request or friend accepted it) { - bool status = !!vdata.get(); + bool online = !!vdata.get(); std::string username = vdata.get_string(false); if (vdata.is_error()) { @@ -2417,8 +2262,8 @@ namespace rpcn friend_infos.requests_received.erase(username); friend_infos.requests_sent.erase(username); - friend_infos.friends.insert(std::make_pair(username, std::make_pair(status, 0))); - call_callbacks(ntype, username, status); + friend_infos.friends.insert(std::make_pair(username, friend_online_data(online, 0))); + call_callbacks(ntype, username, online); break; } @@ -2432,12 +2277,12 @@ namespace rpcn } friend_infos.friends.erase(username); - call_callbacks(ntype, username, 0); + call_callbacks(ntype, username, false); break; } case NotificationType::FriendStatus: // Set status of friend to Offline or Online { - bool status = !!vdata.get(); + bool online = !!vdata.get(); u64 timestamp = vdata.get(); std::string username = vdata.get_string(false); if (vdata.is_error()) @@ -2448,17 +2293,56 @@ namespace rpcn if (auto u = friend_infos.friends.find(username); u != friend_infos.friends.end()) { - if (timestamp < u->second.second) + if (timestamp < u->second.timestamp) { break; } - u->second.second = timestamp; - u->second.first = status; - call_callbacks(ntype, username, status); + // clear presence data on online/offline + u->second = friend_online_data(online, timestamp); + + { + std::lock_guard lock(mutex_presence_updates); + presence_updates.insert_or_assign(username, u->second); + } + + call_callbacks(ntype, username, online); } break; } + case NotificationType::FriendPresenceChanged: + { + std::string npid = vdata.get_string(true); + SceNpCommunicationId pr_com_id = vdata.get_com_id(); + std::string pr_title = fmt::truncate(vdata.get_string(true), SCE_NP_BASIC_PRESENCE_TITLE_SIZE_MAX - 1); + std::string pr_status = fmt::truncate(vdata.get_string(true), SCE_NP_BASIC_PRESENCE_EXTENDED_STATUS_SIZE_MAX - 1); + std::string pr_comment = fmt::truncate(vdata.get_string(true), SCE_NP_BASIC_PRESENCE_COMMENT_SIZE_MAX - 1); + std::vector pr_data = vdata.get_rawdata(); + if (pr_data.size() > SCE_NP_BASIC_MAX_PRESENCE_SIZE) + { + pr_data.resize(SCE_NP_BASIC_MAX_PRESENCE_SIZE); + } + + if (vdata.is_error()) + { + rpcn_log.error("Error parsing FriendPresenceChanged notification"); + break; + } + + if (auto u = friend_infos.friends.find(npid); u != friend_infos.friends.end()) + { + u->second.pr_com_id = std::move(pr_com_id); + u->second.pr_title = std::move(pr_title); + u->second.pr_status = std::move(pr_status); + u->second.pr_comment = std::move(pr_comment); + u->second.pr_data = std::move(pr_data); + + std::lock_guard lock(mutex_presence_updates); + presence_updates.insert_or_assign(std::move(npid), u->second); + } + + break; + } default: { rpcn_log.fatal("Unknown notification forwarded to handle_friend_notification"); @@ -2607,4 +2491,25 @@ namespace rpcn return it->first; } + std::optional> rpcn_client::get_friend_presence_by_index(u32 index) + { + std::lock_guard lock(mutex_friends); + + if (index >= friend_infos.friends.size()) + { + return std::nullopt; + } + + auto it = friend_infos.friends.begin(); + std::advance(it, index); + return std::optional(*it); + } + + std::optional> rpcn_client::get_friend_presence_by_npid(const std::string& npid) + { + std::lock_guard lock(mutex_friends); + const auto it = friend_infos.friends.find(npid); + return it == friend_infos.friends.end() ? std::nullopt : std::optional(*it); + } + } // namespace rpcn diff --git a/rpcs3/Emu/NP/rpcn_client.h b/rpcs3/Emu/NP/rpcn_client.h index 275d5fdaca..2fd16c4fc7 100644 --- a/rpcs3/Emu/NP/rpcn_client.h +++ b/rpcs3/Emu/NP/rpcn_client.h @@ -39,6 +39,8 @@ #pragma GCC diagnostic pop #endif +constexpr usz COMMUNICATION_ID_SIZE = 9; + class vec_stream { public: @@ -50,15 +52,17 @@ public: return error; } + void dump() const; + // Getters template T get() { - if (sizeof(T) + i > vec.size()) + if (sizeof(T) + i > vec.size() || error) { error = true; - return 0; + return static_cast(0); } T res = read_from_ptr>(&vec[i]); i += sizeof(T); @@ -83,16 +87,34 @@ public: } std::vector get_rawdata() { - std::vector ret; u32 size = get(); - if ((vec.begin() + i + size) <= vec.end()) - std::copy(vec.begin() + i, vec.begin() + i + size, std::back_inserter(ret)); - else + if (i + size > vec.size()) + { error = true; + return {}; + } + std::vector ret; + std::copy(vec.begin() + i, vec.begin() + i + size, std::back_inserter(ret)); + i += size; return ret; } + + SceNpCommunicationId get_com_id() + { + if (i + COMMUNICATION_ID_SIZE > vec.size() || error) + { + error = true; + return {}; + } + + SceNpCommunicationId com_id{}; + std::memcpy(&com_id.data[0], &vec[i], COMMUNICATION_ID_SIZE); + i += COMMUNICATION_ID_SIZE; + return com_id; + } + template const T* get_flatbuffer() { @@ -197,6 +219,8 @@ namespace rpcn TusGetMultiUserDataStatus, TusGetFriendsDataStatus, TusDeleteMultiSlotData, + ClearPresence, + SetPresence, }; enum NotificationType : u16 @@ -214,6 +238,7 @@ namespace rpcn FriendStatus, // Set status of friend to Offline or Online RoomMessageReceived, MessageReceived, + FriendPresenceChanged, }; enum class rpcn_state @@ -276,9 +301,26 @@ namespace rpcn using friend_cb_func = void (*)(void* param, NotificationType ntype, const std::string& username, bool status); using message_cb_func = void (*)(void* param, const std::shared_ptr> new_msg, u64 msg_id); + struct friend_online_data + { + friend_online_data(bool online, SceNpCommunicationId&& pr_com_id, std::string&& pr_title, std::string&& pr_status, std::string&& pr_comment, std::vector&& pr_data) + : online(online), timestamp(0), pr_com_id(pr_com_id), pr_title(pr_title), pr_status(pr_status), pr_comment(pr_comment), pr_data(pr_data) {} + + friend_online_data(bool online, u64 timestamp) + : online(online), timestamp(timestamp) {} + + bool online = false; + u64 timestamp = 0; + SceNpCommunicationId pr_com_id{}; + std::string pr_title; + std::string pr_status; + std::string pr_comment; + std::vector pr_data; + }; + struct friend_data { - std::map> friends; + std::map friends; std::set requests_sent; std::set requests_received; std::set blocked; @@ -375,9 +417,13 @@ namespace rpcn u32 get_num_friends(); u32 get_num_blocks(); std::optional get_friend_by_index(u32 index); + std::optional> get_friend_presence_by_index(u32 index); + std::optional> get_friend_presence_by_npid(const std::string& npid); std::vector>> get_notifications(); std::unordered_map>> get_replies(); + std::unordered_map get_presence_updates(); + std::map get_presence_states(); std::vector get_new_messages(); std::optional>> get_message(u64 id); @@ -439,6 +485,7 @@ namespace rpcn bool tus_get_multiuser_data_status(u32 req_id, SceNpCommunicationId& communication_id, const std::vector& targetNpIdArray, SceNpTusSlotId slotId, s32 arrayNum, bool vuser); bool tus_get_friends_data_status(u32 req_id, SceNpCommunicationId& communication_id, SceNpTusSlotId slotId, bool includeSelf, s32 sortType, s32 arrayNum); bool tus_delete_multislot_data(u32 req_id, SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr slotIdArray, s32 arrayNum, bool vuser); + bool send_presence(const SceNpCommunicationId& pr_com_id, const std::string& pr_title, const std::string& pr_status, const std::string& pr_comment, const std::vector& pr_data); const std::string& get_online_name() const { @@ -451,12 +498,24 @@ namespace rpcn u32 get_addr_sig() const { + if (!addr_sig) + { + addr_sig.wait(0, static_cast(10'000'000'000)); + } + return addr_sig.load(); } + u16 get_port_sig() const { + if (!port_sig) + { + port_sig.wait(0, static_cast(10'000'000'000)); + } + return port_sig.load(); } + u32 get_addr_local() const { return local_addr_sig.load(); @@ -472,9 +531,11 @@ namespace rpcn std::vector forge_request(u16 command, u64 packet_id, const std::vector& data) const; bool forge_send(u16 command, u64 packet_id, const std::vector& data); + bool forge_request_with_com_id(const flatbuffers::FlatBufferBuilder& builder, const SceNpCommunicationId& com_id, CommandType command, u64 packet_id); bool forge_send_reply(u16 command, u64 packet_id, const std::vector& data, std::vector& reply_data); bool error_and_disconnect(const std::string& error_mgs); + bool error_and_disconnect_notice(const std::string& error_msg); std::string get_wolfssl_error(WOLFSSL* wssl, int error) const; @@ -499,10 +560,11 @@ namespace rpcn atomic_t rpcn_request_counter = 0x100000001; // Counter used for commands whose result is not forwarded to NP handler(login, create, sendmessage, etc) - shared_mutex mutex_notifs, mutex_replies, mutex_replies_sync; + shared_mutex mutex_notifs, mutex_replies, mutex_replies_sync, mutex_presence_updates; std::vector>> notifications; // notif type / data std::unordered_map>> replies; // req id / (command / data) std::unordered_map>> replies_sync; // same but for sync replies(see handle_input()) + std::unordered_map presence_updates; // npid / presence data // Messages struct message_cb_t @@ -531,9 +593,9 @@ namespace rpcn s64 user_id = 0; - atomic_t addr_sig{}; - atomic_t port_sig{}; - atomic_t local_addr_sig{}; + atomic_t addr_sig = 0; + atomic_t port_sig = 0; // Stores an u16, u32 is used for atomic_t::wait convenience + atomic_t local_addr_sig = 0; static constexpr int RPCN_TIMEOUT_INTERVAL = 50; // 50ms static constexpr int RPCN_TIMEOUT = 10'000; // 10s diff --git a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp index 106f60cee1..acd5c50e5b 100644 --- a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp @@ -925,7 +925,7 @@ rpcn_friends_dialog::rpcn_friends_dialog(QWidget* parent) for (const auto& fr : data.friends) { - add_update_list(m_lst_friends, QString::fromStdString(fr.first), fr.second.first ? m_green_icon : m_red_icon, fr.second.first); + add_update_list(m_lst_friends, QString::fromStdString(fr.first), fr.second.online ? m_green_icon : m_red_icon, fr.second.online); } for (const auto& fr_req : data.requests_sent) diff --git a/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp b/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp index f3a479db6c..90f27e8b28 100644 --- a/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp +++ b/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp @@ -82,7 +82,7 @@ bool sendmessage_dialog_frame::Exec(message_data& msg_data, std::set