Erase multiple objects from net list now works from client to server
This commit is contained in:
parent
266d0b9127
commit
94758aaee4
2 changed files with 5 additions and 1 deletions
|
|
@ -76,6 +76,7 @@ namespace NetworkingObjects {
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T> static void send_client_update(const NetObjTemporaryPtr<T>& ptr, const std::string& channel, std::function<void(const NetObjTemporaryPtr<T>&, cereal::PortableBinaryOutputArchive&)> sendUpdateFunc) {
|
template <typename T> static void send_client_update(const NetObjTemporaryPtr<T>& ptr, const std::string& channel, std::function<void(const NetObjTemporaryPtr<T>&, cereal::PortableBinaryOutputArchive&)> sendUpdateFunc) {
|
||||||
|
assert(!isServer);
|
||||||
if(ptr.get_obj_man()->client && !ptr.get_obj_man()->client->is_disconnected()) {
|
if(ptr.get_obj_man()->client && !ptr.get_obj_man()->client->is_disconnected()) {
|
||||||
auto ss(std::make_shared<std::stringstream>());
|
auto ss(std::make_shared<std::stringstream>());
|
||||||
{
|
{
|
||||||
|
|
@ -88,6 +89,7 @@ namespace NetworkingObjects {
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T> static void send_server_update_to_client(const NetObjTemporaryPtr<T>& ptr, const std::shared_ptr<NetServer::ClientData>& clientToSendTo, const std::string& channel, std::function<void(const NetObjTemporaryPtr<T>&, cereal::PortableBinaryOutputArchive&)> sendUpdateFunc) {
|
template <typename T> static void send_server_update_to_client(const NetObjTemporaryPtr<T>& ptr, const std::shared_ptr<NetServer::ClientData>& clientToSendTo, const std::string& channel, std::function<void(const NetObjTemporaryPtr<T>&, cereal::PortableBinaryOutputArchive&)> sendUpdateFunc) {
|
||||||
|
assert(isServer);
|
||||||
if(ptr.get_obj_man()->server && !ptr.get_obj_man()->server->is_disconnected()) {
|
if(ptr.get_obj_man()->server && !ptr.get_obj_man()->server->is_disconnected()) {
|
||||||
auto ss(std::make_shared<std::stringstream>());
|
auto ss(std::make_shared<std::stringstream>());
|
||||||
{
|
{
|
||||||
|
|
@ -100,6 +102,7 @@ namespace NetworkingObjects {
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T> static void send_server_update_to_all_clients_except(const NetObjTemporaryPtr<T>& ptr, const std::shared_ptr<NetServer::ClientData>& clientToNotSendTo, const std::string& channel, std::function<void(const NetObjTemporaryPtr<T>&, cereal::PortableBinaryOutputArchive&)> sendUpdateFunc) {
|
template <typename T> static void send_server_update_to_all_clients_except(const NetObjTemporaryPtr<T>& ptr, const std::shared_ptr<NetServer::ClientData>& clientToNotSendTo, const std::string& channel, std::function<void(const NetObjTemporaryPtr<T>&, cereal::PortableBinaryOutputArchive&)> sendUpdateFunc) {
|
||||||
|
assert(isServer);
|
||||||
if(ptr.get_obj_man()->server && !ptr.get_obj_man()->server->is_disconnected()) {
|
if(ptr.get_obj_man()->server && !ptr.get_obj_man()->server->is_disconnected()) {
|
||||||
auto ss(std::make_shared<std::stringstream>());
|
auto ss(std::make_shared<std::stringstream>());
|
||||||
{
|
{
|
||||||
|
|
@ -112,6 +115,7 @@ namespace NetworkingObjects {
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T> static void send_server_update_to_all_clients(const NetObjTemporaryPtr<T>& ptr, const std::string& channel, std::function<void(const NetObjTemporaryPtr<T>&, cereal::PortableBinaryOutputArchive&)> sendUpdateFunc) {
|
template <typename T> static void send_server_update_to_all_clients(const NetObjTemporaryPtr<T>& ptr, const std::string& channel, std::function<void(const NetObjTemporaryPtr<T>&, cereal::PortableBinaryOutputArchive&)> sendUpdateFunc) {
|
||||||
|
assert(isServer);
|
||||||
if(ptr.get_obj_man()->server && !ptr.get_obj_man()->server->is_disconnected()) {
|
if(ptr.get_obj_man()->server && !ptr.get_obj_man()->server->is_disconnected()) {
|
||||||
auto ss(std::make_shared<std::stringstream>());
|
auto ss(std::make_shared<std::stringstream>());
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -433,7 +433,7 @@ namespace NetworkingObjects {
|
||||||
this->call_erase_callback(clientData[indexToErase]);
|
this->call_erase_callback(clientData[indexToErase]);
|
||||||
clientData.erase(clientData.begin() + indexToErase);
|
clientData.erase(clientData.begin() + indexToErase);
|
||||||
}
|
}
|
||||||
l.send_server_update_to_all_clients(RELIABLE_COMMAND_CHANNEL, [&ids](const NetObjTemporaryPtr<NetObjOrderedList<T>>&, cereal::PortableBinaryOutputArchive& a) {
|
l.send_client_update(RELIABLE_COMMAND_CHANNEL, [&ids](const NetObjTemporaryPtr<NetObjOrderedList<T>>&, cereal::PortableBinaryOutputArchive& a) {
|
||||||
a(ObjPtrOrderedListCommand_CtoS::ERASE_MANY, ids);
|
a(ObjPtrOrderedListCommand_CtoS::ERASE_MANY, ids);
|
||||||
});
|
});
|
||||||
set_positions_for_object_info_vector<T>(clientData, indicesToErase.front());
|
set_positions_for_object_info_vector<T>(clientData, indicesToErase.front());
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue