further 5e hotfixes

bmos · Oct 3, 2023 · f449fb2 · f449fb2
1 parent 01201e9
commit f449fb2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/campaign/scripts/5e_char_weapon.lua b/campaign/scripts/5e_char_weapon.lua
@@ -4,9 +4,8 @@
 --
 
 --	luacheck: globals setAmmoVis maxammo.setLink
-local function setAmmoVis(nodeWeapon, ...)
-	if super and super.setAmmoVis then super.setAmmoVis(nodeWeapon, ...) end
-
+local function setAmmoVis()
+	local nodeWeapon = getDatabaseNode()
 	local bLoading = AmmunitionManager.hasLoadAction(nodeWeapon)
 	isloaded.setVisible(bLoading)
 
@@ -58,12 +57,12 @@ function onLinkChanged()
 end
 
 --	luacheck: globals onAttackChanged onDamageChanged
-function onDataChanged(nodeWeapon)
+function onDataChanged()
 	onLinkChanged();
 	onAttackChanged();
 	onDamageChanged();
 
-	setAmmoVis(nodeWeapon)
+	setAmmoVis()
 end
 
 --	luacheck: globals highlightAttack

diff --git a/extension.xml b/extension.xml
@@ -26,7 +26,7 @@
 		<loadorder>34</loadorder>
 	</properties>
 
-	<announcement text="https://github.com/bmos/FG-PFRPG-Ammunition-Manager\nAmmunition Manager v4.4-hotfix.1:\nThis extension aids in tracking ammunition and whether ranged weapons are loaded." font="emotefont" icon="archery_ammomanager" />
+	<announcement text="https://github.com/bmos/FG-PFRPG-Ammunition-Manager\nAmmunition Manager v4.4-hotfix.2:\nThis extension aids in tracking ammunition and whether ranged weapons are loaded." font="emotefont" icon="archery_ammomanager" />
 
 	<base>
 		<!-- Campaign Records -->