diff options
author | Paul Gilbert | 2016-12-18 14:32:52 -0500 |
---|---|---|
committer | Paul Gilbert | 2016-12-18 14:32:52 -0500 |
commit | a222fe152928fbcda5b8fffe152553fa4a0a6c15 (patch) | |
tree | 8e224c14fbf8f1c7f01bc802a4526fa7f4b427e7 /engines/titanic/carry | |
parent | ac35e6138b67f2712a418370bec6652850ef67c1 (diff) | |
download | scummvm-rg350-a222fe152928fbcda5b8fffe152553fa4a0a6c15.tar.gz scummvm-rg350-a222fe152928fbcda5b8fffe152553fa4a0a6c15.tar.bz2 scummvm-rg350-a222fe152928fbcda5b8fffe152553fa4a0a6c15.zip |
TITANIC: Renaming of lift fields
Diffstat (limited to 'engines/titanic/carry')
-rw-r--r-- | engines/titanic/carry/carry.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/carry/eye.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/carry/liftbot_head.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/titanic/carry/carry.cpp b/engines/titanic/carry/carry.cpp index 4f8df11260..670c3780d9 100644 --- a/engines/titanic/carry/carry.cpp +++ b/engines/titanic/carry/carry.cpp @@ -123,7 +123,7 @@ bool CCarry::MouseDragMoveMsg(CMouseDragMoveMsg *msg) { } bool CCarry::MouseDragEndMsg(CMouseDragEndMsg *msg) { - debugC(ERROR_BASIC, kDebugScripts, "MosueDragEndMsg"); + debugC(ERROR_BASIC, kDebugScripts, "MouseDragEndMsg"); showMouse(); if (msg->_dropTarget) { diff --git a/engines/titanic/carry/eye.cpp b/engines/titanic/carry/eye.cpp index 20e4ef3eac..fc480b8ec0 100644 --- a/engines/titanic/carry/eye.cpp +++ b/engines/titanic/carry/eye.cpp @@ -63,7 +63,7 @@ bool CEye::UseWithOtherMsg(CUseWithOtherMsg *msg) { headMsg.execute(isEquals("Eye1") ? "Eye1Slot" : "Eye2Slot"); } else if (msg->_other->isEquals("LiftbotWithoutHead")) { CPetControl *pet = getPetControl(); - if (!CLift::_v1 && pet->getRoomsElevatorNum() == 4) { + if (!CLift::_hasHead && pet->getRoomsElevatorNum() == 4) { _eyeFlag = true; setPosition(_origPos); setVisible(false); @@ -84,7 +84,7 @@ bool CEye::UseWithCharMsg(CUseWithCharMsg *msg) { CLift *lift = dynamic_cast<CLift *>(msg->_character); if (lift && lift->getName() == "Well") { CPetControl *pet = getPetControl(); - if (!CLift::_v1 && pet->getRoomsElevatorNum() == 4) { + if (!CLift::_hasHead && pet->getRoomsElevatorNum() == 4) { _eyeFlag = true; setPosition(_origPos); setVisible(false); diff --git a/engines/titanic/carry/liftbot_head.cpp b/engines/titanic/carry/liftbot_head.cpp index 5f516fcf8c..227a06a7bc 100644 --- a/engines/titanic/carry/liftbot_head.cpp +++ b/engines/titanic/carry/liftbot_head.cpp @@ -50,7 +50,7 @@ void CLiftbotHead::load(SimpleFile *file) { bool CLiftbotHead::UseWithOtherMsg(CUseWithOtherMsg *msg) { if (msg->_other->getName() == "LiftbotWithoutHead") { CPetControl *pet = getPetControl(); - if (CLift::_v1 == 1 && pet->getRoomsElevatorNum() == 4) { + if (!CLift::_hasHead && pet->getRoomsElevatorNum() == 4) { _flag = true; CActMsg actMsg("AddRightHead"); actMsg.execute("FaultyLiftbot"); @@ -67,7 +67,7 @@ bool CLiftbotHead::UseWithCharMsg(CUseWithCharMsg *msg) { CLift *lift = dynamic_cast<CLift *>(msg->_character); if (lift) { CPetControl *pet = getPetControl(); - if (lift->isEquals("Well") && !CLift::_v1 && pet->getRoomsElevatorNum() == 4) { + if (lift->isEquals("Well") && !CLift::_hasHead && pet->getRoomsElevatorNum() == 4) { _flag = true; CActMsg actMsg("AddRightHead"); actMsg.execute(lift); |