mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 11:09:41 +00:00
Code Issues Releases Wiki Activity

[Client] Disable leveled creatures from their class instead of scene.cpp

Browse source
This commit is contained in:
David Cernat 2017-05-07 03:18:15 +03:00
parent aaaed8ab8b
commit 34f0a5e076
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwclass/creaturelevlist.cpp
View file

@ -120,8 +120,17 @@ namespace MWClass
const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore(); const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
MWWorld::ManualRef manualRef(store, id); MWWorld::ManualRef manualRef(store, id);
manualRef.getPtr().getCellRef().setPosition(ptr.getCellRef().getPosition()); manualRef.getPtr().getCellRef().setPosition(ptr.getCellRef().getPosition());
MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(manualRef.getPtr(), ptr.getCell() , ptr.getCellRef().getPosition());
customData.mSpawnActorId = placed.getClass().getCreatureStats(placed).getActorId(); /*
Start of tes3mp change (major)
Don't spawn leveled creatures in multiplayer; they'll be spawned when the server requests them
*/
//MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(manualRef.getPtr(), ptr.getCell() , ptr.getCellRef().getPosition());
//customData.mSpawnActorId = placed.getClass().getCreatureStats(placed).getActorId();
/*
End of tes3mp change (major)
*/
customData.mSpawn = false; customData.mSpawn = false;
} }
else else

12
apps/openmw/mwworld/scene.cpp
View file

@ -8,7 +8,6 @@
Include additional headers for multiplayer purposes Include additional headers for multiplayer purposes
*/ */
#include <components/openmw-mp/Log.hpp>
#include "../mwmp/Main.hpp" #include "../mwmp/Main.hpp"
#include "../mwmp/LocalPlayer.hpp" #include "../mwmp/LocalPlayer.hpp"
/* /*
@ -154,17 +153,6 @@ namespace
ptr.getCellRef().setScale(2); ptr.getCellRef().setScale(2);
} }
/*
Start of tes3mp change (major)
Don't insert leveled creatures; they'll be inserted later on when the server needs them
*/
if (ptr.getTypeName() == typeid(ESM::CreatureLevList).name())
continue;
/*
End of tes3mp change (major)
*/
if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled()) if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled())
{ {
try try