From 3174cef1273fb3ff266e8a06f3f89cdd7751855d Mon Sep 17 00:00:00 2001 From: Gregory Montoir Date: Thu, 11 Dec 2003 13:26:13 +0000 Subject: merged Logic::joeGrab & Logic::joeGrabDirection and removed speed argument as it always equals 0 svn-id: r11582 --- queen/command.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'queen/command.cpp') diff --git a/queen/command.cpp b/queen/command.cpp index df1c4b82e9..4d9e673f23 100644 --- a/queen/command.cpp +++ b/queen/command.cpp @@ -371,10 +371,10 @@ int16 Command::executeCommand(uint16 comId, int16 condResult) { // Don't grab if action is TALK or WALK if (_selCmd.action.value() != VERB_TALK_TO && _selCmd.action.value() != VERB_WALK_TO) { if (_curCmd.subject1 > 0) { - _logic->joeGrab(_logic->objectData(_curCmd.subject1)->state, 0); + _logic->joeGrab(State::findGrab(_logic->objectData(_curCmd.subject1)->state)); } if (_curCmd.subject2 > 0) { - _logic->joeGrab(_logic->objectData(_curCmd.subject2)->state, 0); + _logic->joeGrab(State::findGrab(_logic->objectData(_curCmd.subject2)->state)); } } -- cgit v1.2.3