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

pull/471/head
David Cernat 6 years ago
parent 48f4792bc1
commit 113002ca19

@ -116,6 +116,8 @@ void Cell::updateDedicated(float dt)
void Cell::readPositions(ActorList& actorList) 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)
{ {
@ -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)

Loading…
Cancel
Save