ItemManager: Fix extended items from other saves being deleted

Fixes #1913

This works by setting a flag on all items that represents whether or not
they are "foreign". We assume all items are foreign by default, and
*only* unset this flag if:

- the item was initially loaded into the inventory or stash
- it was generated during the current game session

When saving the extended items file, we now only skip writing the item
data if the item is not foreign. Otherwise, it gets preserved.

There is still the issue where deleting a save does not clean up the
extended items from that save, but that is a separate problem.

Author: dorkster

src/ItemManager.cpp

@@ -179,6 +179,7 @@ Item::Item()
 	, has_name(false)
 	, book_is_readable(true)
 	, quest_item(false)
+	, is_foreign(true)
 	, level(0)
 	, icon(0)
 	, max_quantity(INT_MAX)
@@ -1657,6 +1658,8 @@ ItemID ItemManager::getExtendedItem(ItemID item_id) {
 
 		items[extended_item]->randomizer_def = NULL;
 
+		items[extended_item]->is_foreign = false;
+
 		return extended_item;
 	}
 	else {

src/ItemManager.h

@@ -242,6 +242,7 @@ class Item {
 	bool has_name;        // flag that is set when the item name is parsed
 	bool book_is_readable; // whether to display "use" or "read" in the tooltip
 	bool quest_item;
+	bool is_foreign; // used to track extended items for clean up during save
 
 	int level;            // rough estimate of quality, used in the loot algorithm
 	int icon;             // icon index on small pixel sheet

src/ItemStorage.cpp

@@ -77,6 +77,14 @@ void ItemStorage::setQuantities(const std::string& s) {
 	}
 }
 
+void ItemStorage::setForeign(bool is_foreign) {
+	for (int i = 0; i < slot_number; ++i) {
+		if (items->isValid(storage[i].item) && items->items[storage[i].item]->parent) {
+			items->items[storage[i].item]->is_foreign = is_foreign;
+		}
+	}
+}
+
 int ItemStorage::getSlotNumber() {
 	return slot_number;
 }

src/ItemStorage.h

@@ -42,6 +42,7 @@ class ItemStorage {
 
 	void setItems(const std::string& s);
 	void setQuantities(const std::string& s);
+	void setForeign(bool is_foreign);
 	int getSlotNumber();
 	std::string getItems();
 	std::string getQuantities();

src/SaveLoad.cpp

@@ -294,7 +294,7 @@ void SaveLoad::saveGame() {
 				}
 			}
 
-			if (!item_in_storage)
+			if (!item_in_storage && !item->is_foreign)
 				continue;
 
 			outfile << "[item]" << std::endl;
@@ -434,6 +434,7 @@ void SaveLoad::loadGame() {
 			}
 			else if (infile.key == "equipped") {
 				menu->inv->inventory[MenuInventory::EQUIPMENT].setItems(infile.val);
+				menu->inv->inventory[MenuInventory::EQUIPMENT].setForeign(false);
 			}
 			else if (infile.key == "equipped_quantity") {
 				menu->inv->inventory[MenuInventory::EQUIPMENT].setQuantities(infile.val);
@@ -443,6 +444,7 @@ void SaveLoad::loadGame() {
 			}
 			else if (infile.key == "carried") {
 				menu->inv->inventory[MenuInventory::CARRIED].setItems(infile.val);
+				menu->inv->inventory[MenuInventory::EQUIPMENT].setForeign(false);
 			}
 			else if (infile.key == "carried_quantity") {
 				menu->inv->inventory[MenuInventory::CARRIED].setQuantities(infile.val);
@@ -665,6 +667,9 @@ void SaveLoad::loadStash() {
 			while (infile.next()) {
 				if (infile.key == "item") {
 					menu->stash->tabs[i].stock.setItems(infile.val);
+					if (menu->stash->tabs[i].is_private) {
+						menu->stash->tabs[i].stock.setForeign(false);
+					}
 				}
 				else if (infile.key == "quantity") {
 					menu->stash->tabs[i].stock.setQuantities(infile.val);

src/Version.cpp

@@ -30,7 +30,7 @@ FLARE.  If not, see http://www.gnu.org/licenses/
 
 #include <SDL.h>
 
-Version VersionInfo::ENGINE(1, 14, 221);
+Version VersionInfo::ENGINE(1, 14, 222);
 Version VersionInfo::MIN(0, 0, 0);
 Version VersionInfo::MAX(USHRT_MAX, USHRT_MAX, USHRT_MAX);