diff --git a/apps/openmw/mwmp/ActorList.cpp b/apps/openmw/mwmp/ActorList.cpp index f97685c53..2e716700c 100644 --- a/apps/openmw/mwmp/ActorList.cpp +++ b/apps/openmw/mwmp/ActorList.cpp @@ -28,7 +28,7 @@ void ActorList::reset() cell.blank(); baseActors.clear(); positionActors.clear(); - drawStateActors.clear(); + animFlagsActors.clear(); guid = mwmp::Main::get().getNetworking()->getLocalPlayer()->guid; } @@ -47,9 +47,9 @@ void ActorList::addPositionActor(LocalActor localActor) positionActors.push_back(localActor); } -void ActorList::addDrawStateActor(LocalActor localActor) +void ActorList::addAnimFlagsActor(LocalActor localActor) { - drawStateActors.push_back(localActor); + animFlagsActors.push_back(localActor); } void ActorList::sendPositionActors() @@ -62,11 +62,11 @@ void ActorList::sendPositionActors() } } -void ActorList::sendDrawStateActors() +void ActorList::sendAnimFlagsActors() { - if (drawStateActors.size() > 0) + if (animFlagsActors.size() > 0) { - baseActors = drawStateActors; + baseActors = animFlagsActors; Main::get().getNetworking()->getActorPacket(ID_ACTOR_ANIM_FLAGS)->setActorList(this); Main::get().getNetworking()->getActorPacket(ID_ACTOR_ANIM_FLAGS)->Send(); } diff --git a/apps/openmw/mwmp/ActorList.hpp b/apps/openmw/mwmp/ActorList.hpp index 74d271f84..0eeafb6a1 100644 --- a/apps/openmw/mwmp/ActorList.hpp +++ b/apps/openmw/mwmp/ActorList.hpp @@ -22,10 +22,10 @@ namespace mwmp void addActor(LocalActor localActor); void addPositionActor(LocalActor localActor); - void addDrawStateActor(LocalActor localActor); + void addAnimFlagsActor(LocalActor localActor); void sendPositionActors(); - void sendDrawStateActors(); + void sendAnimFlagsActors(); void editActorsInCell(MWWorld::CellStore* cellStore); @@ -35,7 +35,7 @@ namespace mwmp Networking *getNetworking(); std::vector positionActors; - std::vector drawStateActors; + std::vector animFlagsActors; }; } diff --git a/apps/openmw/mwmp/Cell.cpp b/apps/openmw/mwmp/Cell.cpp index a807fef5e..69ae59d3d 100644 --- a/apps/openmw/mwmp/Cell.cpp +++ b/apps/openmw/mwmp/Cell.cpp @@ -53,7 +53,7 @@ void Cell::updateLocal(bool forceUpdate) } actorList->sendPositionActors(); - actorList->sendDrawStateActors(); + actorList->sendAnimFlagsActors(); } void Cell::updateDedicated(float dt) diff --git a/apps/openmw/mwmp/LocalActor.cpp b/apps/openmw/mwmp/LocalActor.cpp index 2d2b98092..507c8f845 100644 --- a/apps/openmw/mwmp/LocalActor.cpp +++ b/apps/openmw/mwmp/LocalActor.cpp @@ -107,7 +107,7 @@ void LocalActor::updateAnimFlags(bool forceUpdate) if (isJumping) updatePosition(true); // fix position after jump; - mwmp::Main::get().getNetworking()->getActorList()->addDrawStateActor(*this); + mwmp::Main::get().getNetworking()->getActorList()->addAnimFlagsActor(*this); } }