OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- got rid of PClassWeapon.

Browse source 
Still 5 subclasses of PClass left...
This commit is contained in:
Christoph Oelckers 2017-02-07 19:02:27 +01:00
commit 7ed554158c
8 changed files with 118 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/scripting/thingdef_properties.cpp
View file

@ -2065,8 +2065,7 @@ DEFINE_CLASS_PROPERTY(bobrangey, F, Weapon)
DEFINE_CLASS_PROPERTY(slotnumber, I, Weapon)
{
PROP_INT_PARM(i, 0);
assert(info->IsKindOf(RUNTIME_CLASS(PClassWeapon)));
static_cast<PClassWeapon *>(info)->SlotNumber = i;
defaults->SlotNumber = i;
}
//==========================================================================
@ -2075,8 +2074,7 @@ DEFINE_CLASS_PROPERTY(slotnumber, I, Weapon)
DEFINE_CLASS_PROPERTY(slotpriority, F, Weapon)
{
PROP_DOUBLE_PARM(i, 0);
assert(info->IsKindOf(RUNTIME_CLASS(PClassWeapon)));
static_cast<PClassWeapon *>(info)->SlotPriority = int(i*65536);
defaults->SlotPriority = int(i*65536);
}
//==========================================================================