mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-02 00:36:42 +00:00
Code Issues Releases Wiki Activity

[Client] Ignore ObjectSpawn packets trying to spawn non-actors

Browse source
This commit is contained in:
David Cernat 2018-07-26 22:41:04 +03:00
parent d93b67ef21
commit c7bcf70c32
1 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
apps/openmw/mwmp/ObjectList.cpp
View file

@ -402,41 +402,45 @@ void ObjectList::spawnObjects(MWWorld::CellStore* cellStore)
MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), baseObject.refId, 1); MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), baseObject.refId, 1);
MWWorld::Ptr newPtr = ref.getPtr(); MWWorld::Ptr newPtr = ref.getPtr();
newPtr.getCellRef().setMpNum(baseObject.mpNum); if (newPtr.getClass().isActor())
newPtr = MWBase::Environment::get().getWorld()->placeObject(newPtr, cellStore, baseObject.position);
if (baseObject.isSummon)
{ {
MWWorld::Ptr masterPtr; newPtr = MWBase::Environment::get().getWorld()->placeObject(newPtr, cellStore, baseObject.position);
MWMechanics::CreatureStats& creatureStats = newPtr.getClass().getCreatureStats(newPtr);
if (baseObject.master.isPlayer) if (baseObject.isSummon)
masterPtr = MechanicsHelper::getPlayerPtr(baseObject.master);
else
masterPtr = cellStore->searchExact(baseObject.master.refNum, baseObject.master.mpNum);
if (masterPtr)
{ {
LOG_APPEND(Log::LOG_VERBOSE, "-- Actor has master: %s", masterPtr.getCellRef().getRefId().c_str()); MWWorld::Ptr masterPtr;
MWMechanics::AiFollow package(masterPtr); if (baseObject.master.isPlayer)
newPtr.getClass().getCreatureStats(newPtr).getAiSequence().stack(package, newPtr); masterPtr = MechanicsHelper::getPlayerPtr(baseObject.master);
else
masterPtr = cellStore->searchExact(baseObject.master.refNum, baseObject.master.mpNum);
MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(newPtr); if (masterPtr)
if (anim)
{ {
const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>() LOG_APPEND(Log::LOG_VERBOSE, "-- Actor has master: %s", masterPtr.getCellRef().getRefId().c_str());
.search("VFX_Summon_Start");
if (fx) MWMechanics::AiFollow package(masterPtr);
anim->addEffect("meshes\\" + fx->mModel, -1, false); creatureStats.getAiSequence().stack(package, newPtr);
MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(newPtr);
if (anim)
{
const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
.search("VFX_Summon_Start");
if (fx)
anim->addEffect("meshes\\" + fx->mModel, -1, false);
}
int creatureActorId = newPtr.getClass().getCreatureStats(newPtr).getActorId();
MWMechanics::CreatureStats& masterCreatureStats = masterPtr.getClass().getCreatureStats(masterPtr);
masterCreatureStats.setSummonedCreatureActorId(baseObject.refId, creatureActorId);
} }
int creatureActorId = newPtr.getClass().getCreatureStats(newPtr).getActorId();
MWMechanics::CreatureStats& masterCreatureStats = masterPtr.getClass().getCreatureStats(masterPtr);
masterCreatureStats.setSummonedCreatureActorId(baseObject.refId, creatureActorId);
} }
} }
else
LOG_APPEND(Log::LOG_VERBOSE, "-- Cannot spawn non-actor object!");
} }
else else
LOG_APPEND(Log::LOG_VERBOSE, "-- Actor already existed!"); LOG_APPEND(Log::LOG_VERBOSE, "-- Actor already existed!");