Skip to content

Commit

Permalink
XEEN: Fix lockpicking to use selected character
Browse files Browse the repository at this point in the history
  • Loading branch information
dreammaster committed Apr 5, 2018
1 parent 5b1f054 commit 37dbd36
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions engines/xeen/party.cpp
Expand Up @@ -1438,7 +1438,6 @@ bool Party::giveExt(int mode1, uint val1, int mode2, uint val2, int mode3, uint
Map &map = *g_vm->_map;
Scripts &scripts = *g_vm->_scripts;
Sound &sound = *g_vm->_sound;
Character &c = _itemsCharacter;

if (intf._objNumber != -1 && !scripts._animCounter) {
MazeObject &obj = map._mobData._objects[intf._objNumber];
Expand All @@ -1450,7 +1449,8 @@ bool Party::giveExt(int mode1, uint val1, int mode2, uint val2, int mode3, uint

case 16:
case 58:
case 73:
case 73: {
Character &c = _activeParty[charId];
obj._frame = 1;

if (obj._position.x != 20) {
Expand Down Expand Up @@ -1481,6 +1481,11 @@ bool Party::giveExt(int mode1, uint val1, int mode2, uint val2, int mode3, uint
return true;
}
}
break;
}

default:
break;
}
}

Expand All @@ -1498,7 +1503,7 @@ bool Party::giveExt(int mode1, uint val1, int mode2, uint val2, int mode3, uint
break;

case 66:
c.clear();
_itemsCharacter.clear();

if (giveTake(0, 0, mode, val, charId))
return true;
Expand Down

0 comments on commit 37dbd36

Please sign in to comment.