mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-11-03 23:56:47 +00:00
Code Issues Releases Wiki Activity

[Client] See when other players use the Take All button with a container

Browse source
This commit is contained in:
David Cernat 2017-02-05 20:04:50 +02:00
parent d2c5a3387a
commit 1f03c12d96
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/openmw/mwgui/container.cpp
View file

@ -299,6 +299,26 @@ namespace MWGui
} }
MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Container); MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Container);
// Added by tes3mp
mwmp::LocalEvent *event = mwmp::Main::get().getNetworking()->createLocalEvent();
event->cell = *mPtr.getCell()->getCell();
mwmp::WorldObject worldObject;
worldObject.refId = mPtr.getCellRef().getRefId();
worldObject.refNumIndex = mPtr.getCellRef().getRefNum().mIndex;
event->addObject(worldObject);
event->containerChanges.action = mwmp::ContainerChanges::SET;
mwmp::Main::get().getNetworking()->getWorldPacket(ID_CONTAINER)->Send(event);
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_CONTAINER about\n- Ptr cellRef: %s, %i\n- cell: %s\n- item: %s, %i",
worldObject.refId.c_str(),
worldObject.refNumIndex,
event->cell.getDescription().c_str());
delete event;
event = NULL;
} }
} }

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

@ -67,16 +67,21 @@ void LocalEvent::editContainer(MWWorld::CellStore* cellStore)
ptrFound.getCellRef().getRefNum()); ptrFound.getCellRef().getRefNum());
MWWorld::ContainerStore& containerStore = ptrFound.getClass().getContainerStore(ptrFound); MWWorld::ContainerStore& containerStore = ptrFound.getClass().getContainerStore(ptrFound);
int action = containerChanges.action;
// If we are setting the entire contents, clear the current ones
if (action == ContainerChanges::SET)
containerStore.clear();
for (unsigned int i = 0; i < containerChanges.count; i++) for (unsigned int i = 0; i < containerChanges.count; i++)
{ {
ContainerItem item = containerChanges.items.at(i); ContainerItem item = containerChanges.items.at(i);
if (containerChanges.action == ContainerChanges::ADD) if (action == ContainerChanges::ADD || action == ContainerChanges::SET)
{ {
containerStore.add(item.refId, item.count, mwmp::Players::getPlayer(guid)->getPtr()); containerStore.add(item.refId, item.count, mwmp::Players::getPlayer(guid)->getPtr());
} }
else if (containerChanges.action == ContainerChanges::REMOVE) else if (action == ContainerChanges::REMOVE)
{ {
containerStore.remove(item.refId, item.count, mwmp::Players::getPlayer(guid)->getPtr()); containerStore.remove(item.refId, item.count, mwmp::Players::getPlayer(guid)->getPtr());
} }