krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Server] Improve Player::sendToLoaded()

Browse source
This commit is contained in:
Koncord 2017-12-09 15:03:06 +08:00
parent f35d35741e
commit dd352f0a91
11 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/openmw-mp/Player.cpp
View file

@ -295,22 +295,25 @@ void Player::forEachLoaded(std::function<void(Player *pl, Player *other)> func)
}
}
void Player::sendToLoaded(mwmp::PlayerPacket *myPacket)
void Player::sendToLoaded(mwmp::PlayerPacket &myPacket)
{
std::list <Player*> plList;
static std::set<Player*> plList;
static CellController::TContainer *addrCells = nullptr;
for (auto &cell : cells)
for (auto &pl : *cell)
plList.push_back(pl);
if (addrCells != &cells)
{
addrCells = &cells;
plList.clear();
for (auto &cell : cells)
for (auto &pl : *cell)
plList.insert(pl);
}
plList.sort();
plList.unique();
for (auto pl : plList)
for (auto &pl : plList)
{
if (pl == this) continue;
myPacket->setPlayer(this);
myPacket->Send(pl->guid);
myPacket.setPlayer(this);
myPacket.Send(pl->guid);
}
}

2
apps/openmw-mp/Player.hpp
View file

@ -66,7 +66,7 @@ public:
virtual ~Player();
CellController::TContainer *getCells();
void sendToLoaded(mwmp::PlayerPacket *myPacket);
void sendToLoaded(mwmp::PlayerPacket &myPacket);
void forEachLoaded(std::function<void(Player *pl, Player *other)> func);

2
apps/openmw-mp/processors/player/ProcessorPlayerAnimFlags.hpp
View file

@ -21,7 +21,7 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
player->sendToLoaded(&packet);
player->sendToLoaded(packet);
}
};
}

2
apps/openmw-mp/processors/player/ProcessorPlayerAnimPlay.hpp
View file

@ -17,7 +17,7 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
player->sendToLoaded(&packet);
player->sendToLoaded(packet);
}
};
}

2
apps/openmw-mp/processors/player/ProcessorPlayerAttack.hpp
View file

@ -25,7 +25,7 @@ namespace mwmp
if (!player->creatureStats.mDead)
{
player->sendToLoaded(&packet);
player->sendToLoaded(packet);
}
}
};

2
apps/openmw-mp/processors/player/ProcessorPlayerAttribute.hpp
View file

@ -23,7 +23,7 @@ namespace mwmp
{
//myPacket->Send(player, true);
player->sendToLoaded(&packet);
player->sendToLoaded(packet);
Networking::get().getState().getEventCtrl().Call<CoreEvent::ON_PLAYER_ATTRIBUTE>(player);
}

2
apps/openmw-mp/processors/player/ProcessorPlayerEquipment.hpp
View file

@ -21,7 +21,7 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
player->sendToLoaded(&packet);
player->sendToLoaded(packet);
Networking::get().getState().getEventCtrl().Call<CoreEvent::ON_PLAYER_EQUIPMENT>(player);
}

2
apps/openmw-mp/processors/player/ProcessorPlayerPosition.hpp
View file

@ -22,7 +22,7 @@ namespace mwmp
//DEBUG_PRINTF(strPacketID);
if (!player->creatureStats.mDead)
{
player->sendToLoaded(&packet);
player->sendToLoaded(packet);
}
}
};

2
apps/openmw-mp/processors/player/ProcessorPlayerSkill.hpp
View file

@ -22,7 +22,7 @@ namespace mwmp
if (!player->creatureStats.mDead)
{
//myPacket->Send(player, true);
player->sendToLoaded(&packet);
player->sendToLoaded(packet);
Networking::get().getState().getEventCtrl().Call<CoreEvent::ON_PLAYER_SKILL>(player);
}

2
apps/openmw-mp/processors/player/ProcessorPlayerSpeech.hpp
View file

@ -17,7 +17,7 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
player->sendToLoaded(&packet);
player->sendToLoaded(packet);
}
};
}

2
apps/openmw-mp/processors/player/ProcessorPlayerStatsDynamic.hpp
View file

@ -21,7 +21,7 @@ namespace mwmp
{
DEBUG_PRINTF(strPacketID.c_str());
player->sendToLoaded(&packet);
player->sendToLoaded(packet);
}
};
}