mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-28 07:39:40 +00:00
Code Issues Releases Wiki Activity

[Cllient] Update multiplayer code for handling quick keys

Browse source
This commit is contained in:
David Cernat 2018-07-04 05:56:10 +03:00
parent 3438061b55
commit 7775780ad7
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwgui/quickkeysmenu.cpp
View file

@ -169,7 +169,7 @@ namespace MWGui
*/
if (mwmp::Main::get().getLocalPlayer()->hasFinishedCharGen() && !mwmp::Main::get().getLocalPlayer()->isReceivingQuickKeys)
{
mwmp::Main::get().getLocalPlayer()->sendQuickKey(index, Type_Unassigned);
mwmp::Main::get().getLocalPlayer()->sendQuickKey(key->index, Type_Unassigned);
}
/*
End of tes3mp addition
@ -183,7 +183,7 @@ namespace MWGui
*/
void QuickKeysMenu::unassignIndex(int index)
{
unassign(mQuickKeyButtons[index], index);
unassign(&mKey[index]);
}
/*
End of tes3mp addition
@ -281,7 +281,7 @@ namespace MWGui
by a player, not by a packet received from the server
*/
if (!mwmp::Main::get().getLocalPlayer()->isReceivingQuickKeys)
mwmp::Main::get().getLocalPlayer()->sendQuickKey(mSelectedIndex, Type_Item, item.getCellRef().getRefId());
mwmp::Main::get().getLocalPlayer()->sendQuickKey(mSelected->index, Type_Item, item.getCellRef().getRefId());
/*
End of tes3mp addition
*/
@ -316,7 +316,7 @@ namespace MWGui
Send a PLAYER_QUICKKEYS packet whenever a key is assigned to an item's magic
*/
if (!mwmp::Main::get().getLocalPlayer()->isReceivingQuickKeys)
mwmp::Main::get().getLocalPlayer()->sendQuickKey(mSelectedIndex, Type_MagicItem, item.getCellRef().getRefId());
mwmp::Main::get().getLocalPlayer()->sendQuickKey(mSelected->index, Type_MagicItem, item.getCellRef().getRefId());
/*
End of tes3mp addition
*/
@ -360,7 +360,7 @@ namespace MWGui
Send a PLAYER_QUICKKEYS packet whenever a key is assigned to a spell
*/
if (!mwmp::Main::get().getLocalPlayer()->isReceivingQuickKeys)
mwmp::Main::get().getLocalPlayer()->sendQuickKey(mSelectedIndex, Type_Magic, spellId);
mwmp::Main::get().getLocalPlayer()->sendQuickKey(mSelected->index, Type_Magic, spellId);
/*
End of tes3mp addition
*/
@ -517,7 +517,7 @@ namespace MWGui
*/
void QuickKeysMenu::setSelectedIndex(int index)
{
mSelectedIndex = index;
mSelected = &mKey[index];
}
/*
End of tes3mp addition

11
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -1565,10 +1565,14 @@ namespace MWGui
*/
void WindowManager::setQuickKey(int slot, int quickKeyType, MWWorld::Ptr item, const std::string& spellId)
{
mQuickKeysMenu->setSelectedIndex(slot);
switch (quickKeyType)
if (slot > 0)
{
// The actual indexes recorded for quick keys are always 1 higher than their
// indexes in the mKey vector, so adjust for the latter
mQuickKeysMenu->setSelectedIndex(slot - 1);
switch (quickKeyType)
{
case QuickKeysMenu::Type_Unassigned:
mQuickKeysMenu->unassignIndex(slot);
break;
@ -1581,6 +1585,7 @@ namespace MWGui
case QuickKeysMenu::Type_Magic:
mQuickKeysMenu->onAssignMagic(spellId);
break;
}
}
}
/*