diff options
| author | Gregory Montoir | 2003-12-11 13:26:13 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2003-12-11 13:26:13 +0000 |
| commit | 3174cef1273fb3ff266e8a06f3f89cdd7751855d (patch) | |
| tree | bbd03e06c4396dbbba0776376fedf7091c10f411 /queen/command.cpp | |
| parent | 9f465dab04138478ab143a3d7ab46550a701f06e (diff) | |
| download | scummvm-rg350-3174cef1273fb3ff266e8a06f3f89cdd7751855d.tar.gz scummvm-rg350-3174cef1273fb3ff266e8a06f3f89cdd7751855d.tar.bz2 scummvm-rg350-3174cef1273fb3ff266e8a06f3f89cdd7751855d.zip | |
merged Logic::joeGrab & Logic::joeGrabDirection and removed speed argument as it always equals 0
svn-id: r11582
Diffstat (limited to 'queen/command.cpp')
| -rw-r--r-- | queen/command.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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)); } } |