Merge branch 'master' into script-thing

Pirulax · web-flow · commit 1f0f0662bd14 · 2025-12-13T13:37:39.000+01:00
diff --git a/source/game_sa/Scripts/Commands/CharacterCommands.cpp b/source/game_sa/Scripts/Commands/CharacterCommands.cpp
@@ -1020,8 +1020,8 @@ auto IsCharInWater(CPed* ped) {
 }
 
 // GET_CHAR_WEAPON_IN_SLOT
-auto GetCharWeaponInSlot(CPed& ped, eWeaponSlot slut) {
-    const auto& wep = ped.GetWeaponInSlot(slut);
+auto GetCharWeaponInSlot(CPed& ped, int slot) {
+    const auto& wep = ped.GetWeaponInSlot(slot - 1); // 1-based slot index
     return notsa::script::return_multiple(wep.m_Type, wep.m_TotalAmmo, CPickups::ModelForWeapon(wep.m_Type));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1020,8 +1020,8 @@ auto IsCharInWater(CPed* ped) {`
`1020`	`1020`	`}`
`1021`	`1021`
`1022`	`1022`	`// GET_CHAR_WEAPON_IN_SLOT`
`1023`		`-auto GetCharWeaponInSlot(CPed& ped, eWeaponSlot slut) {`
`1024`		`- const auto& wep = ped.GetWeaponInSlot(slut);`
	`1023`	`+auto GetCharWeaponInSlot(CPed& ped, int slot) {`
	`1024`	`+ const auto& wep = ped.GetWeaponInSlot(slot - 1); // 1-based slot index`
`1025`	`1025`	`return notsa::script::return_multiple(wep.m_Type, wep.m_TotalAmmo, CPickups::ModelForWeapon(wep.m_Type));`
`1026`	`1026`	`}`
`1027`	`1027`