mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-07-01 22:51:34 +00:00
[General] Remove goldValue from ContainerItem because it is never useful
This commit is contained in:
parent
7321774ae2
commit
a4526605a6
6 changed files with 2 additions and 18 deletions
|
@ -132,12 +132,6 @@ int WorldFunctions::GetContainerItemCharge(unsigned int objectIndex, unsigned in
|
||||||
.containerChanges.items.at(itemIndex).charge;
|
.containerChanges.items.at(itemIndex).charge;
|
||||||
}
|
}
|
||||||
|
|
||||||
int WorldFunctions::GetContainerItemGoldValue(unsigned int objectIndex, unsigned int itemIndex) noexcept
|
|
||||||
{
|
|
||||||
return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(objectIndex)
|
|
||||||
.containerChanges.items.at(itemIndex).goldValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
int WorldFunctions::GetContainerItemActionCount(unsigned int objectIndex, unsigned int itemIndex) noexcept
|
int WorldFunctions::GetContainerItemActionCount(unsigned int objectIndex, unsigned int itemIndex) noexcept
|
||||||
{
|
{
|
||||||
return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(objectIndex)
|
return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects.at(objectIndex)
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
{"GetContainerItemRefId", WorldFunctions::GetContainerItemRefId},\
|
{"GetContainerItemRefId", WorldFunctions::GetContainerItemRefId},\
|
||||||
{"GetContainerItemCount", WorldFunctions::GetContainerItemCount},\
|
{"GetContainerItemCount", WorldFunctions::GetContainerItemCount},\
|
||||||
{"GetContainerItemCharge", WorldFunctions::GetContainerItemCharge},\
|
{"GetContainerItemCharge", WorldFunctions::GetContainerItemCharge},\
|
||||||
{"GetContainerItemGoldValue", WorldFunctions::GetContainerItemGoldValue},\
|
|
||||||
{"GetContainerItemActionCount", WorldFunctions::GetContainerItemActionCount},\
|
{"GetContainerItemActionCount", WorldFunctions::GetContainerItemActionCount},\
|
||||||
\
|
\
|
||||||
{"SetBaseEventCell", WorldFunctions::SetBaseEventCell},\
|
{"SetBaseEventCell", WorldFunctions::SetBaseEventCell},\
|
||||||
|
@ -90,7 +89,6 @@ public:
|
||||||
static const char *GetContainerItemRefId(unsigned int objectIndex, unsigned int itemIndex) noexcept;
|
static const char *GetContainerItemRefId(unsigned int objectIndex, unsigned int itemIndex) noexcept;
|
||||||
static int GetContainerItemCount(unsigned int objectIndex, unsigned int itemIndex) noexcept;
|
static int GetContainerItemCount(unsigned int objectIndex, unsigned int itemIndex) noexcept;
|
||||||
static int GetContainerItemCharge(unsigned int objectIndex, unsigned int itemIndex) noexcept;
|
static int GetContainerItemCharge(unsigned int objectIndex, unsigned int itemIndex) noexcept;
|
||||||
static int GetContainerItemGoldValue(unsigned int objectIndex, unsigned int itemIndex) noexcept;
|
|
||||||
static int GetContainerItemActionCount(unsigned int objectIndex, unsigned int itemIndex) noexcept;
|
static int GetContainerItemActionCount(unsigned int objectIndex, unsigned int itemIndex) noexcept;
|
||||||
|
|
||||||
static void SetBaseEventCell(const char* cellDescription) noexcept;
|
static void SetBaseEventCell(const char* cellDescription) noexcept;
|
||||||
|
|
|
@ -116,7 +116,6 @@ namespace MWGui
|
||||||
containerItem.refId =itemPtr.getCellRef().getRefId();
|
containerItem.refId =itemPtr.getCellRef().getRefId();
|
||||||
containerItem.count = itemPtr.getRefData().getCount();
|
containerItem.count = itemPtr.getRefData().getCount();
|
||||||
containerItem.charge = itemPtr.getCellRef().getCharge();
|
containerItem.charge = itemPtr.getCellRef().getCharge();
|
||||||
containerItem.goldValue = itemPtr.getCellRef().getGoldValue();
|
|
||||||
containerItem.actionCount = count;
|
containerItem.actionCount = count;
|
||||||
|
|
||||||
worldObject.containerChanges.items.push_back(containerItem);
|
worldObject.containerChanges.items.push_back(containerItem);
|
||||||
|
@ -176,9 +175,8 @@ namespace MWGui
|
||||||
|
|
||||||
// Make sure we get the drag and drop count, not the count of the original item
|
// Make sure we get the drag and drop count, not the count of the original item
|
||||||
containerItem.count = mDragAndDrop->mDraggedCount;
|
containerItem.count = mDragAndDrop->mDraggedCount;
|
||||||
|
|
||||||
containerItem.charge = itemPtr.getCellRef().getCharge();
|
containerItem.charge = itemPtr.getCellRef().getCharge();
|
||||||
containerItem.goldValue = itemPtr.getCellRef().getGoldValue();
|
|
||||||
|
|
||||||
worldObject.containerChanges.items.push_back(containerItem);
|
worldObject.containerChanges.items.push_back(containerItem);
|
||||||
event->addObject(worldObject);
|
event->addObject(worldObject);
|
||||||
|
|
|
@ -67,7 +67,6 @@ void WorldEvent::sendContainers(MWWorld::CellStore* cellStore)
|
||||||
containerItem.refId = itemPtr.getCellRef().getRefId();
|
containerItem.refId = itemPtr.getCellRef().getRefId();
|
||||||
containerItem.count = itemPtr.getRefData().getCount();
|
containerItem.count = itemPtr.getRefData().getCount();
|
||||||
containerItem.charge = itemPtr.getCellRef().getCharge();
|
containerItem.charge = itemPtr.getCellRef().getCharge();
|
||||||
containerItem.goldValue = itemPtr.getCellRef().getGoldValue();
|
|
||||||
|
|
||||||
worldObject.containerChanges.items.push_back(containerItem);
|
worldObject.containerChanges.items.push_back(containerItem);
|
||||||
}
|
}
|
||||||
|
@ -122,8 +121,6 @@ void WorldEvent::editContainers(MWWorld::CellStore* cellStore)
|
||||||
if (containerItem.charge > -1)
|
if (containerItem.charge > -1)
|
||||||
newPtr.getCellRef().setCharge(containerItem.charge);
|
newPtr.getCellRef().setCharge(containerItem.charge);
|
||||||
|
|
||||||
newPtr.getCellRef().setGoldValue(containerItem.goldValue);
|
|
||||||
|
|
||||||
containerStore.add(newPtr, containerItem.count, ownerPtr, true);
|
containerStore.add(newPtr, containerItem.count, ownerPtr, true);
|
||||||
}
|
}
|
||||||
else if (action == BaseEvent::REMOVE)
|
else if (action == BaseEvent::REMOVE)
|
||||||
|
@ -135,7 +132,6 @@ void WorldEvent::editContainers(MWWorld::CellStore* cellStore)
|
||||||
if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), containerItem.refId))
|
if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), containerItem.refId))
|
||||||
{
|
{
|
||||||
if (iter->getCellRef().getCharge() == containerItem.charge &&
|
if (iter->getCellRef().getCharge() == containerItem.charge &&
|
||||||
iter->getCellRef().getGoldValue() == containerItem.goldValue &&
|
|
||||||
iter->getRefData().getCount() == containerItem.count)
|
iter->getRefData().getCount() == containerItem.count)
|
||||||
{
|
{
|
||||||
containerStore.remove(*iter, containerItem.actionCount, ownerPtr);
|
containerStore.remove(*iter, containerItem.actionCount, ownerPtr);
|
||||||
|
|
|
@ -12,13 +12,12 @@ namespace mwmp
|
||||||
std::string refId;
|
std::string refId;
|
||||||
int count;
|
int count;
|
||||||
int charge;
|
int charge;
|
||||||
int goldValue;
|
|
||||||
|
|
||||||
int actionCount;
|
int actionCount;
|
||||||
|
|
||||||
inline bool operator==(const ContainerItem& rhs)
|
inline bool operator==(const ContainerItem& rhs)
|
||||||
{
|
{
|
||||||
return refId == rhs.refId && count == rhs.count && charge == rhs.charge && goldValue && rhs.goldValue;
|
return refId == rhs.refId && count == rhs.count && charge == rhs.charge;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,6 @@ void PacketContainer::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
|
||||||
RW(containerItem.refId, send);
|
RW(containerItem.refId, send);
|
||||||
RW(containerItem.count, send);
|
RW(containerItem.count, send);
|
||||||
RW(containerItem.charge, send);
|
RW(containerItem.charge, send);
|
||||||
RW(containerItem.goldValue, send);
|
|
||||||
RW(containerItem.actionCount, send);
|
RW(containerItem.actionCount, send);
|
||||||
|
|
||||||
if (!send)
|
if (!send)
|
||||||
|
|
Loading…
Reference in a new issue