zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-31 05:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: BobStyle was assigned as if they were flags.

Browse source 
SVN r4027 (trunk)
This commit is contained in:
Braden Obrzut 2013-01-17 19:25:22 +00:00
parent c7a008f99d
commit de65ae809f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/thingdef/thingdef_properties.cpp
View file

@ -1772,7 +1772,7 @@ DEFINE_CLASS_PROPERTY(yadjust, F, Weapon)
DEFINE_CLASS_PROPERTY(bobstyle, S, Weapon) DEFINE_CLASS_PROPERTY(bobstyle, S, Weapon)
{ {
static const char *names[] = { "Normal", "Inverse", "Alpha", "InverseAlpha", "Smooth", "InverseSmooth", NULL }; static const char *names[] = { "Normal", "Inverse", "Alpha", "InverseAlpha", "Smooth", "InverseSmooth", NULL };
static const int flags[] = { AWeapon::BobNormal, static const int styles[] = { AWeapon::BobNormal,
AWeapon::BobInverse, AWeapon::BobAlpha, AWeapon::BobInverseAlpha, AWeapon::BobInverse, AWeapon::BobAlpha, AWeapon::BobInverseAlpha,
AWeapon::BobSmooth, AWeapon::BobInverseSmooth, }; AWeapon::BobSmooth, AWeapon::BobInverseSmooth, };
PROP_STRING_PARM(id, 0); PROP_STRING_PARM(id, 0);
@ -1782,7 +1782,7 @@ DEFINE_CLASS_PROPERTY(bobstyle, S, Weapon)
I_Error("Unknown bobstyle %s", id); I_Error("Unknown bobstyle %s", id);
match = 0; match = 0;
} }
defaults->BobStyle |= flags[match]; defaults->BobStyle = styles[match];
} }
//========================================================================== //==========================================================================