[Scummvm-git-logs] scummvm master -> b442db854327ea55c5399c1c319f7f35e771f37b

dreammaster dreammaster at scummvm.org
Sun Apr 1 02:29:49 CEST 2018


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b442db8543 XEEN: Fix initial generation of blacksmith wares


Commit: b442db854327ea55c5399c1c319f7f35e771f37b
    https://github.com/scummvm/scummvm/commit/b442db854327ea55c5399c1c319f7f35e771f37b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-31T20:28:40-04:00

Commit Message:
XEEN: Fix initial generation of blacksmith wares

This only applies to newly started games; existing savegames will have
invalid wares in the Blacksmiths

Changed paths:
    engines/xeen/party.cpp


diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp
index a3bb674..31a43be 100644
--- 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];
 				}





More information about the Scummvm-git-logs mailing list