[Scummvm-git-logs] scummvm master -> 1d089da054e17b01c8f91decf4169ea9b92cc4c7
dreammaster
dreammaster at scummvm.org
Mon Jul 31 04:25:08 CEST 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1d089da054 TITANIC: Fix Long Stick not returning to inventory in Arboretum
Commit: 1d089da054e17b01c8f91decf4169ea9b92cc4c7
https://github.com/scummvm/scummvm/commit/1d089da054e17b01c8f91decf4169ea9b92cc4c7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-30T22:25:01-04:00
Commit Message:
TITANIC: Fix Long Stick not returning to inventory in Arboretum
Changed paths:
engines/titanic/carry/long_stick.cpp
diff --git a/engines/titanic/carry/long_stick.cpp b/engines/titanic/carry/long_stick.cpp
index 5eb468f..cfd203a 100644
--- a/engines/titanic/carry/long_stick.cpp
+++ b/engines/titanic/carry/long_stick.cpp
@@ -47,16 +47,16 @@ bool CLongStick::UseWithOtherMsg(CUseWithOtherMsg *msg) {
if (msg->_other->isEquals("SpeechCentre")) {
CPuzzleSolvedMsg puzzleMsg;
puzzleMsg.execute(msg->_other);
- } else if (msg->_other->isEquals("LongStickDispensor")) {
+ } else if (msg->_other->isEquals("LongStickDispenser")) {
petDisplayMessage(1, ALREADY_HAVE_STICK);
} else if (msg->_other->isEquals("Bomb")) {
CActMsg actMsg("Hit");
actMsg.execute("Bomb");
- petAddToInventory();
} else {
return CCarry::UseWithOtherMsg(msg);
}
+ petAddToInventory();
return true;
}
More information about the Scummvm-git-logs
mailing list