From 113002ca199327e74ca9db373bb835396730ba51 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 5 Sep 2018 20:03:35 +0300 Subject: [PATCH] [Client] Return early when processing actors that can't be initialized --- apps/openmw/mwmp/Cell.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/apps/openmw/mwmp/Cell.cpp b/apps/openmw/mwmp/Cell.cpp index fb5ac74f5..bebd43157 100644 --- a/apps/openmw/mwmp/Cell.cpp +++ b/apps/openmw/mwmp/Cell.cpp @@ -116,6 +116,8 @@ void Cell::updateDedicated(float dt) void Cell::readPositions(ActorList& actorList) { initializeDedicatedActors(actorList); + + if (dedicatedActors.empty()) return; for (const auto &baseActor : actorList.baseActors) { @@ -180,6 +182,8 @@ void Cell::readStatsDynamic(ActorList& actorList) { initializeDedicatedActors(actorList); + if (dedicatedActors.empty()) return; + for (const auto &baseActor : actorList.baseActors) { std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor); @@ -216,6 +220,8 @@ void Cell::readEquipment(ActorList& actorList) { initializeDedicatedActors(actorList); + if (dedicatedActors.empty()) return; + for (const auto &baseActor : actorList.baseActors) { std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor); @@ -239,6 +245,8 @@ void Cell::readSpeech(ActorList& actorList) { initializeDedicatedActors(actorList); + if (dedicatedActors.empty()) return; + for (const auto &baseActor : actorList.baseActors) { std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor); @@ -259,6 +267,8 @@ void Cell::readAi(ActorList& actorList) { initializeDedicatedActors(actorList); + if (dedicatedActors.empty()) return; + for (const auto &baseActor : actorList.baseActors) { std::string mapIndex = Main::get().getCellController()->generateMapIndex(baseActor); @@ -314,6 +324,8 @@ void Cell::readCellChange(ActorList& actorList) { initializeDedicatedActors(actorList); + if (dedicatedActors.empty()) return; + CellController *cellController = Main::get().getCellController(); for (const auto &baseActor : actorList.baseActors)