XEEN: Fix initial generation of blacksmith wares

This only applies to newly started games; existing savegames will have invalid wares in the Blacksmiths
scummvm · Apr 1, 2018 · b442db8 · b442db8
1 parent b6fc3fd
commit b442db8
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp
@@ -121,9 +121,7 @@ void BlacksmithWares::regenerate() {
 				ItemCategory itemCat = tempChar.makeItem(idx2 + 1, 0, 0);
 				if (catCount[itemCat] < 8) {
 					XeenItem &item = (*this)[itemCat][0][slotNum][catCount[itemCat]];
-					item._id = tempChar._weapons[0]._id;
-					item._material = tempChar._weapons[0]._material;
-					item._state = tempChar._weapons[0]._state;
+					item = tempChar._items[itemCat][0];
 
 					++catCount[itemCat];
 				}
@@ -140,9 +138,7 @@ void BlacksmithWares::regenerate() {
 				ItemCategory itemCat = tempChar.makeItem(idx2 + (slotNum >= 2 ? 3 : 1), 0, 0);
 				if (catCount[itemCat] < 8) {
 					XeenItem &item = (*this)[itemCat][1][slotNum][catCount[itemCat]];
-					item._id = tempChar._misc[0]._id;
-					item._material = tempChar._misc[0]._material;
-					item._state = tempChar._misc[0]._state;
+					item = tempChar._items[itemCat][0];
 
 					++catCount[itemCat];
 				}