krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Client] Correctly set mpNum for placed gold

Browse source
This commit is contained in:
David Cernat 2017-06-09 13:31:19 +03:00
parent 6ac7ee8fcd
commit 18bf79e08b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwmp/WorldEvent.cpp
View file

@ -176,10 +176,11 @@ void WorldEvent::placeObjects(MWWorld::CellStore* cellStore)
if (worldObject.count > 1) if (worldObject.count > 1)
newPtr.getRefData().setCount(worldObject.count); newPtr.getRefData().setCount(worldObject.count);
newPtr.getCellRef().setMpNum(worldObject.mpNum);
newPtr.getCellRef().setGoldValue(worldObject.goldValue); newPtr.getCellRef().setGoldValue(worldObject.goldValue);
newPtr = MWBase::Environment::get().getWorld()->placeObject(newPtr, cellStore, worldObject.position); newPtr = MWBase::Environment::get().getWorld()->placeObject(newPtr, cellStore, worldObject.position);
// Because gold automatically gets replaced with a new object, make sure we set the mpNum at the end
newPtr.getCellRef().setMpNum(worldObject.mpNum);
} }
else else
{ {
@ -790,8 +791,8 @@ void WorldEvent::sendObjectPlace()
{ {
mwmp::WorldObject worldObject = (*it); mwmp::WorldObject worldObject = (*it);
LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s-%i, count: %i", LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, count: %i",
worldObject.refId.c_str(), worldObject.refNumIndex, worldObject.count); worldObject.refId.c_str(), worldObject.count);
} }
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_PLACE)->setEvent(this); mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_PLACE)->setEvent(this);