Update the edit placed item dialog

- Fix weapon enchantments
This commit is contained in:
2015-01-23 15:39:52 -05:00
parent 78cdadc13c
commit 869c629b8b
6 changed files with 78 additions and 26 deletions

View File

@@ -379,7 +379,7 @@ cItem::cItem(eAlchemy recipe) : cItem('alch') {
void cItem::enchant_weapon(eEnchant enchant_type,short new_val) {
if(magic || ability != eItemAbil::NONE)
return;
if(variety != eItemType::ONE_HANDED || variety != eItemType::TWO_HANDED)
if(variety != eItemType::ONE_HANDED && variety != eItemType::TWO_HANDED)
return;
magic = true;
enchanted = true;

View File

@@ -53,7 +53,7 @@ public:
public:
location loc;
short code,ability;
unsigned int charges;
int charges;
bool always_there, property, contained;
void append(legacy::preset_item_type old);