From fd801ca91b43f234ff4d4a8fe60a86d3c540d8df Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 5 Dec 2018 08:13:52 +0100 Subject: [PATCH] - fixed: SlotPriority must be a float. It was a fixed before but I missed that when refactoring it into an automatic property. --- wadsrc/static/zscript/inventory/weapons.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wadsrc/static/zscript/inventory/weapons.txt b/wadsrc/static/zscript/inventory/weapons.txt index dc4c412a5..1c2d1d2e9 100644 --- a/wadsrc/static/zscript/inventory/weapons.txt +++ b/wadsrc/static/zscript/inventory/weapons.txt @@ -34,7 +34,7 @@ class Weapon : StateProvider readonly bool bDehAmmo; // Uses Doom's original amount of ammo for the respective attack functions so that old DEHACKED patches work as intended. // AmmoUse1 will be set to the first attack's ammo use so that checking for empty weapons still works meta int SlotNumber; - meta int SlotPriority; + meta double SlotPriority; property AmmoGive: AmmoGive1; property AmmoGive1: AmmoGive1; @@ -121,7 +121,7 @@ class Weapon : StateProvider { if (GetReplacement(GetClass()) == GetClass() && !bPowered_Up) { - return SlotNumber, SlotPriority*65536; + return SlotNumber, int(SlotPriority*65536); } return -1, 0; }