Skip to content

Preserve inventory order when AI switches weapons #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Causeless merged 8 commits into from
Oct 28, 2025
Merged

Preserve inventory order when AI switches weapons #222

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0f5f56a
preserve inventory order in AHuman::EquipFirearm
Architector4 Oct 20, 2025
b294eab
preserve inventory order in AHuman::EquipNamedDevice too
Architector4 Oct 20, 2025
e9470db
AHuman - preserve inventory order EVERYWHERE
Architector4 Oct 20, 2025
22e9e84
AHuman.cpp - remove item in rotated inventory
Architector4 Oct 20, 2025
b5a1b76
AHuman.cpp - remove item in rotated inventory PROPERLY
Architector4 Oct 20, 2025
6d0700c
AHuman.cpp - preserve inventory order WITHOUT CRASHING
Architector4 Oct 24, 2025
8b2dae3
Merge branch 'development' into patch-2
Causeless Oct 28, 2025
3147f7d
Merge branch 'development' into patch-2
Causeless Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 71 additions & 21 deletions Source/Entities/AHuman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,16 +648,23 @@ bool AHuman::EquipFirearm(bool doEquip) {
// Found proper device to equip, so make the switch!
if (pWeapon && pWeapon->IsWeapon()) {
if (doEquip) {
// Erase the inventory entry containing the device we now have switched to
*itr = 0;
m_Inventory.erase(itr);
// The next code may cause reallocation, so we can't just use the same pointer.
// Store how far into the inventory the device is, memory wise.
size_t device_offset = itr - m_Inventory.begin();

// Put back into the inventory what we had in our hands, if anything
if (HeldDevice* heldDevice = m_pFGArm->GetHeldDevice()) {
heldDevice->Deactivate();
AddToInventoryBack(m_pFGArm->RemoveAttachable(heldDevice));
}

// We want to preserve inventory order, so rotate to the device in question.
std::rotate(m_Inventory.begin(), m_Inventory.begin() + device_offset, m_Inventory.end());

// Erase the inventory entry containing the device we now have switched to
*m_Inventory.begin() = 0;
m_Inventory.pop_front();

// Now put the device we were looking for and found into the hand
m_pFGArm->SetHeldDevice(pWeapon);
// Move the hand to a poisition so it looks like the new device was drawn from inventory
Expand Down Expand Up @@ -694,9 +701,9 @@ bool AHuman::EquipDeviceInGroup(std::string group, bool doEquip) {
// Found proper device to equip, so make the switch!
if (pDevice && pDevice->IsInGroup(group)) {
if (doEquip) {
// Erase the inventory entry containing the device we now have switched to
*itr = 0;
m_Inventory.erase(itr);
// The next code may cause reallocation, so we can't just use the same pointer.
// Store how far into the inventory the device is, memory wise.
size_t device_offset = itr - m_Inventory.begin();

// Put back into the inventory what we had in our hands, if anything
if (HeldDevice* heldDevice = m_pFGArm->GetHeldDevice()) {
Expand All @@ -713,6 +720,13 @@ bool AHuman::EquipDeviceInGroup(std::string group, bool doEquip) {
}
}

// We want to preserve inventory order, so rotate it to the device in question.
std::rotate(m_Inventory.begin(), m_Inventory.begin() + device_offset, m_Inventory.end());

// Erase the inventory entry containing the device we now have switched to
*m_Inventory.begin() = 0;
m_Inventory.pop_front();

// Now put the device we were looking for and found into the hand
m_pFGArm->SetHeldDevice(pDevice);
// Move the hand to a poisition so it looks like the new device was drawn from inventory
Expand Down Expand Up @@ -749,16 +763,24 @@ bool AHuman::EquipLoadedFirearmInGroup(std::string group, std::string excludeGro
// Found proper device to equip, so make the switch!
if (pFirearm && !pFirearm->NeedsReloading() && pFirearm->IsInGroup(group) && !pFirearm->IsInGroup(excludeGroup)) {
if (doEquip) {
// Erase the inventory entry containing the device we now have switched to
*itr = 0;
m_Inventory.erase(itr);
// The next code may cause reallocation, so we can't just use the same pointer.
// Store how far into the inventory the device is, memory wise.
size_t device_offset = itr - m_Inventory.begin();

// Put back into the inventory what we had in our hands, if anything
if (HeldDevice* heldDevice = m_pFGArm->GetHeldDevice()) {
m_pFGArm->GetHeldDevice()->Deactivate();
AddToInventoryBack(m_pFGArm->RemoveAttachable(heldDevice));
}

// We want to preserve inventory order, so rotate it to the device in question.
std::rotate(m_Inventory.begin(), m_Inventory.begin() + device_offset, m_Inventory.end());
m_Inventory.pop_front();

// Erase the inventory entry containing the device we now have switched to
*m_Inventory.begin() = 0;
m_Inventory.pop_front();

// Now put the device we were looking for and found into the hand
m_pFGArm->SetHeldDevice(pFirearm);
// Move the hand to a poisition so it looks like the new device was drawn from inventory
Expand Down Expand Up @@ -796,16 +818,23 @@ bool AHuman::EquipNamedDevice(const std::string& moduleName, const std::string&
// Found proper device to equip, so make the switch!
if (pDevice && (moduleName.empty() || pDevice->GetModuleName() == moduleName) && pDevice->GetPresetName() == presetName) {
if (doEquip) {
// Erase the inventory entry containing the device we now have switched to
*itr = 0;
m_Inventory.erase(itr);
// The next code may cause reallocation, so we can't just use the same pointer.
// Store how far into the inventory the device is, memory wise.
size_t device_offset = itr - m_Inventory.begin();

// Put back into the inventory what we had in our hands, if anything
if (HeldDevice* heldDevice = m_pFGArm->GetHeldDevice()) {
heldDevice->Deactivate();
AddToInventoryBack(m_pFGArm->RemoveAttachable(heldDevice));
}

// We want to preserve inventory order, so rotate to the device in question.
std::rotate(m_Inventory.begin(), m_Inventory.begin() + device_offset, m_Inventory.end());

// Erase the inventory entry containing the device.
*m_Inventory.begin() = 0;
m_Inventory.pop_front();

// Now put the device we were looking for and found into the hand
m_pFGArm->SetHeldDevice(pDevice);
// Move the hand to a poisition so it looks like the new device was drawn from inventory
Expand Down Expand Up @@ -844,16 +873,23 @@ bool AHuman::EquipThrowable(bool doEquip) {
if (pThrown) // && pThrown->IsWeapon())
{
if (doEquip) {
// Erase the inventory entry containing the device we now have switched to
*itr = 0;
m_Inventory.erase(itr);
// The next code may cause reallocation, so we can't just use the same pointer.
// Store how far into the inventory the device is, memory wise.
size_t device_offset = itr - m_Inventory.begin();

// Put back into the inventory what we had in our hands, if anything
if (HeldDevice* heldDevice = m_pFGArm->GetHeldDevice()) {
heldDevice->Deactivate();
AddToInventoryBack(m_pFGArm->RemoveAttachable(heldDevice));
}

// We want to preserve inventory order, so rotate it to the device in question.
std::rotate(m_Inventory.begin(), m_Inventory.begin() + device_offset, m_Inventory.end());

// Erase the inventory entry containing the device we now have switched to
*m_Inventory.begin() = 0;
m_Inventory.pop_front();

// Now put the device we were looking for and found into the hand
m_pFGArm->SetHeldDevice(pThrown);
// Move the hand to a poisition so it looks like the new device was drawn from inventory
Expand Down Expand Up @@ -968,16 +1004,23 @@ bool AHuman::EquipShield() {
HeldDevice* pShield = dynamic_cast<HeldDevice*>(*itr);
// Found proper device to equip, so make the switch!
if (pShield && pShield->IsShield()) {
// Erase the inventory entry containing the device we now have switched to
*itr = 0;
m_Inventory.erase(itr);
// The next code may cause reallocation, so we can't just use the same pointer.
// Store how far into the inventory the device is, memory wise.
size_t device_offset = itr - m_Inventory.begin();

// Put back into the inventory what we had in our hands, if anything
if (HeldDevice* heldDevice = m_pFGArm->GetHeldDevice()) {
heldDevice->Deactivate();
AddToInventoryBack(m_pFGArm->RemoveAttachable(heldDevice));
}

// We want to preserve inventory order, so rotate it to the device in question.
std::rotate(m_Inventory.begin(), m_Inventory.begin() + device_offset, m_Inventory.end());

// Erase the inventory entry containing the device we now have switched to
*m_Inventory.begin() = 0;
m_Inventory.pop_front();

// Now put the device we were looking for and found into the hand
m_pFGArm->SetHeldDevice(pShield);
// Move the hand to a poisition so it looks like the new device was drawn from inventory
Expand Down Expand Up @@ -1027,9 +1070,9 @@ bool AHuman::EquipShieldInBGArm(bool depositToFront) {
HeldDevice* pShield = dynamic_cast<HeldDevice*>(*itr);
// Found proper device to equip, so make the switch!
if (pShield && (pShield->IsShield() || pShield->IsDualWieldable())) {
// Erase the inventory entry containing the device we now have switched to
*itr = 0;
m_Inventory.erase(itr);
// The next code may cause reallocation, so we can't just use the same pointer.
// Store how far into the inventory the device is, memory wise.
size_t device_offset = itr - m_Inventory.begin();

// Put back into the inventory what we had in our hands, if anything
if (HeldDevice* heldDevice = m_pBGArm->GetHeldDevice()) {
Expand All @@ -1041,6 +1084,13 @@ bool AHuman::EquipShieldInBGArm(bool depositToFront) {
}
}

// We want to preserve inventory order, so rotate it to the device in question.
std::rotate(m_Inventory.begin(), m_Inventory.begin() + device_offset, m_Inventory.end());

// Erase the inventory entry containing the device we now have switched to
*m_Inventory.begin() = 0;
m_Inventory.pop_front();

// Now put the device we were looking for and found into the hand
m_pBGArm->SetHeldDevice(pShield);
// Move the hand to a poisition so it looks like the new device was drawn from inventory
Expand Down
Loading