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

Allow script-induced setting of equipment

Browse source
This commit is contained in:
David Cernat 2016-09-30 12:36:20 +03:00
parent 4b96080521
commit e0361835b0
3 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -366,7 +366,7 @@ void LocalPlayer::updateInventory(bool forceUpdate)
MWWorld::InventoryStore &invStore = player.getClass().getInventoryStore(player);
for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
for (int slot = 0; slot < MWWorld::InventoryStore::Slots; slot++)
{
MWWorld::ContainerStoreIterator it = invStore.getSlot(slot);
if (it != invStore.end() && !::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), EquipedItem(slot)->refid))
@ -659,6 +659,26 @@ void LocalPlayer::setClass()
}
}
void LocalPlayer::setInventory()
{
MWWorld::Ptr ptrPlayer = GetPlayerPtr();
MWWorld::InventoryStore &ptrInventory = ptrPlayer.getClass().getInventoryStore(ptrPlayer);
ptrInventory.clear();
for (int slot = 0; slot < MWWorld::InventoryStore::Slots; slot++)
{
mwmp::Item *currentItem = EquipedItem(slot);
//printf("Setting currentItem: %s in slot %i\n", currentItem->refid, slot);
if (!currentItem->refid.empty())
{
ptrInventory.equip(slot, ptrInventory.ContainerStore::add(EquipedItem(slot)->refid.c_str(), 1, ptrPlayer), ptrPlayer);
}
}
}
void LocalPlayer::sendClass()
{
MWBase::World *world = MWBase::Environment::get().getWorld();

1
apps/openmw/mwmp/LocalPlayer.hpp
View file

@ -42,6 +42,7 @@ namespace mwmp
void setPosition();
void setCell();
void setClass();
void setInventory();
void sendClass();
void sendAttack(char type);

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

@ -258,9 +258,16 @@ void Networking::ReceiveMessage(RakNet::Packet *packet)
case ID_GAME_EQUIPMENT:
{
if (id == myid)
{
if (packet->length == myPacket->headerSize())
{
getLocalPlayer()->updateInventory(true);
myPacket->Send(getLocalPlayer(), serverAddr);
}
else
{
myPacket->Packet(&bsIn, getLocalPlayer(), false);
getLocalPlayer()->setInventory();
}
}
else if (pl != 0)
{