PRINCE: Inventory after swaping and loading fix

scummvm · Aug 4, 2014 · d100597 · d100597
1 parent 2bed872
commit d100597
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
@@ -1895,9 +1895,11 @@ void PrinceEngine::swapInv(int heroId) {
 		for (uint i = 0; i < hero->_inventory.size(); i++) {
 			tempInv.push_back(hero->_inventory[i]);
 		}
+		hero->_inventory.clear();
 		for (uint i = 0; i < hero->_inventory2.size(); i++) {
 			hero->_inventory.push_back(hero->_inventory2[i]);
 		}
+		hero->_inventory2.clear();
 		for (uint i = 0; i < tempInv.size(); i++) {
 			hero->_inventory2.push_back(tempInv[i]);
 		}

diff --git a/engines/prince/saveload.cpp b/engines/prince/saveload.cpp
@@ -420,7 +420,7 @@ void PrinceEngine::syncGame(Common::SeekableReadStream *readStream, Common::Writ
 			if (invId == endInv) {
 				break;
 			}
-			_mainHero->_inventory.push_back(invId);
+			_mainHero->_inventory2.push_back(invId);
 		}
 
 		// Second hero
@@ -450,7 +450,7 @@ void PrinceEngine::syncGame(Common::SeekableReadStream *readStream, Common::Writ
 			if (invId == endInv) {
 				break;
 			}
-			_secondHero->_inventory.push_back(invId);
+			_secondHero->_inventory2.push_back(invId);
 		}
 
 		// Script