AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-29 08:00:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Client] Use check with clearer logic in ObjectList::editContainers()

Browse Source
This commit is contained in:
David Cernat 2020-01-16 14:02:27 +02:00
parent d2ba4a12d9
commit 32b5529e18
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/openmw/mwmp/ObjectList.cpp
View File

@ -139,7 +139,7 @@ void ObjectList::editContainers(MWWorld::CellStore* cellStore)
{ {
baseObject = baseObjects.at(i); baseObject = baseObjects.at(i);
LOG_APPEND(TimedLog::LOG_VERBOSE, "- container cellRef: %s %i-%i", baseObject.refId.c_str(), baseObject.refNum, baseObject.mpNum); LOG_APPEND(TimedLog::LOG_VERBOSE, "- container %s %i-%i", baseObject.refId.c_str(), baseObject.refNum, baseObject.mpNum);
MWWorld::Ptr ptrFound = cellStore->searchExact(baseObject.refNum, baseObject.mpNum); MWWorld::Ptr ptrFound = cellStore->searchExact(baseObject.refNum, baseObject.mpNum);
@ -169,7 +169,6 @@ void ObjectList::editContainers(MWWorld::CellStore* cellStore)
if (action == BaseObjectList::SET) if (action == BaseObjectList::SET)
containerStore.clear(); containerStore.clear();
// bool isLocalDrop = isLocalEvent && containerSubAction == BaseObjectList::DROP;
bool isLocalDrag = isLocalEvent && containerSubAction == BaseObjectList::DRAG; bool isLocalDrag = isLocalEvent && containerSubAction == BaseObjectList::DRAG;
bool isLocalTakeAll = isLocalEvent && containerSubAction == BaseObjectList::TAKE_ALL; bool isLocalTakeAll = isLocalEvent && containerSubAction == BaseObjectList::TAKE_ALL;
std::string takeAllSound = ""; std::string takeAllSound = "";
@ -178,7 +177,7 @@ void ObjectList::editContainers(MWWorld::CellStore* cellStore)
for (const auto &containerItem : baseObject.containerItems) for (const auto &containerItem : baseObject.containerItems)
{ {
//LOG_APPEND(TimedLog::LOG_VERBOSE, "-- containerItem cellRef: %s, count: %i, actionCount: %i", //LOG_APPEND(TimedLog::LOG_VERBOSE, "-- containerItem %s, count: %i, actionCount: %i",
// containerItem.refId.c_str(), containerItem.count, containerItem.actionCount); // containerItem.refId.c_str(), containerItem.count, containerItem.actionCount);
if (containerItem.refId.find("$dynamic") != string::npos) if (containerItem.refId.find("$dynamic") != string::npos)
@ -230,7 +229,7 @@ void ObjectList::editContainers(MWWorld::CellStore* cellStore)
invStore.unequipItemQuantity(itemPtr, ptrFound, containerItem.count); invStore.unequipItemQuantity(itemPtr, ptrFound, containerItem.count);
} }
bool isResolved = false; bool isDragResolved = false;
if (isLocalDrag && isCurrentContainer) if (isLocalDrag && isCurrentContainer)
{ {
@ -238,11 +237,11 @@ void ObjectList::editContainers(MWWorld::CellStore* cellStore)
if (!containerWindow->isOnDragAndDrop()) if (!containerWindow->isOnDragAndDrop())
{ {
isResolved = containerWindow->dragItemByPtr(itemPtr, containerItem.actionCount); isDragResolved = containerWindow->dragItemByPtr(itemPtr, containerItem.actionCount);
} }
} }
if (!isResolved) if (!isLocalDrag || !isDragResolved)
{ {
containerStore.remove(itemPtr, containerItem.actionCount, ownerPtr); containerStore.remove(itemPtr, containerItem.actionCount, ownerPtr);