mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-20 20:14:06 +00:00
Code Issues Releases Wiki Activity

[Client] Update method names in ActorList

Browse source
This commit is contained in:
David Cernat 2017-04-15 11:45:20 +03:00
parent 5c1d7f614a
commit 56aeb85965
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ void ActorList::reset()
cell.blank(); cell.blank();
baseActors.clear(); baseActors.clear();
positionActors.clear(); positionActors.clear();
drawStateActors.clear(); animFlagsActors.clear();
guid = mwmp::Main::get().getNetworking()->getLocalPlayer()->guid; guid = mwmp::Main::get().getNetworking()->getLocalPlayer()->guid;
} }
@ -47,9 +47,9 @@ void ActorList::addPositionActor(LocalActor localActor)
positionActors.push_back(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() 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)->setActorList(this);
Main::get().getNetworking()->getActorPacket(ID_ACTOR_ANIM_FLAGS)->Send(); Main::get().getNetworking()->getActorPacket(ID_ACTOR_ANIM_FLAGS)->Send();
} }

6
apps/openmw/mwmp/ActorList.hpp
View file

@ -22,10 +22,10 @@ namespace mwmp
void addActor(LocalActor localActor); void addActor(LocalActor localActor);
void addPositionActor(LocalActor localActor); void addPositionActor(LocalActor localActor);
void addDrawStateActor(LocalActor localActor); void addAnimFlagsActor(LocalActor localActor);
void sendPositionActors(); void sendPositionActors();
void sendDrawStateActors(); void sendAnimFlagsActors();
void editActorsInCell(MWWorld::CellStore* cellStore); void editActorsInCell(MWWorld::CellStore* cellStore);
@ -35,7 +35,7 @@ namespace mwmp
Networking *getNetworking(); Networking *getNetworking();
std::vector<BaseActor> positionActors; std::vector<BaseActor> positionActors;
std::vector<BaseActor> drawStateActors; std::vector<BaseActor> animFlagsActors;
}; };
} }

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

@ -53,7 +53,7 @@ void Cell::updateLocal(bool forceUpdate)
} }
actorList->sendPositionActors(); actorList->sendPositionActors();
actorList->sendDrawStateActors(); actorList->sendAnimFlagsActors();
} }
void Cell::updateDedicated(float dt) void Cell::updateDedicated(float dt)

2
apps/openmw/mwmp/LocalActor.cpp
View file

@ -107,7 +107,7 @@ void LocalActor::updateAnimFlags(bool forceUpdate)
if (isJumping) if (isJumping)
updatePosition(true); // fix position after jump; updatePosition(true); // fix position after jump;
mwmp::Main::get().getNetworking()->getActorList()->addDrawStateActor(*this); mwmp::Main::get().getNetworking()->getActorList()->addAnimFlagsActor(*this);
} }
} }