mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-21 03:44:05 +00:00
Code Issues Releases Wiki Activity

[Client] Sync actor movements from interiors to exteriors & vice versa

Browse source
This commit is contained in:
David Cernat 2017-05-28 01:11:32 +03:00
parent 7f6c5e2f48
commit ea2a060c67
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,7 @@ void LocalActor::updateCell()
LOG_APPEND(Log::LOG_INFO, "- Moved from %s to %s", cell.getDescription().c_str(), ptr.getCell()->getCell()->getDescription().c_str()); LOG_APPEND(Log::LOG_INFO, "- Moved from %s to %s", cell.getDescription().c_str(), ptr.getCell()->getCell()->getDescription().c_str());
cell = *ptr.getCell()->getCell(); cell = *ptr.getCell()->getCell();
position = ptr.getRefData().getPosition();
mwmp::Main::get().getNetworking()->getActorList()->addCellChangeActor(*this); mwmp::Main::get().getNetworking()->getActorList()->addCellChangeActor(*this);
} }

22
apps/openmw/mwworld/actionteleport.cpp
View file

@ -1,5 +1,16 @@
#include "actionteleport.hpp" #include "actionteleport.hpp"
/*
Start of tes3mp addition
Include additional headers for multiplayer purposes
*/
#include "../mwmp/Main.hpp"
#include "../mwmp/CellController.hpp"
/*
End of tes3mp addition
*/
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"
#include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/mechanicsmanager.hpp"
@ -28,6 +39,17 @@ namespace MWWorld
for (std::set<MWWorld::Ptr>::iterator it = followers.begin(); it != followers.end(); ++it) for (std::set<MWWorld::Ptr>::iterator it = followers.begin(); it != followers.end(); ++it)
teleport(*it); teleport(*it);
/*
Start of tes3mp addition
Update LocalActors before we unload their cells, so packets with their cell changes
can be sent
*/
mwmp::Main::get().getCellController()->updateLocal(false);
/*
End of tes3mp addition
*/
} }
teleport(actor); teleport(actor);