aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorlukaslw2014-08-04 21:56:36 +0200
committerlukaslw2014-08-04 21:56:36 +0200
commitd100597ce939239f8d3fddc6d327c3a7468d739d (patch)
treedc9161b11471e89166eb2786fa406d69d02f3bed /engines
parent2bed872498c22fc21b2a993656802f0c81da2936 (diff)
downloadscummvm-rg350-d100597ce939239f8d3fddc6d327c3a7468d739d.tar.gz
scummvm-rg350-d100597ce939239f8d3fddc6d327c3a7468d739d.tar.bz2
scummvm-rg350-d100597ce939239f8d3fddc6d327c3a7468d739d.zip
PRINCE: Inventory after swaping and loading fix
Diffstat (limited to 'engines')
-rw-r--r--engines/prince/prince.cpp2
-rw-r--r--engines/prince/saveload.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 250f1fb9b5..9ede877d0e 100644
--- 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
index 55435f1689..39a4002b40 100644
--- 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