From de65ae809fc10fcbbd9b932ec337288a900a1678 Mon Sep 17 00:00:00 2001
From: Braden Obrzut <admin@maniacsvault.net>
Date: Thu, 17 Jan 2013 19:25:22 +0000
Subject: [PATCH] - Fixed: BobStyle was assigned as if they were flags.

SVN r4027 (trunk)
---
 src/thingdef/thingdef_properties.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/thingdef/thingdef_properties.cpp b/src/thingdef/thingdef_properties.cpp
index f5dc0d91f5..5fc607ca4c 100644
--- a/src/thingdef/thingdef_properties.cpp
+++ b/src/thingdef/thingdef_properties.cpp
@@ -1772,7 +1772,7 @@ DEFINE_CLASS_PROPERTY(yadjust, F, Weapon)
 DEFINE_CLASS_PROPERTY(bobstyle, S, Weapon)
 {
 	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::BobSmooth, AWeapon::BobInverseSmooth, };
 	PROP_STRING_PARM(id, 0);
@@ -1782,7 +1782,7 @@ DEFINE_CLASS_PROPERTY(bobstyle, S, Weapon)
 		I_Error("Unknown bobstyle %s", id);
 		match = 0;
 	}
-	defaults->BobStyle |= flags[match];
+	defaults->BobStyle = styles[match];
 }
 
 //==========================================================================