Fix #501 Setting player model resets their current weapon slot

[FileEX]

Fixed #501

In the case of non-player peds weapon the slot is set correctly, but in the case of player peds the slot is not set.

This is due to the fact that the slot for the player is taken directly from the GTA memory

mtasa-blue/Client/mods/deathmatch/logic/CClientPed.cpp

Lines 2209 to 2211 in 97920d8

	if (m_pPlayerPed)
	{
	return m_pPlayerPed->GetCurrentWeaponSlot();

and when the skin respawns, the slot in the game memory is still the one we had before changing the skin. This causes the condition result is false.

mtasa-blue/Client/mods/deathmatch/logic/CClientPed.cpp

Lines 2148 to 2152 in 97920d8

	bool CClientPed::SetCurrentWeaponSlot(eWeaponSlot weaponSlot)
	{
	if (weaponSlot < WEAPONSLOT_MAX)
	{
	if (weaponSlot != GetCurrentWeaponSlot())

As a result, the weapon slot is not set at all. Therefore, we first set the weapon slot to 0 to make this condition true.

[Proxy-99]

 // Set it to 0 (Fix #501)
            SetCurrentWeaponSlot(eWeaponSlot::WEAPONSLOT_TYPE_UNARMED);

            if (bRestoreState)
            {
                // Jax: restore all the things we saved
                SetHealth(fHealth);
                SetArmor(fArmor);
                SetCurrentWeaponSlot(weaponSlot);
                SetCurrentRotation(fCurrentRotation);
                m_pPlayerPed->SetTargetRotation(fTargetRotation);
                SetMoveSpeed(vecMoveSpeed);
                SetHasJetPack(m_bHasJetPack);
                SetInterior(ucInterior);
            }

what about this condition after it set the weapon slot should not bRestoreState become true so it loop through the list

[FileEX]

I do not understand what you mean. After changing the skin, the slot changes to 0 anyway, but the MTA does not recognize it, so setting the slot to 0 from the MTA level solves the problem.

[Proxy-99]

I do not understand what you mean. After changing the skin, the slot changes to 0 anyway, but the MTA does not recognize it, so setting the slot to 0 from the MTA level solves the problem.

you can notice a condtion after your fix
at line 5226
it alredy set the weapon slot
SetCurrentWeaponSlot(weaponSlot);

if (bRestoreState)
{
    // Jax: restore all the things we saved
    SetHealth(fHealth);
    SetArmor(fArmor);
    SetCurrentWeaponSlot(weaponSlot);
    SetCurrentRotation(fCurrentRotation);
    m_pPlayerPed->SetTargetRotation(fTargetRotation);
    SetMoveSpeed(vecMoveSpeed);
    SetHasJetPack(m_bHasJetPack);
    SetInterior(ucInterior);
}

so setting bRestoreState to true should fix the issue if I am not wrong

[FileEX]

You're wrong. I described what the problem is. bRestoreState is true, but still the weapon slot is not set correctly without my fix.

mtasa-blue/Client/mods/deathmatch/logic/CClientPed.cpp

Line 3907 in 97920d8

Respawn(NULL, true, false);

[Proxy-99]

good job!
mainly the issue comes from if (weaponSlot != GetCurrentWeaponSlot()) returning false, I was confused at the start