Fix: lastinv knife deploying (#117)

* fix: Save player last weapon used even suicide * fix: reset last weapon on weapons giving
ReDeathmatch · Apr 23, 2024 · 6e7a275 · 6e7a275
1 parent 9bb44ab
commit 6e7a275
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma b/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma
@@ -147,11 +147,11 @@ public CSGameRules_PlayerKilled_Post(const victim, const killer, const inflictor
     if (!SV_IsPlayerIndex(killer))
         return
 
+    EquipManager_PlayerKilled(victim)
     if (killer == victim)
         return
 
     Features_PlayerKilled(victim, killer)
-    EquipManager_PlayerKilled(victim)
 }
 
 public CvarChange_redm_active(const cvar, const oldValue[], const value[]) {

diff --git a/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_equip_manager.inc b/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_equip_manager.inc
@@ -546,7 +546,11 @@ static bool: Player_GiveWeapon(const player, const EquipType_e: section) {
         charsmax(weaponName)
     )
 
-    rg_give_item(player, weaponName, .type = GT_REPLACE)
+    new item = rg_give_item(player, weaponName, .type = GT_REPLACE)
+
+    // Reset last item
+    set_member(player, m_pLastItem, item)
+
     return true
 }