diff options
author | Paul Gilbert | 2007-12-16 22:41:51 +0000 |
---|---|---|
committer | Paul Gilbert | 2007-12-16 22:41:51 +0000 |
commit | 08f1f2c3d3512a0c67399327550f4e03bb3dfd79 (patch) | |
tree | c03a0fa299af326e0a12a06651c37039c787ee01 /engines/lure | |
parent | 4e94b3273c1c126e6c5ad33071f1144302061c01 (diff) | |
download | scummvm-rg350-08f1f2c3d3512a0c67399327550f4e03bb3dfd79.tar.gz scummvm-rg350-08f1f2c3d3512a0c67399327550f4e03bb3dfd79.tar.bz2 scummvm-rg350-08f1f2c3d3512a0c67399327550f4e03bb3dfd79.zip |
Bugfix for Use actions to work correctly
svn-id: r29891
Diffstat (limited to 'engines/lure')
-rw-r--r-- | engines/lure/game.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp index a655a66aa2..ab725dac03 100644 --- a/engines/lure/game.cpp +++ b/engines/lure/game.cpp @@ -583,7 +583,7 @@ void Game::handleRightClickMenu() { } else { if (action != TELL) { // Add the hotspot name to the status line and then go do the action - if ((itemId != 0xffff) && (action != GIVE)) { + if ((itemId != 0xffff) && (action != GIVE) && (action != USE)) { HotspotData *itemHotspot = res.getHotspot(itemId); if (itemHotspot != NULL) strings.getString(itemHotspot->nameId, statusLine); @@ -846,7 +846,10 @@ void Game::doAction(Action action, uint16 hotspotId, uint16 usedId) { // placeholder entry, and then replace it's details with the TELL command data player->currentActions().addFront(NONE, player->roomNumber(), 0, 0); player->currentActions().top().supportData().setDetails2(TELL, _numTellCommands * 3 + 1, &_tellCommands[0]); - } else + } else if (action == USE) + // Use action parameters are, for some reason, in reverse order from other 2 item actions + player->currentActions().addFront(action, player->roomNumber(), usedId, hotspotId); + else // All other action types player->currentActions().addFront(action, player->roomNumber(), hotspotId, usedId); } |