aboutsummaryrefslogtreecommitdiff
path: root/engines/pink/objects
diff options
context:
space:
mode:
authorwhiterandrek2018-05-31 23:05:45 +0300
committerEugene Sandulenko2018-06-28 23:51:32 +0200
commit11b5865b48996f3ff9a16c719059f25b7119b173 (patch)
tree111ef8f896920624e14983e24eeec5102069f4cd /engines/pink/objects
parente7a7d6960d605b668da0332ee75605d52d0c7543 (diff)
downloadscummvm-rg350-11b5865b48996f3ff9a16c719059f25b7119b173.tar.gz
scummvm-rg350-11b5865b48996f3ff9a16c719059f25b7119b173.tar.bz2
scummvm-rg350-11b5865b48996f3ff9a16c719059f25b7119b173.zip
PINK: fix loading inventory save
Diffstat (limited to 'engines/pink/objects')
-rw-r--r--engines/pink/objects/actors/lead_actor.cpp12
-rw-r--r--engines/pink/objects/inventory.cpp2
2 files changed, 12 insertions, 2 deletions
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index 9279871f30..90de9a1d8f 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -146,7 +146,17 @@ void LeadActor::start(bool isHandler) {
_state = kInDialog1;
_nextState = kReady;
}
- forceUpdateCursor();
+
+ switch (_state) {
+ case kInventory:
+ _page->getModule()->getInventoryMgr()->start(0);
+ _page->pause();
+ break;
+ case kPDA:
+
+ default:
+ forceUpdateCursor();
+ }
}
void LeadActor::onMouseMove(Common::Point point) {
diff --git a/engines/pink/objects/inventory.cpp b/engines/pink/objects/inventory.cpp
index 3ae4effd0a..1b74f4dca8 100644
--- a/engines/pink/objects/inventory.cpp
+++ b/engines/pink/objects/inventory.cpp
@@ -221,7 +221,7 @@ void InventoryMgr::saveState(Archive &archive) {
}
if (_item)
- archive.writeString(_item->_currentOwner);
+ archive.writeString(_item->getName());
else
archive.writeString(Common::String());
}