Merged CombatMusicControl

source/scripts/_00e_playerfunctions.psc

@@ -69,7 +69,7 @@ EndFunction
 ; Equip/unequip torches
 ;=====================================================================================
 
-Int Function GetHandSlotEx(int iHand)
+Int Function _GetHandSlotEx(int iHand)
 	; By default, iHand = 0 for left hand, 1 for right hand
 	; In SKSE's "Equip Ex" functions though: iHand = 2 for left hand, 1 for right hand
 	Return 2 - iHand
@@ -82,7 +82,7 @@ Bool Function UnequipTorches(Form[] equippedTorches)
 		If GetEquippedItemType(iHand) == 11 ; A torch is in the hand?
 			Form torch = GetEquippedObject(iHand)
 			If torch
-				UnequipItemEx(torch, GetHandSlotEx(iHand))
+				UnequipItemEx(torch, _GetHandSlotEx(iHand))
 				equippedTorches[iHand] = torch
 				unequipping = True
 			EndIf
@@ -100,7 +100,7 @@ Function ReequipTorches(Form[] equippedTorches)
 		Form torch = equippedTorches[iHand]
 		If torch
 			If GetItemCount(torch) > 0
-				EquipItemEx(torch, GetHandSlotEx(iHand), False, True)
+				EquipItemEx(torch, _GetHandSlotEx(iHand), False, True)
 			EndIf
 			; "Forget" about the form to not keep it persistent if equippedTorches is a script's property or variable
 			equippedTorches[iHand] = None