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

[Client] Assign summoned creatures' actorId correctly, skipping those already assigned

Browse source
This commit is contained in:
uramer 2020-03-18 22:28:00 +01:00
parent dae76b91ee
commit 3e7230e89d
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmechanics/creaturestats.cpp
View file

@ -751,7 +751,7 @@ namespace MWMechanics
{ {
for (std::map<CreatureStats::SummonKey, int>::iterator it = mSummonedCreatures.begin(); it != mSummonedCreatures.end(); ) for (std::map<CreatureStats::SummonKey, int>::iterator it = mSummonedCreatures.begin(); it != mSummonedCreatures.end(); )
{ {
if (Misc::StringUtils::ciEqual(getSummonedCreature(it->first.first), refId)) if (Misc::StringUtils::ciEqual(getSummonedCreature(it->first.first), refId) && it->second == -1)
{ {
it->second = actorId; it->second = actorId;
break; break;

1
components/openmw-mp/Base/BasePacketProcessor.hpp
View file

@ -4,6 +4,7 @@
#include <string> #include <string>
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include <stdexcept>
#define BPP_INIT(packet_id) packetID = packet_id; strPacketID = #packet_id; className = typeid(this).name(); avoidReading = false; #define BPP_INIT(packet_id) packetID = packet_id; strPacketID = #packet_id; className = typeid(this).name(); avoidReading = false;