mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-10-05 13:56:30 +00:00
Code Issues Releases Wiki Activity

[Client] Return early when processing actors that can't be initialized

Browse source
This commit is contained in:
David Cernat 2018-09-05 20:03:35 +03:00
parent 48f4792bc1
commit 113002ca19
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwmp/Cell.cpp
View file

@ -117,6 +117,8 @@ void Cell::readPositions(ActorList& actorList)
{ {
initializeDedicatedActors(actorList); initializeDedicatedActors(actorList);
if (dedicatedActors.empty()) return;
for (const auto &baseActor : actorList.baseActors) for (const auto &baseActor : actorList.baseActors)
{ {
std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor); std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor);
@ -180,6 +182,8 @@ void Cell::readStatsDynamic(ActorList& actorList)
{ {
initializeDedicatedActors(actorList); initializeDedicatedActors(actorList);
if (dedicatedActors.empty()) return;
for (const auto &baseActor : actorList.baseActors) for (const auto &baseActor : actorList.baseActors)
{ {
std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor); std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor);
@ -216,6 +220,8 @@ void Cell::readEquipment(ActorList& actorList)
{ {
initializeDedicatedActors(actorList); initializeDedicatedActors(actorList);
if (dedicatedActors.empty()) return;
for (const auto &baseActor : actorList.baseActors) for (const auto &baseActor : actorList.baseActors)
{ {
std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor); std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor);
@ -239,6 +245,8 @@ void Cell::readSpeech(ActorList& actorList)
{ {
initializeDedicatedActors(actorList); initializeDedicatedActors(actorList);
if (dedicatedActors.empty()) return;
for (const auto &baseActor : actorList.baseActors) for (const auto &baseActor : actorList.baseActors)
{ {
std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor); std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor);
@ -259,6 +267,8 @@ void Cell::readAi(ActorList& actorList)
{ {
initializeDedicatedActors(actorList); initializeDedicatedActors(actorList);
if (dedicatedActors.empty()) return;
for (const auto &baseActor : actorList.baseActors) for (const auto &baseActor : actorList.baseActors)
{ {
std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor); std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor);
@ -314,6 +324,8 @@ void Cell::readCellChange(ActorList& actorList)
{ {
initializeDedicatedActors(actorList); initializeDedicatedActors(actorList);
if (dedicatedActors.empty()) return;
CellController *cellController = Main::get().getCellController(); CellController *cellController = Main::get().getCellController();
for (const auto &baseActor : actorList.baseActors) for (const auto &baseActor : actorList.baseActors)