aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/carry
diff options
context:
space:
mode:
authorPaul Gilbert2016-04-17 21:08:42 -0400
committerPaul Gilbert2016-07-10 16:11:21 -0400
commit46a30255b0e5a7f5dad4fd032388d31a69208b62 (patch)
tree1e668339aecb1246c9ec20515b81866d81ab75d2 /engines/titanic/carry
parenta11e677494d7cb3c6b8ed2c56095873d46a00ab8 (diff)
downloadscummvm-rg350-46a30255b0e5a7f5dad4fd032388d31a69208b62.tar.gz
scummvm-rg350-46a30255b0e5a7f5dad4fd032388d31a69208b62.tar.bz2
scummvm-rg350-46a30255b0e5a7f5dad4fd032388d31a69208b62.zip
TITANIC: Seperate PET classes setup and reset methods
Diffstat (limited to 'engines/titanic/carry')
-rw-r--r--engines/titanic/carry/arm.cpp2
-rw-r--r--engines/titanic/carry/carry.cpp8
-rw-r--r--engines/titanic/carry/carry.h2
-rw-r--r--engines/titanic/carry/chicken.cpp2
4 files changed, 8 insertions, 6 deletions
diff --git a/engines/titanic/carry/arm.cpp b/engines/titanic/carry/arm.cpp
index c39812fd26..d662b43f76 100644
--- a/engines/titanic/carry/arm.cpp
+++ b/engines/titanic/carry/arm.cpp
@@ -172,7 +172,7 @@ bool CArm::MaitreDHappyMsg(CMaitreDHappyMsg *msg) {
_visibleFrame = _field170;
loadFrame(_visibleFrame);
_string6 = "None";
- invFn3();
+ invChange();
}
}
diff --git a/engines/titanic/carry/carry.cpp b/engines/titanic/carry/carry.cpp
index 31d0ff02d2..cb87b94c90 100644
--- a/engines/titanic/carry/carry.cpp
+++ b/engines/titanic/carry/carry.cpp
@@ -240,14 +240,16 @@ bool CCarry::PassOnDragStartMsg(CPassOnDragStartMsg *msg) {
void CCarry::addToInventory() {
CPetControl *pet = getPetControl();
- if (pet)
+ if (pet) {
+ makeDirty();
pet->addToInventory(this);
+ }
}
-void CCarry::invFn3() {
+void CCarry::invChange() {
CPetControl *pet = getPetControl();
if (pet)
- pet->invFn3(this);
+ pet->invChange(this);
}
} // End of namespace Titanic
diff --git a/engines/titanic/carry/carry.h b/engines/titanic/carry/carry.h
index 2370556607..ba782fda7e 100644
--- a/engines/titanic/carry/carry.h
+++ b/engines/titanic/carry/carry.h
@@ -65,7 +65,7 @@ protected:
/**
*
*/
- void invFn3();
+ void invChange();
public:
CLASSDEF
CCarry();
diff --git a/engines/titanic/carry/chicken.cpp b/engines/titanic/carry/chicken.cpp
index 74b42aafcd..8483a3fb29 100644
--- a/engines/titanic/carry/chicken.cpp
+++ b/engines/titanic/carry/chicken.cpp
@@ -171,7 +171,7 @@ bool CChicken::TimerMsg(CTimerMsg *msg) {
}
if (flag) {
- invFn3();
+ invChange();
stopTimer(_timerId);
}