zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-13 07:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: SlotPriority must be a float.

Browse source 
It was a fixed before but I missed that when refactoring it into an automatic property.
This commit is contained in:
Christoph Oelckers 2018-12-05 08:13:52 +01:00
parent 0d891b6289
commit fd801ca91b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wadsrc/static/zscript/inventory/weapons.txt
View file

@ -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. 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 // AmmoUse1 will be set to the first attack's ammo use so that checking for empty weapons still works
meta int SlotNumber; meta int SlotNumber;
meta int SlotPriority; meta double SlotPriority;
property AmmoGive: AmmoGive1; property AmmoGive: AmmoGive1;
property AmmoGive1: AmmoGive1; property AmmoGive1: AmmoGive1;
@ -121,7 +121,7 @@ class Weapon : StateProvider
{ {
if (GetReplacement(GetClass()) == GetClass() && !bPowered_Up) if (GetReplacement(GetClass()) == GetClass() && !bPowered_Up)
{ {
return SlotNumber, SlotPriority*65536; return SlotNumber, int(SlotPriority*65536);
} }
return -1, 0; return -1, 0;
} }