diff options
| author | Gregory Montoir | 2003-12-14 20:24:29 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2003-12-14 20:24:29 +0000 |
| commit | e1c21c2d8c3ba05ba32bf86f2fa66e5786264f52 (patch) | |
| tree | 273e93aa2f29831f9b7161e9b742b7cfbe8e13c8 | |
| parent | 4420b15d9f59227cc57bb60d5b38c73639437a62 (diff) | |
| download | scummvm-rg350-e1c21c2d8c3ba05ba32bf86f2fa66e5786264f52.tar.gz scummvm-rg350-e1c21c2d8c3ba05ba32bf86f2fa66e5786264f52.tar.bz2 scummvm-rg350-e1c21c2d8c3ba05ba32bf86f2fa66e5786264f52.zip | |
don't call Command::changeObjectState() on items
svn-id: r11639
| -rw-r--r-- | queen/command.cpp | 4 | ||||
| -rw-r--r-- | queen/command.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/queen/command.cpp b/queen/command.cpp index 29a48e4c48..e5e0369bf6 100644 --- a/queen/command.cpp +++ b/queen/command.cpp @@ -442,7 +442,9 @@ int16 Command::executeCommand(uint16 comId, int16 condResult) { break; } - changeObjectState(_state.selAction, _state.subject[0], com->song, cutDone); + if (_state.subject[0] > 0) { + changeObjectState(_state.selAction, _state.subject[0], com->song, cutDone); + } // execute.c l.533-548 // FIXME: useless test, as .dog has already been played diff --git a/queen/command.h b/queen/command.h index 38b726b127..0bf7c4d754 100644 --- a/queen/command.h +++ b/queen/command.h @@ -134,7 +134,7 @@ private: //! speak description of selected object void lookAtSelectedObject(); - //! get the current objects under the cursor + //! get the current object under the cursor void lookForCurrentObject(); //! get the current icon panel under the cursor (inventory item or verb) |