aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorlukaslw2014-07-21 22:52:55 +0200
committerlukaslw2014-07-21 22:52:55 +0200
commit705bac0ea53ec353d1997f7567141996141b37a8 (patch)
tree3c7760e78597b295ecae9d71e10422bc9986861e /engines
parent2024fea1ec3d3188ed60233a5aa80f6b2c65efb6 (diff)
downloadscummvm-rg350-705bac0ea53ec353d1997f7567141996141b37a8.tar.gz
scummvm-rg350-705bac0ea53ec353d1997f7567141996141b37a8.tar.bz2
scummvm-rg350-705bac0ea53ec353d1997f7567141996141b37a8.zip
PRINCE: displayInventory() - hero path clearing, makePath() crash fix
Diffstat (limited to 'engines')
-rw-r--r--engines/prince/prince.cpp21
1 files changed, 4 insertions, 17 deletions
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index dedbc0d665..bf74393324 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -2440,22 +2440,10 @@ void PrinceEngine::checkInvOptions() {
}
void PrinceEngine::displayInventory() {
- // temp:
- /*
- _mainHero->_inventory.clear();
- _mainHero->_inventory.push_back(1);
- _mainHero->_inventory.push_back(3);
- _mainHero->_inventory.push_back(7);
- _mainHero->_inventory.push_back(4);
- _mainHero->_inventory.push_back(68);
-
- _mainHero->_inventory.push_back(29);
- _mainHero->_inventory.push_back(13);
- _mainHero->_inventory.push_back(44);
- _mainHero->_inventory.push_back(67);
-
- _mainHero->_inventory.push_back(8);
- */
+
+ _mainHero->freeOldMove();
+ _secondHero->freeOldMove();
+
prepareInventoryToView();
while (!shouldQuit()) {
@@ -4186,7 +4174,6 @@ byte *PrinceEngine::makePath(int destX, int destY) {
}
}
_coords = _coordsBuf;
- _coordsBuf = nullptr;
freeCoords2();
freeCoords3();
return nullptr;