diff --git a/src/client/game/demonware/reply.hpp b/src/client/game/demonware/reply.hpp index ecf5eca4..2a1b0827 100644 --- a/src/client/game/demonware/reply.hpp +++ b/src/client/game/demonware/reply.hpp @@ -123,10 +123,10 @@ namespace demonware if (!this->error_) { - buffer.write_uint32(uint32_t(this->objects_.size())); + buffer.write_uint32(static_cast(this->objects_.size())); if (!this->objects_.empty()) { - buffer.write_uint32(uint32_t(this->objects_.size())); + buffer.write_uint32(static_cast(this->objects_.size())); for (auto& object : this->objects_) { @@ -145,20 +145,17 @@ namespace demonware return transaction_id; } - void add(const std::shared_ptr& object) + template + void add(std::unique_ptr& object) { - this->objects_.push_back(object); - } - - void add(bdTaskResult* object) - { - this->add(std::shared_ptr(object)); + static_assert(std::is_base_of_v); + this->objects_.emplace_back(std::move(object)); } private: uint8_t type_; uint32_t error_; remote_reply reply_; - std::vector> objects_; + std::vector> objects_; }; } diff --git a/src/client/game/demonware/servers/lobby_server.cpp b/src/client/game/demonware/servers/lobby_server.cpp index a55f30b4..da9a4c49 100644 --- a/src/client/game/demonware/servers/lobby_server.cpp +++ b/src/client/game/demonware/servers/lobby_server.cpp @@ -180,7 +180,7 @@ namespace demonware uint8_t task_id; buffer.read_ubyte(&task_id); - this->create_reply(task_id)->send(); + this->create_reply(task_id).send(); } } } diff --git a/src/client/game/demonware/servers/service_server.hpp b/src/client/game/demonware/servers/service_server.hpp index dcf40fe7..e314a341 100644 --- a/src/client/game/demonware/servers/service_server.hpp +++ b/src/client/game/demonware/servers/service_server.hpp @@ -9,17 +9,15 @@ namespace demonware public: virtual ~service_server() = default; - virtual std::shared_ptr create_message(uint8_t type) + virtual remote_reply create_message(uint8_t type) { - auto reply = std::make_shared(this, type); - return reply; + return remote_reply{this, type}; } - virtual std::shared_ptr create_reply(uint8_t type, uint32_t error = 0) + virtual service_reply create_reply(uint8_t type, uint32_t error = 0) { - auto reply = std::make_shared(this, type, error); - return reply; + return service_reply{this, type, error}; } virtual void send_reply(reply* data) = 0; diff --git a/src/client/game/demonware/service.hpp b/src/client/game/demonware/service.hpp index 2fc121a1..81b3399f 100644 --- a/src/client/game/demonware/service.hpp +++ b/src/client/game/demonware/service.hpp @@ -62,7 +62,7 @@ namespace demonware printf("[DW] %s: missing task '%d'\n", name_.data(), this->task_id_); // return no error - server->create_reply(this->task_id_)->send(); + server->create_reply(this->task_id_).send(); } } diff --git a/src/client/game/demonware/services/bdAnticheat.cpp b/src/client/game/demonware/services/bdAnticheat.cpp index ba1b67bf..afdbbfec 100644 --- a/src/client/game/demonware/services/bdAnticheat.cpp +++ b/src/client/game/demonware/services/bdAnticheat.cpp @@ -16,34 +16,34 @@ namespace demonware { // TODO: Read data as soon as needed auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdAnticheat::reportConsoleID(service_server* server, byte_buffer* /*buffer*/) const { // TODO: Read data as soon as needed auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdAnticheat::reportConsoleDetails(service_server* server, byte_buffer* /*buffer*/) const { // TODO: Read data as soon as needed auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdAnticheat::answerTOTPChallenge(service_server* server, byte_buffer* /*buffer*/) const { // TODO: Read data as soon as needed auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdAnticheat::idk(service_server* server, byte_buffer* /*buffer*/) const { // TODO: Read data as soon as needed auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdBandwidthTest.cpp b/src/client/game/demonware/services/bdBandwidthTest.cpp index 2c41e4d2..8c432c40 100644 --- a/src/client/game/demonware/services/bdBandwidthTest.cpp +++ b/src/client/game/demonware/services/bdBandwidthTest.cpp @@ -22,6 +22,6 @@ namespace demonware buffer.write(sizeof bandwidth_iw6, bandwidth_iw6); auto reply = server->create_message(5); - reply->send(&buffer, true); + reply.send(&buffer, true); } } diff --git a/src/client/game/demonware/services/bdContentStreaming.cpp b/src/client/game/demonware/services/bdContentStreaming.cpp index 6e4b8051..1ec3cb7a 100644 --- a/src/client/game/demonware/services/bdContentStreaming.cpp +++ b/src/client/game/demonware/services/bdContentStreaming.cpp @@ -14,7 +14,7 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdContentStreaming::list_all_publisher_files(service_server* server, byte_buffer* buffer) const @@ -36,11 +36,11 @@ namespace demonware /*if(filename.empty()) { - server->create_reply(this->task_id(), game::BD_NO_FILE)->send(); + server->create_reply(this->task_id(), game::BD_NO_FILE).send(); return; }*/ auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdCounter.cpp b/src/client/game/demonware/services/bdCounter.cpp index ee190ade..2bedbdb4 100644 --- a/src/client/game/demonware/services/bdCounter.cpp +++ b/src/client/game/demonware/services/bdCounter.cpp @@ -13,13 +13,13 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdCounter::getCounterTotals(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdDDL.cpp b/src/client/game/demonware/services/bdDDL.cpp index 81555483..d37cd37f 100644 --- a/src/client/game/demonware/services/bdDDL.cpp +++ b/src/client/game/demonware/services/bdDDL.cpp @@ -13,17 +13,17 @@ namespace demonware uint32_t count; buffer->read_uint32(&count); - const auto reply = server->create_reply(this->task_id()); + auto reply = server->create_reply(this->task_id()); for (uint32_t i = 0; i < count; i++) { - auto* checksum = new bdDDLChecksumResult; + auto checksum = std::make_unique(); checksum->deserialize(buffer); checksum->checksum_matched = true; - reply->add(checksum); + reply.add(checksum); } - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdDML.cpp b/src/client/game/demonware/services/bdDML.cpp index d2a9da4c..71b206a8 100644 --- a/src/client/game/demonware/services/bdDML.cpp +++ b/src/client/game/demonware/services/bdDML.cpp @@ -15,12 +15,12 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdDML::getUserData(service_server* server, byte_buffer* /*buffer*/) const { - auto result = new bdDMLRawData; + auto result = std::make_unique(); result->country_code = "US"; result->country_code = "'Murica"; result->region = "New York"; @@ -32,21 +32,21 @@ namespace demonware result->timezone = "+01:00"; auto reply = server->create_reply(this->task_id()); - reply->add(result); - reply->send(); + reply.add(result); + reply.send(); } void bdDML::getUserHierarchicalData(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdDML::getUsersLastLogonData(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdEventLog.cpp b/src/client/game/demonware/services/bdEventLog.cpp index 8aa4127a..4db62fb7 100644 --- a/src/client/game/demonware/services/bdEventLog.cpp +++ b/src/client/game/demonware/services/bdEventLog.cpp @@ -16,34 +16,34 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdEventLog::recordEventBin(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdEventLog::recordEvents(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdEventLog::recordEventsBin(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdEventLog::initializeFiltering(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdFacebook.cpp b/src/client/game/demonware/services/bdFacebook.cpp index ff01d58e..5a3fe6e0 100644 --- a/src/client/game/demonware/services/bdFacebook.cpp +++ b/src/client/game/demonware/services/bdFacebook.cpp @@ -24,90 +24,90 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdFacebook::post(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdFacebook::unregisterAccount(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdFacebook::isRegistered(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdFacebook::getInfo(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdFacebook::getRegisteredAccounts(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdFacebook::getFriends(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdFacebook::getProfilePictures(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdFacebook::uploadPhoto(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdFacebook::registerToken(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdFacebook::uploadVideo(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdFacebook::getFriendsByID(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdFacebook::setLikeStatus(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdGroup.cpp b/src/client/game/demonware/services/bdGroup.cpp index 195d38f0..47702c94 100644 --- a/src/client/game/demonware/services/bdGroup.cpp +++ b/src/client/game/demonware/services/bdGroup.cpp @@ -15,27 +15,27 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdGroup::setGroupsForEntity(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdGroup::getEntityGroups(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdGroup::getGroupCounts(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdLeague.cpp b/src/client/game/demonware/services/bdLeague.cpp index add6d0d7..e7824491 100644 --- a/src/client/game/demonware/services/bdLeague.cpp +++ b/src/client/game/demonware/services/bdLeague.cpp @@ -22,76 +22,76 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdLeague::getTeamIDsForUser(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdLeague::getTeamSubdivisions(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdLeague::setTeamName(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdLeague::setTeamIcon(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdLeague::getTeamInfos(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdLeague::getTeamLeaguesAndSubdivisions(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdLeague::getTeamMemberInfos(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdLeague::incrementGamesPlayedCount(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdLeague::getSubdivisionInfos(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdLeague::getTeamSubdivisionHistory(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } \ No newline at end of file diff --git a/src/client/game/demonware/services/bdLeague2.cpp b/src/client/game/demonware/services/bdLeague2.cpp index edb6a36e..a91be22c 100644 --- a/src/client/game/demonware/services/bdLeague2.cpp +++ b/src/client/game/demonware/services/bdLeague2.cpp @@ -15,27 +15,27 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdLeague2::readStatsByTeamID(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdLeague2::readStatsByRank(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdLeague2::readStatsByPivot(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } \ No newline at end of file diff --git a/src/client/game/demonware/services/bdMarketingComms.cpp b/src/client/game/demonware/services/bdMarketingComms.cpp index 409b278a..89a79ece 100644 --- a/src/client/game/demonware/services/bdMarketingComms.cpp +++ b/src/client/game/demonware/services/bdMarketingComms.cpp @@ -13,13 +13,13 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdMarketingComms::reportFullMessagesViewed(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdMarketplace.cpp b/src/client/game/demonware/services/bdMarketplace.cpp index 3eb3f165..c6f51512 100644 --- a/src/client/game/demonware/services/bdMarketplace.cpp +++ b/src/client/game/demonware/services/bdMarketplace.cpp @@ -22,35 +22,35 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdMarketplace::purchaseOnSteamInitialize(service_server* server, byte_buffer* buffer) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdMarketplace::getExpiredInventoryItems(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdMarketplace::steamProcessDurable(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdMarketplace::purchaseSkus(service_server* server, byte_buffer* buffer) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdMarketplace::getBalance(service_server* server, byte_buffer* buffer) const @@ -58,27 +58,27 @@ namespace demonware // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdMarketplace::getInventoryPaginated(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdMarketplace::putPlayersInventoryItems(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdMarketplace::getEntitlements(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdMatchMaking.cpp b/src/client/game/demonware/services/bdMatchMaking.cpp index 20625fdb..91d0e57a 100644 --- a/src/client/game/demonware/services/bdMatchMaking.cpp +++ b/src/client/game/demonware/services/bdMatchMaking.cpp @@ -15,12 +15,12 @@ namespace demonware void bdMatchMaking::create_session(service_server* server, byte_buffer* /*buffer*/) const { - auto* id = new bdSessionID; + auto id = std::make_unique(); id->session_id = steam::SteamUser()->GetSteamID().bits; auto reply = server->create_reply(this->task_id()); - reply->add(id); - reply->send(); + reply.add(id); + reply.send(); } void bdMatchMaking::update_session(service_server* server, byte_buffer* buffer) const @@ -38,7 +38,7 @@ namespace demonware addr.deserialize(&addr_buf);*/ auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdMatchMaking::delete_session(service_server* server, byte_buffer* buffer) const @@ -50,18 +50,18 @@ namespace demonware id.serialize(&out_data); auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdMatchMaking::get_performance(service_server* server, byte_buffer* /*buffer*/) const { - auto* result = new bdPerformanceValue; + auto result = std::make_unique(); result->user_id = steam::SteamUser()->GetSteamID().bits; result->performance = 10; auto reply = server->create_reply(this->task_id()); - reply->add(result); - reply->send(); + reply.add(result); + reply.send(); } void bdMatchMaking::find_sessions(service_server* server, byte_buffer* /*buffer*/) const @@ -70,9 +70,9 @@ namespace demonware //for (auto& session : sessions) { - //reply->add(session.second); + //reply.add(session.second); } - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdPresence.cpp b/src/client/game/demonware/services/bdPresence.cpp index a043a169..f065c306 100644 --- a/src/client/game/demonware/services/bdPresence.cpp +++ b/src/client/game/demonware/services/bdPresence.cpp @@ -13,13 +13,13 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdPresence::unk3(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdProfiles.cpp b/src/client/game/demonware/services/bdProfiles.cpp index 147cb36c..e2f0e78c 100644 --- a/src/client/game/demonware/services/bdProfiles.cpp +++ b/src/client/game/demonware/services/bdProfiles.cpp @@ -35,15 +35,15 @@ namespace demonware for(auto& info : profile_infos) { - auto* result = new bdPublicProfileInfo; + auto result = std::make_unique(); result->m_entityID = info.first; result->m_VERSION = info.second.version; result->m_ddl = std::move(info.second.ddl); - reply->add(result); + reply.add(result); } - reply->send(); + reply.send(); } void bdProfiles::setPublicInfo(service_server* server, byte_buffer* buffer) const @@ -56,48 +56,48 @@ namespace demonware profile_infos::update_profile_info(info); auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdProfiles::getPrivateInfo(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdProfiles::setPrivateInfo(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdProfiles::deleteProfile(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdProfiles::setPrivateInfoByUserID(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdProfiles::getPrivateInfoByUserID(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdProfiles::setPublicInfoByUserID(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdPublisherVariables.cpp b/src/client/game/demonware/services/bdPublisherVariables.cpp index 73df8a26..c16b2d37 100644 --- a/src/client/game/demonware/services/bdPublisherVariables.cpp +++ b/src/client/game/demonware/services/bdPublisherVariables.cpp @@ -12,6 +12,6 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdReward.cpp b/src/client/game/demonware/services/bdReward.cpp index 86fe661b..9a49b820 100644 --- a/src/client/game/demonware/services/bdReward.cpp +++ b/src/client/game/demonware/services/bdReward.cpp @@ -15,27 +15,27 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdReward::claimRewardRoll(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdReward::claimClientAchievements(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdReward::reportRewardEvents(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdRichPresence.cpp b/src/client/game/demonware/services/bdRichPresence.cpp index adfb0fbb..6cfc52a6 100644 --- a/src/client/game/demonware/services/bdRichPresence.cpp +++ b/src/client/game/demonware/services/bdRichPresence.cpp @@ -13,13 +13,13 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdRichPresence::getInfo(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdStats.cpp b/src/client/game/demonware/services/bdStats.cpp index 607545f8..5ff85a40 100644 --- a/src/client/game/demonware/services/bdStats.cpp +++ b/src/client/game/demonware/services/bdStats.cpp @@ -24,90 +24,90 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats::deleteStats(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats::unk3(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats::readStatsByRank(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats::readStatsByPivot(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats::readStatsByRating(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats::readStatsByMultipleRanks(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats::readExternalTitleStats(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats::readExternalTitleNamedStats(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats::readStatsByLeaderboardIDsAndEntityIDs(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats::readStatsByMultipleRatings(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats::readStatsByEntityID(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats::writeServerValidatedStats(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdStats2.cpp b/src/client/game/demonware/services/bdStats2.cpp index ee1f7e77..6e19729b 100644 --- a/src/client/game/demonware/services/bdStats2.cpp +++ b/src/client/game/demonware/services/bdStats2.cpp @@ -13,13 +13,13 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats2::writeArbitratedStats(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } \ No newline at end of file diff --git a/src/client/game/demonware/services/bdStats3.cpp b/src/client/game/demonware/services/bdStats3.cpp index 0916d488..01254ffa 100644 --- a/src/client/game/demonware/services/bdStats3.cpp +++ b/src/client/game/demonware/services/bdStats3.cpp @@ -18,48 +18,48 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats3::readStatsByEntityID(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats3::readStatsByRank(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats3::readStatsByPivot(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats3::readStatsByRating(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats3::readStatsByMultipleRanks(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdStats3::readStatsByLeaderboardIDsAndEntityIDs(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } \ No newline at end of file diff --git a/src/client/game/demonware/services/bdStorage.cpp b/src/client/game/demonware/services/bdStorage.cpp index 0ec3ade7..417c7a25 100644 --- a/src/client/game/demonware/services/bdStorage.cpp +++ b/src/client/game/demonware/services/bdStorage.cpp @@ -96,7 +96,7 @@ namespace demonware if (this->load_publisher_resource(filename, data)) { - auto* info = new bdFileInfo; + auto info = std::make_unique(); info->file_id = *reinterpret_cast(utils::cryptography::sha1::compute(filename).data()); info->filename = filename; @@ -106,10 +106,10 @@ namespace demonware info->owner_id = 0; info->priv = false; - reply->add(info); + reply.add(info); } - reply->send(); + reply.send(); } void bdStorage::get_publisher_file(service_server* server, byte_buffer* buffer) @@ -131,12 +131,13 @@ namespace demonware #endif auto reply = server->create_reply(this->task_id()); - reply->add(new bdFileData(data)); - reply->send(); + auto result = std::make_unique(data); + reply.add(result); + reply.send(); } else { - server->create_reply(this->task_id(), game::BD_NO_FILE)->send(); + server->create_reply(this->task_id(), game::BD_NO_FILE).send(); } } @@ -155,7 +156,7 @@ namespace demonware const auto path = get_user_file_path(filename); utils::io::write_file(path, data); - auto* info = new bdFileInfo; + auto info = std::make_unique(); info->file_id = *reinterpret_cast(utils::cryptography::sha1::compute(filename).data()); info->filename = filename; @@ -166,8 +167,8 @@ namespace demonware info->priv = priv; auto reply = server->create_reply(this->task_id()); - reply->add(info); - reply->send(); + reply.add(info); + reply.send(); } std::string bdStorage::get_user_file_path(const std::string& name) @@ -202,7 +203,7 @@ namespace demonware const auto path = get_user_file_path(filename); utils::io::write_file(path, data); - auto* info = new bdFile2; + auto info = std::make_unique(); info->unk1 = 0; info->unk2 = 0; @@ -217,10 +218,10 @@ namespace demonware printf("[DW]: [bdStorage]: set user file: %s\n", filename.data()); #endif - reply->add(info); + reply.add(info); } - reply->send(); + reply.send(); } void bdStorage::upload_files_new(service_server* server, byte_buffer* buffer) const @@ -250,7 +251,7 @@ namespace demonware const auto path = get_user_file_path(filename); utils::io::write_file(path, data); - auto* info = new bdContextUserStorageFileInfo; + auto info = std::make_unique(); info->modifed_time = static_cast(time(nullptr)); info->create_time = info->modifed_time; @@ -263,10 +264,10 @@ namespace demonware printf("[DW]: [bdStorage]: set user file: %s\n", filename.data()); #endif - reply->add(info); + reply.add(info); } - reply->send(); + reply.send(); } void bdStorage::get_files(service_server* server, byte_buffer* buffer) const @@ -303,7 +304,7 @@ namespace demonware auto reply = server->create_reply(this->task_id()); for (size_t i = 0u; i < filenames.size(); i++) { - auto* entry = new bdFileQueryResult; + auto entry = std::make_unique(); entry->user_id = user_ctxs.at(i).first; entry->platform = user_ctxs.at(i).second; entry->filename = filenames.at(i); @@ -326,16 +327,16 @@ namespace demonware #endif } - reply->add(entry); + reply.add(entry); } - reply->send(); + reply.send(); } void bdStorage::unk12(service_server* server, byte_buffer* buffer) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdTeams.cpp b/src/client/game/demonware/services/bdTeams.cpp index 574cd013..686a87c6 100644 --- a/src/client/game/demonware/services/bdTeams.cpp +++ b/src/client/game/demonware/services/bdTeams.cpp @@ -61,349 +61,349 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::updateTeamName(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::promoteMember(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::kickMember(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::leaveTeam(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::proposeMembership(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::rejectMembership(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::acceptMembership(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getPublicProfiles(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getPrivateProfile(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getPublicMemberProfiles(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getPrivateMemberProfiles(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::setPublicProfile(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::setPrivateProfile(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::setPublicMemberProfile(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::setPrivateMemberProfile(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getMemberships(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getMembers(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getOutgoingProposals(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::withdrawProposal(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::demoteMember(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::promoteMemberToOwner(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getTeamInfo(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getIncomingProposals(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::sendInstantMessage(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getMembershipsUser(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::sendInstantMessageToTeam(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::searchPublicTeamProfiles(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::addApplication(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getApplicationsByTeam(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::acceptApplication(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::rejectApplication(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::autoJoinTeam(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::createTeamWithProfiles(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::banMember(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::unbanMember(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::blockApplication(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::unblockApplication(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::updateTeamType(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::setOnline(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getMembershipsWithCounts(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getMembershipsWithCountsUser(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::searchTeams(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::createTeamWithProfilesAndTeamType(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getMembershipsWithCountsAndTeamTypeUser(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getMembershipsWithCountsAndTeamType(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getTeamInfoWithTeamType(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::setTeamAutoJoin(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getTeamAutoJoin(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdTeams::getMembersAndPrivileges(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdTitleUtilities.cpp b/src/client/game/demonware/services/bdTitleUtilities.cpp index 8b1f90e9..79865da6 100644 --- a/src/client/game/demonware/services/bdTitleUtilities.cpp +++ b/src/client/game/demonware/services/bdTitleUtilities.cpp @@ -10,11 +10,11 @@ namespace demonware void bdTitleUtilities::get_server_time(service_server* server, byte_buffer* /*buffer*/) const { - auto* const time_result = new bdTimeStamp; + auto time_result = std::make_unique(); time_result->unix_time = uint32_t(time(nullptr)); auto reply = server->create_reply(this->task_id()); - reply->add(time_result); - reply->send(); + reply.add(time_result); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdUNK63.cpp b/src/client/game/demonware/services/bdUNK63.cpp index e6f4945a..8bf67c6f 100644 --- a/src/client/game/demonware/services/bdUNK63.cpp +++ b/src/client/game/demonware/services/bdUNK63.cpp @@ -12,6 +12,6 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } diff --git a/src/client/game/demonware/services/bdUserGroups.cpp b/src/client/game/demonware/services/bdUserGroups.cpp index 206bdcb7..11a1efc2 100644 --- a/src/client/game/demonware/services/bdUserGroups.cpp +++ b/src/client/game/demonware/services/bdUserGroups.cpp @@ -22,76 +22,76 @@ namespace demonware { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdUserGroups::deleteGroup(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdUserGroups::joinGroup(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdUserGroups::leaveGroup(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdUserGroups::getMembershipInfo(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdUserGroups::changeMemberType(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdUserGroups::getNumMembers(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdUserGroups::getMembers(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdUserGroups::getMemberships(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdUserGroups::readStatsByRank(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } void bdUserGroups::getGroupLists(service_server* server, byte_buffer* /*buffer*/) const { // TODO: auto reply = server->create_reply(this->task_id()); - reply->send(); + reply.send(); } } \ No newline at end of file