= can_trade was erroneously set to the same value as can_take. I'm qu…

…ite positive this is a mistake since many items, like attachables used for animations are marked can_trade = false but they still show up in trade windows. With this change these items correctly do not show up for trade.
OpenXRay · Dec 24, 2016 · 2754d42 · 2754d42
1 parent cdb2329
commit 2754d42
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/xrGame/inventory_item.cpp b/src/xrGame/inventory_item.cpp
@@ -109,9 +109,9 @@ void CInventoryItem::Load(LPCSTR section)
 	m_Description = CStringTable().translate( pSettings->r_string(section, "description") );
 
 	m_flags.set(Fbelt,			READ_IF_EXISTS(pSettings, r_bool, section, "belt",		FALSE));
-	m_can_trade = READ_IF_EXISTS(pSettings, r_bool, section, "can_take",	TRUE);
-	m_flags.set(FCanTake,		m_can_trade);
-	m_flags.set(FCanTrade,		READ_IF_EXISTS(pSettings, r_bool, section, "can_trade",	TRUE));
+	m_can_trade = READ_IF_EXISTS(pSettings, r_bool, section, "can_trade",	TRUE);
+	m_flags.set(FCanTake, READ_IF_EXISTS(pSettings, r_bool, section, "can_take",	TRUE));
+	m_flags.set(FCanTrade, m_can_trade);
 	m_flags.set(FIsQuestItem,	READ_IF_EXISTS(pSettings, r_bool, section, "quest_item",FALSE));