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

[General] Change type of Item::enchantmentCharge to float

Browse source
This commit is contained in:
Koncord 2018-01-20 18:32:26 +08:00
parent cb86557aca
commit de0bb3cdab
6 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw-mp/Inventory.cpp
View file

@ -97,7 +97,7 @@ int Inventory::getChangesSize() const
return netActor->getNetCreature()->inventoryChanges.items.size();
}
void Inventory::equipItem(unsigned short slot, const std::string& refId, unsigned int count, int charge, double enchantmentCharge)
void Inventory::equipItem(unsigned short slot, const std::string& refId, unsigned int count, int charge, float enchantmentCharge)
{
netActor->getNetCreature()->equipmentItems[slot].refId = refId;
netActor->getNetCreature()->equipmentItems[slot].count = count;
@ -119,7 +119,7 @@ void Inventory::unequipItem( unsigned short slot)
}
void Inventory::addItem(const std::string &refId, unsigned int count, int charge, double enchantmentCharge)
void Inventory::addItem(const std::string &refId, unsigned int count, int charge, float enchantmentCharge)
{
if (inventoryChanged == mwmp::InventoryChanges::Type::Remove)
return;

4
apps/openmw-mp/Inventory.hpp
View file

@ -25,7 +25,7 @@ public:
//inventory
int getChangesSize() const;
void addItem(const std::string& refId, unsigned int count, int charge, double enchantmentCharge);
void addItem(const std::string& refId, unsigned int count, int charge, float enchantmentCharge);
void removeItem(const std::string& refId, unsigned short count);
/**
@ -37,7 +37,7 @@ public:
// equipment
void equipItem(unsigned short slot, const std::string& refId, unsigned int count, int charge, double enchantmentCharge);
void equipItem(unsigned short slot, const std::string& refId, unsigned int count, int charge, float enchantmentCharge);
void unequipItem(unsigned short slot);
bool hasItemEquipped(const std::string& refId) const;

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

@ -172,15 +172,18 @@ void DedicatedActor::setEquipment()
const string &packetRefId = equipmentItems[slot].refId;
int packetCharge = equipmentItems[slot].charge;
std::string storeRefId = "";
bool equal = false;
if (it != invStore.end())
{
storeRefId = it->getCellRef().getRefId();
std::string storeRefId = it->getCellRef().getRefId();
int count = invStore.count(storeRefId);
if (!Misc::StringUtils::ciEqual(storeRefId, packetRefId)) // if other item equiped
if (!Misc::StringUtils::ciEqual(storeRefId, packetRefId)) // if other item equipped
{
invStore.unequipSlot(slot, ptr);
ptr.getClass().getContainerStore(ptr).remove(storeRefId, count, ptr);
}
else
equal = true;
}

3
apps/openmw/mwmp/DedicatedPlayer.cpp
View file

@ -170,11 +170,10 @@ void DedicatedPlayer::setEquipment()
MWWorld::ContainerStoreIterator it = invStore.getSlot(slot);
const string &dedicItem = equipmentItems[slot].refId;
std::string item = "";
bool equal = false;
if (it != invStore.end())
{
item = it->getCellRef().getRefId();
const std::string &item = it->getCellRef().getRefId();
if (!Misc::StringUtils::ciEqual(item, dedicItem)) // if other item equiped
{
MWWorld::ContainerStore &store = ptr.getClass().getContainerStore(ptr);

4
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -455,11 +455,11 @@ void LocalPlayer::updateEquipment(bool forceUpdate)
item.refId = "";
item.count = 0;
item.charge = -1;
item.enchantmentCharge = -1;
item.enchantmentCharge = -1.0f;
}
}
if (equipmentIndexChanges.size() > 0)
if (!equipmentIndexChanges.empty())
{
getNetworking()->getPlayerPacket(ID_PLAYER_EQUIPMENT)->setPlayer(this);
getNetworking()->getPlayerPacket(ID_PLAYER_EQUIPMENT)->Send();

2
components/openmw-mp/Base/BaseStructs.hpp
View file

@ -12,7 +12,7 @@ namespace mwmp
std::string refId;
int count;
int charge;
double enchantmentCharge;
float enchantmentCharge;
inline bool operator==(const Item& rhs)
{